commit 7d8cfeb95c812b745a26d4d92b443563e51491af
author Alexandre Julliard <julliard@winehq.org> Sun Aug 01 14:58:01 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Aug 01 14:58:01 1999 +0000
tree 1b0f45d69e18cd97a92559485689d180b019202d
parent bdf83bc546ef5ea8128a4126f5116c0e1df5aa50

Removed IP_reg, SP_reg and FL_reg definitions to avoid potential
aliasing optimization problems.

loader/ne/segment.c

diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 10bb7ef..e9f30eb 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -660,8 +660,8 @@
 
 
     pModule->cs = 0;  /* Don't initialize it twice */
-    TRACE_(dll)("Calling LibMain, cs:ip=%04lx:%04x ds=%04lx di=%04x cx=%04x\n", 
-                 CS_reg(&context), IP_reg(&context), DS_reg(&context),
+    TRACE_(dll)("Calling LibMain, cs:ip=%04lx:%04lx ds=%04lx di=%04x cx=%04x\n", 
+                 CS_reg(&context), EIP_reg(&context), DS_reg(&context),
                  DI_reg(&context), CX_reg(&context) );
     Callbacks->CallRegisterShortProc( &context, 0 );
     return TRUE;
@@ -693,7 +693,7 @@
     ES_reg(&context) = ds;   /* who knows ... */
 
     CS_reg(&context) = HIWORD(entryPoint);
-    IP_reg(&context) = LOWORD(entryPoint);
+    EIP_reg(&context) = LOWORD(entryPoint);
     EBP_reg(&context) =  OFFSETOF( NtCurrentTeb()->cur_stack )
                          + (WORD)&((STACK16FRAME*)0)->bp;
 
@@ -704,8 +704,8 @@
     *(DWORD *)(stack - 14) = 0;             /* dwReserved1 */
     *(WORD *) (stack - 16) = 0;             /* wReserved2 */
 
-    TRACE_(dll)("Calling DllEntryPoint, cs:ip=%04lx:%04x\n",
-          CS_reg(&context), IP_reg(&context));
+    TRACE_(dll)("Calling DllEntryPoint, cs:ip=%04lx:%04lx\n",
+          CS_reg(&context), EIP_reg(&context));
 
     Callbacks->CallRegisterShortProc( &context, 16 );
 }