Moved GET_IP out of winnt.h.

This commit is contained in:
Alexandre Julliard 2000-11-25 23:56:20 +00:00
parent 1475e102ed
commit dfd3d4ada2
3 changed files with 11 additions and 13 deletions

View File

@ -207,7 +207,7 @@ void WINAPI DebugBreak16( CONTEXT86 *context )
rec.ExceptionCode = EXCEPTION_BREAKPOINT;
rec.ExceptionFlags = 0;
rec.ExceptionRecord = NULL;
rec.ExceptionAddress = GET_IP(context);
rec.ExceptionAddress = (LPVOID)context->Eip;
rec.NumberParameters = 0;
NtRaiseException( &rec, context, TRUE );
#endif /* defined(__i386__) */

View File

@ -27,7 +27,16 @@ typedef struct
EXCEPTION_FRAME *prevFrame;
} EXC_NESTED_FRAME;
#ifdef __i386__
# define GET_IP(context) ((LPVOID)(context)->Eip)
#endif
#ifdef __sparc__
# define GET_IP(context) ((LPVOID)(context)->pc)
#endif
#ifndef GET_IP
# error You must define GET_IP for this CPU
#endif
/*******************************************************************
* EXC_RaiseHandler
*

View File

@ -793,17 +793,6 @@ typedef HANDLE *PHANDLE;
#error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU
#endif
#ifdef __i386__
# define GET_IP(context) ((LPVOID)(context)->Eip)
#endif
#ifdef __sparc__
# define GET_IP(context) ((LPVOID)(context)->pc)
#endif
#if !defined(GET_IP) && !defined(RC_INVOKED)
# error You must define GET_IP for this CPU
#endif
/* Constructor functions */
#ifdef __GNUC__