From c1581f2ee155bcabdb3c4dc9c5f7cfcdf6e52f87 Mon Sep 17 00:00:00 2001 From: Yuuki Daruma Date: Thu, 4 Oct 2007 23:54:35 -0700 Subject: [PATCH] updating the mv for Leopard. untested on ppc. --- vm/os-macosx-ppc.h | 4 ++++ vm/os-macosx-x86.32.h | 4 ++++ vm/os-macosx.h | 5 +---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vm/os-macosx-ppc.h b/vm/os-macosx-ppc.h index 6cc9bd5dac..44726e25cf 100644 --- a/vm/os-macosx-ppc.h +++ b/vm/os-macosx-ppc.h @@ -41,8 +41,12 @@ typedef struct _F_STACK_FRAME { #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__dar #define MACH_STACK_POINTER(thr_state) (thr_state)->__r1 #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__srr0 + #define UAP_PROGRAM_COUNTER(ucontext) \ + MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss)) #else #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->dar #define MACH_STACK_POINTER(thr_state) (thr_state)->r1 #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->srr0 + #define UAP_PROGRAM_COUNTER(ucontext) \ + MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss)) #endif diff --git a/vm/os-macosx-x86.32.h b/vm/os-macosx-x86.32.h index 81ae617dfc..d335c4abd4 100644 --- a/vm/os-macosx-x86.32.h +++ b/vm/os-macosx-x86.32.h @@ -9,8 +9,12 @@ #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->__faultvaddr #define MACH_STACK_POINTER(thr_state) (thr_state)->__esp #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->__eip + #define UAP_PROGRAM_COUNTER(ucontext) \ + MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->__ss)) #else #define MACH_EXC_STATE_FAULT(exc_state) (exc_state)->faultvaddr #define MACH_STACK_POINTER(thr_state) (thr_state)->esp #define MACH_PROGRAM_COUNTER(thr_state) (thr_state)->eip + #define UAP_PROGRAM_COUNTER(ucontext) \ + MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss)) #endif diff --git a/vm/os-macosx.h b/vm/os-macosx.h index dfe53f9a19..e8e50714ff 100644 --- a/vm/os-macosx.h +++ b/vm/os-macosx.h @@ -10,7 +10,4 @@ void early_init(void); const char *vm_executable_path(void); const char *default_image_path(void); -DLLEXPORT void c_to_factor_toplevel(CELL quot); - -#define UAP_PROGRAM_COUNTER(ucontext) \ - MACH_PROGRAM_COUNTER(&(((ucontext_t *)(ucontext))->uc_mcontext->ss)) +DLLEXPORT void c_to_factor_toplevel(CELL quot); \ No newline at end of file