Merge commit 'yuuki/master' into ppc_callstack_up
commit
1d0ebde8dc
|
@ -11,8 +11,12 @@
|
||||||
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__dar
|
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__dar
|
||||||
#define MACH_STACK_POINTER(thr_state) (thr_state)->__r1
|
#define MACH_STACK_POINTER(thr_state) (thr_state)->__r1
|
||||||
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__srr0
|
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__srr0
|
||||||
|
#define UAP_PROGRAM_COUNTER(ucontext) \
|
||||||
|
MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss))
|
||||||
#else
|
#else
|
||||||
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->dar
|
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->dar
|
||||||
#define MACH_STACK_POINTER(thr_state) (thr_state)->r1
|
#define MACH_STACK_POINTER(thr_state) (thr_state)->r1
|
||||||
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->srr0
|
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->srr0
|
||||||
|
#define UAP_PROGRAM_COUNTER(ucontext) \
|
||||||
|
MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,8 +9,12 @@
|
||||||
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
|
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr
|
||||||
#define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
|
#define MACH_STACK_POINTER(thr_state) (thr_state)->__esp
|
||||||
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
|
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip
|
||||||
|
#define UAP_PROGRAM_COUNTER(ucontext) \
|
||||||
|
MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss))
|
||||||
#else
|
#else
|
||||||
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
|
#define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr
|
||||||
#define MACH_STACK_POINTER(thr_state) (thr_state)->esp
|
#define MACH_STACK_POINTER(thr_state) (thr_state)->esp
|
||||||
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
|
#define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip
|
||||||
|
#define UAP_PROGRAM_COUNTER(ucontext) \
|
||||||
|
MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -10,7 +10,4 @@ void early_init(void);
|
||||||
const char *vm_executable_path(void);
|
const char *vm_executable_path(void);
|
||||||
const char *default_image_path(void);
|
const char *default_image_path(void);
|
||||||
|
|
||||||
DLLEXPORT void c_to_factor_toplevel(CELL quot);
|
DLLEXPORT void c_to_factor_toplevel(CELL quot);
|
||||||
|
|
||||||
#define UAP_PROGRAM_COUNTER(ucontext) \
|
|
||||||
MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss))
|
|
Loading…
Reference in New Issue