diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/nt32/crt_glue.c | 4 | ||||
| -rw-r--r-- | src/arch/nt32/vtbl.c | 2 | ||||
| -rw-r--r-- | src/arch/nt64/crt_glue.c | 4 | ||||
| -rw-r--r-- | src/arch/nt64/unwind.c | 42 | ||||
| -rw-r--r-- | src/arch/nt64/vtbl.c | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/src/arch/nt32/crt_glue.c b/src/arch/nt32/crt_glue.c index 7a33981..db5d3a6 100644 --- a/src/arch/nt32/crt_glue.c +++ b/src/arch/nt32/crt_glue.c @@ -8,7 +8,7 @@ extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; -extern const struct __seh_vtbl * __seh_vtbl; +extern const struct __seh_vtbl * __eh_vtbl; static int __pthread_surrogate_init(struct pthread * self); @@ -85,7 +85,7 @@ void __libc_entry_routine( __syscall_vtbl = (unsigned long **)ctx.sys_vtbl; __ldso_vtbl = ctx.ldso_vtbl; __psx_vtbl = ctx.psx_vtbl; - __seh_vtbl = ctx.seh_vtbl; + __eh_vtbl = ctx.seh_vtbl; __teb_sys_idx = ctx.teb_sys_idx; __teb_libc_idx = ctx.teb_libc_idx; diff --git a/src/arch/nt32/vtbl.c b/src/arch/nt32/vtbl.c index 7691977..751990b 100644 --- a/src/arch/nt32/vtbl.c +++ b/src/arch/nt32/vtbl.c @@ -5,7 +5,7 @@ const struct __ldso_vtbl * __ldso_vtbl = 0; const struct __psx_vtbl * __psx_vtbl = 0; -const struct __seh_vtbl * __seh_vtbl = 0; +const struct __seh_vtbl * __eh_vtbl = 0; unsigned long ** __syscall_vtbl = 0; unsigned long __teb_sys_idx = 0; diff --git a/src/arch/nt64/crt_glue.c b/src/arch/nt64/crt_glue.c index 7a33981..db5d3a6 100644 --- a/src/arch/nt64/crt_glue.c +++ b/src/arch/nt64/crt_glue.c @@ -8,7 +8,7 @@ extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; -extern const struct __seh_vtbl * __seh_vtbl; +extern const struct __seh_vtbl * __eh_vtbl; static int __pthread_surrogate_init(struct pthread * self); @@ -85,7 +85,7 @@ void __libc_entry_routine( __syscall_vtbl = (unsigned long **)ctx.sys_vtbl; __ldso_vtbl = ctx.ldso_vtbl; __psx_vtbl = ctx.psx_vtbl; - __seh_vtbl = ctx.seh_vtbl; + __eh_vtbl = ctx.seh_vtbl; __teb_sys_idx = ctx.teb_sys_idx; __teb_libc_idx = ctx.teb_libc_idx; diff --git a/src/arch/nt64/unwind.c b/src/arch/nt64/unwind.c index 28026c6..2676683 100644 --- a/src/arch/nt64/unwind.c +++ b/src/arch/nt64/unwind.c @@ -3,7 +3,7 @@ #include <sys/unwind.h> #include "psxseh.h" -extern const struct __seh_vtbl * __seh_vtbl; +extern const struct __seh_vtbl * __eh_vtbl; int __unwind_exception_filter( @@ -13,7 +13,7 @@ int __unwind_exception_filter( struct _nt_dispatcher_context * dctx, __unwind_personality_routine uw_routine) { - return __seh_vtbl->seh_exception_filter( + return __eh_vtbl->seh_exception_filter( erec,fctx,tctx,dctx,uw_routine); } @@ -24,32 +24,32 @@ int __unwind_exception_handler( mcontext_t * tctx, struct _nt_dispatcher_context * dctx) { - return __seh_vtbl->seh_exception_handler( + return __eh_vtbl->seh_exception_handler( erec,fbase,tctx,dctx); } int __unwind_raise_exception(struct __unwind_exception * e) { - return __seh_vtbl->seh_unwind_raise_exception(e); + return __eh_vtbl->seh_unwind_raise_exception(e); } void __unwind_delete_exception(struct __unwind_exception * e) { - return __seh_vtbl->seh_unwind_delete_exception(e); + return __eh_vtbl->seh_unwind_delete_exception(e); } void __unwind_resume(struct __unwind_exception * e) { - return __seh_vtbl->seh_unwind_resume(e); + return __eh_vtbl->seh_unwind_resume(e); } int __unwind_resume_or_rethrow(struct __unwind_exception * e) { - return __seh_vtbl->seh_unwind_resume_or_rethrow(e); + return __eh_vtbl->seh_unwind_resume_or_rethrow(e); } @@ -62,13 +62,13 @@ int __unwind_force( void *), void * ctx) { - return __seh_vtbl->seh_unwind_force(e,stop_fn,ctx); + return __eh_vtbl->seh_unwind_force(e,stop_fn,ctx); } void * __unwind_get_language_specific_data(struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_language_specific_data(uwctx); + return __eh_vtbl->seh_unwind_get_language_specific_data(uwctx); } @@ -78,71 +78,71 @@ int __unwind_backtrace( void *), void * ctx) { - return __seh_vtbl->seh_unwind_backtrace(trace_fn,ctx); + return __eh_vtbl->seh_unwind_backtrace(trace_fn,ctx); } int __unwind_calltrace() { - return __seh_vtbl->seh_unwind_calltrace(); + return __eh_vtbl->seh_unwind_calltrace(); } uintptr_t __unwind_get_ip(const struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_ip(uwctx); + return __eh_vtbl->seh_unwind_get_ip(uwctx); } void __unwind_set_ip(struct __unwind_context * uwctx, uintptr_t ip) { - return __seh_vtbl->seh_unwind_set_ip(uwctx,ip); + return __eh_vtbl->seh_unwind_set_ip(uwctx,ip); } uintptr_t __unwind_get_gr(const struct __unwind_context * uwctx, int idx) { - return __seh_vtbl->seh_unwind_get_gr(uwctx,idx); + return __eh_vtbl->seh_unwind_get_gr(uwctx,idx); } void __unwind_set_gr(struct __unwind_context * uwctx, int idx, uintptr_t rval) { - return __seh_vtbl->seh_unwind_set_gr(uwctx,idx,rval); + return __eh_vtbl->seh_unwind_set_gr(uwctx,idx,rval); } uintptr_t __unwind_get_data_rel_base(const struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_data_rel_base(uwctx); + return __eh_vtbl->seh_unwind_get_data_rel_base(uwctx); } uintptr_t __unwind_get_text_rel_base(const struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_text_rel_base(uwctx); + return __eh_vtbl->seh_unwind_get_text_rel_base(uwctx); } uintptr_t __unwind_get_cfa(const struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_cfa(uwctx); + return __eh_vtbl->seh_unwind_get_cfa(uwctx); } uintptr_t __unwind_get_ip_info(const struct __unwind_context * uwctx, int * pinfo) { - return __seh_vtbl->seh_unwind_get_ip_info(uwctx,pinfo); + return __eh_vtbl->seh_unwind_get_ip_info(uwctx,pinfo); } uintptr_t __unwind_get_region_start(const struct __unwind_context * uwctx) { - return __seh_vtbl->seh_unwind_get_region_start(uwctx); + return __eh_vtbl->seh_unwind_get_region_start(uwctx); } void * __unwind_find_enclosing_function(const void * addr) { - return __seh_vtbl->seh_unwind_find_enclosing_function(addr); + return __eh_vtbl->seh_unwind_find_enclosing_function(addr); } diff --git a/src/arch/nt64/vtbl.c b/src/arch/nt64/vtbl.c index 7691977..751990b 100644 --- a/src/arch/nt64/vtbl.c +++ b/src/arch/nt64/vtbl.c @@ -5,7 +5,7 @@ const struct __ldso_vtbl * __ldso_vtbl = 0; const struct __psx_vtbl * __psx_vtbl = 0; -const struct __seh_vtbl * __seh_vtbl = 0; +const struct __seh_vtbl * __eh_vtbl = 0; unsigned long ** __syscall_vtbl = 0; unsigned long __teb_sys_idx = 0; |