Huw Davies : ntdll: Remove old macOS register names.

Alexandre Julliard julliard at winehq.org
Fri Aug 27 15:03:32 CDT 2021


Module: wine
Branch: master
Commit: 3fa8503de528eb8f86cc95e5b8e14db71a284a84
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3fa8503de528eb8f86cc95e5b8e14db71a284a84

Author: Huw Davies <huw at codeweavers.com>
Date:   Fri Aug 27 07:48:52 2021 +0100

ntdll: Remove old macOS register names.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/unix/signal_i386.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index 7067435bf0b..e033a3987ee 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -299,8 +299,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr )
 
 #include <i386/user_ldt.h>
 
-/* work around silly renaming of struct members in OS X 10.5 */
-#if __DARWIN_UNIX03 && defined(_STRUCT_X86_EXCEPTION_STATE32)
 #define EAX_sig(context)     ((context)->uc_mcontext->__ss.__eax)
 #define EBX_sig(context)     ((context)->uc_mcontext->__ss.__ebx)
 #define ECX_sig(context)     ((context)->uc_mcontext->__ss.__ecx)
@@ -322,29 +320,6 @@ static inline int set_thread_area( struct modify_ldt_s *ptr )
 #define FPU_sig(context)     NULL
 #define FPUX_sig(context)    ((XSAVE_FORMAT *)&(context)->uc_mcontext->__fs.__fpu_fcw)
 #define XState_sig(context)  NULL  /* FIXME */
-#else
-#define EAX_sig(context)     ((context)->uc_mcontext->ss.eax)
-#define EBX_sig(context)     ((context)->uc_mcontext->ss.ebx)
-#define ECX_sig(context)     ((context)->uc_mcontext->ss.ecx)
-#define EDX_sig(context)     ((context)->uc_mcontext->ss.edx)
-#define ESI_sig(context)     ((context)->uc_mcontext->ss.esi)
-#define EDI_sig(context)     ((context)->uc_mcontext->ss.edi)
-#define EBP_sig(context)     ((context)->uc_mcontext->ss.ebp)
-#define CS_sig(context)      ((context)->uc_mcontext->ss.cs)
-#define DS_sig(context)      ((context)->uc_mcontext->ss.ds)
-#define ES_sig(context)      ((context)->uc_mcontext->ss.es)
-#define FS_sig(context)      ((context)->uc_mcontext->ss.fs)
-#define GS_sig(context)      ((context)->uc_mcontext->ss.gs)
-#define SS_sig(context)      ((context)->uc_mcontext->ss.ss)
-#define EFL_sig(context)     ((context)->uc_mcontext->ss.eflags)
-#define EIP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext->ss.eip))
-#define ESP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext->ss.esp))
-#define TRAP_sig(context)    ((context)->uc_mcontext->es.trapno)
-#define ERROR_sig(context)   ((context)->uc_mcontext->es.err)
-#define FPU_sig(context)     NULL
-#define FPUX_sig(context)    ((XSAVE_FORMAT *)&(context)->uc_mcontext->fs.fpu_fcw)
-#define XState_sig(context)  NULL  /* FIXME */
-#endif
 
 #elif defined(__NetBSD__)
 




More information about the wine-cvs mailing list