Author: gnorton
Date: 2007-11-01 14:03:42 -0500 (Thu, 01 Nov 2007)
New Revision: 88674
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-ppc.h
trunk/mono/mono/mini/mini-x86.h
Log:
2007-11-01 Geoff Norton <[EMAIL PROTECTED]>
* mini-ppc.h, mini-x86.h: Handle Leopards renaming of some structure
members.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-11-01 19:03:16 UTC (rev 88673)
+++ trunk/mono/mono/mini/ChangeLog 2007-11-01 19:03:42 UTC (rev 88674)
@@ -1,4 +1,8 @@
+2007-11-01 Geoff Norton <[EMAIL PROTECTED]>
+ * mini-ppc.h, mini-x86.h: Handle Leopards renaming of some structure
+ members.
+
Wed Oct 31 19:53:33 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* mini-amd64.c, mini-amd64.h, tramp-amd64.c: breakpoint table support
Modified: trunk/mono/mono/mini/mini-ppc.h
===================================================================
--- trunk/mono/mono/mini/mini-ppc.h 2007-11-01 19:03:16 UTC (rev 88673)
+++ trunk/mono/mono/mini/mini-ppc.h 2007-11-01 19:03:42 UTC (rev 88674)
@@ -179,7 +179,13 @@
#define UCONTEXT_REG_FPRn(ctx, n)
((ctx)->uc_mcontext.uc_regs->fpregs.fpregs [(n)])
#define UCONTEXT_REG_NIP(ctx) ((ctx)->uc_mcontext.uc_regs->gregs
[PT_NIP])
#define UCONTEXT_REG_LNK(ctx) ((ctx)->uc_mcontext.uc_regs->gregs
[PT_LNK])
-#elif defined (__APPLE__)
+#elif defined (__APPLE__) && defined (_STRUCT_MCONTEXT)
+ typedef struct __darwin_ucontext os_ucontext;
+
+ #define UCONTEXT_REG_Rn(ctx, n) ((ctx)->uc_mcontext->__ss.__r##n)
+ #define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext->__fs.__fpregs
[(n)])
+ #define UCONTEXT_REG_NIP(ctx) ((ctx)->uc_mcontext->__ss.__srr0)
+#elif defined (__APPLE__) && !defined (_STRUCT_MCONTEXT)
typedef struct ucontext os_ucontext;
#define UCONTEXT_REG_Rn(ctx, n) ((ctx)->uc_mcontext->ss.r##n)
Modified: trunk/mono/mono/mini/mini-x86.h
===================================================================
--- trunk/mono/mono/mini/mini-x86.h 2007-11-01 19:03:16 UTC (rev 88673)
+++ trunk/mono/mono/mini/mini-x86.h 2007-11-01 19:03:42 UTC (rev 88674)
@@ -152,7 +152,17 @@
#define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.mc_esi)
#define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.mc_edi)
#define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.mc_eip)
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && defined(_STRUCT_MCONTEXT)
+ #define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext.__ss.__eax)
+ #define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext.__ss.__ebx)
+ #define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext.__ss.__ecx)
+ #define UCONTEXT_REG_EDX(ctx) ((ctx)->uc_mcontext.__ss.__edx)
+ #define UCONTEXT_REG_EBP(ctx) ((ctx)->uc_mcontext.__ss.__ebp)
+ #define UCONTEXT_REG_ESP(ctx) ((ctx)->uc_mcontext.__ss.__esp)
+ #define UCONTEXT_REG_ESI(ctx) ((ctx)->uc_mcontext.__ss.__esi)
+ #define UCONTEXT_REG_EDI(ctx) ((ctx)->uc_mcontext.__ss.__edi)
+ #define UCONTEXT_REG_EIP(ctx) ((ctx)->uc_mcontext.__ss.__eip)
+#elif defined(__APPLE__) && !defined(_STRUCT_MCONTEXT)
#define UCONTEXT_REG_EAX(ctx) ((ctx)->uc_mcontext->ss.eax)
#define UCONTEXT_REG_EBX(ctx) ((ctx)->uc_mcontext->ss.ebx)
#define UCONTEXT_REG_ECX(ctx) ((ctx)->uc_mcontext->ss.ecx)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches