system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 15:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

A few optimizations.

Browse source
This commit is contained in:
Alexandre Julliard 1999-06-18 18:26:35 +00:00
parent 94eedf1df0
commit 58371aa361
2 changed files with 52 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
include/wine/exception.h
View file

@ -41,8 +41,9 @@
* The finally_func must be defined with the WINE_FINALLY_FUNC macro.
*
* Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements
* break out of the current block. 'return' causes disaster and must
* never be used.
* break out of the current block. You cannot use 'return', 'goto'
* or 'longjmp' to leave a __TRY block, as this will surely crash.
* You can use them to leave a __EXCEPT block though.
*
* -- AJ
*/
@ -54,8 +55,8 @@
#ifdef USE_COMPILER_EXCEPTIONS
#define __TRY __try
#define __EXCEPT(func,arg) __except((func)(GetExceptionInformation(),GetExceptionCode(),(arg)))
#define __FINALLY(func,arg) __finally { (func)(!AbnormalTermination(),(arg)); }
#define __EXCEPT(func) __except((func)(GetExceptionInformation()))
#define __FINALLY(func) __finally { (func)(!AbnormalTermination()); }
#define __ENDTRY /*nothing*/
#else /* USE_COMPILER_EXCEPTIONS */
@ -67,17 +68,16 @@
{ \
do {
#define __EXCEPT(func,arg) \
#define __EXCEPT(func) \
} while(0); \
EXC_pop_frame( &__f.frame ); \
break; \
} else { \
__f.frame.Handler = (PEXCEPTION_HANDLER)WINE_exception_handler; \
__f.u.e.filter = (func); \
__f.u.e.param = (LPVOID)(arg); \
__f.u.filter = (func); \
EXC_push_frame( &__f.frame ); \
if (setjmp( __f.u.e.jmp)) { \
EXC_pop_frame( &__f.frame ); \
if (setjmp( __f.jmp)) { \
const __WINE_FRAME * const __eptr WINE_UNUSED = &__f; \
do {
#define __ENDTRY \
@ -88,57 +88,44 @@
} \
} while (0);
#define __FINALLY(func,arg) \
#define __FINALLY(func) \
} while(0); \
EXC_pop_frame( &__f.frame ); \
(func)( TRUE, (LPVOID)(arg) ); \
(func)(1); \
break; \
} else { \
__f.frame.Handler = (PEXCEPTION_HANDLER)WINE_finally_handler; \
__f.u.f.finally_func = (func); \
__f.u.f.param = (LPVOID)(arg); \
__f.u.finally_func = (func); \
EXC_push_frame( &__f.frame ); \
__first = 0; \
} \
} while (0);
/* Dummy structure for using GetExceptionCode in filter as well as in handler */
typedef struct
{
union { struct { DWORD code; } e; } u;
} __WINE_DUMMY_FRAME;
typedef DWORD (*CALLBACK __WINE_FILTER)(PEXCEPTION_POINTERS);
typedef void (*CALLBACK __WINE_FINALLY)(BOOL);
typedef DWORD (*CALLBACK __WINE_FILTER)(PEXCEPTION_POINTERS,__WINE_DUMMY_FRAME,LPVOID);
typedef void (*CALLBACK __WINE_FINALLY)(BOOL,LPVOID);
#define WINE_EXCEPTION_FILTER(func,arg) \
DWORD WINAPI func( EXCEPTION_POINTERS *__eptr, __WINE_DUMMY_FRAME __f, LPVOID arg )
#define WINE_FINALLY_FUNC(func,arg) \
void WINAPI func( BOOL __normal, LPVOID arg )
#define WINE_EXCEPTION_FILTER(func) DWORD WINAPI func( EXCEPTION_POINTERS *__eptr )
#define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal )
#define GetExceptionInformation() (__eptr)
#define GetExceptionCode() (__f.u.e.code)
#define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode)
#define AbnormalTermination() (!__normal)
typedef struct
typedef struct __tagWINE_FRAME
{
EXCEPTION_FRAME frame;
union
{
struct /* exception data */
{
__WINE_FILTER filter;
LPVOID param;
DWORD code;
jmp_buf jmp;
} e;
struct /* finally data */
{
__WINE_FINALLY finally_func;
LPVOID param;
} f;
/* exception data */
__WINE_FILTER filter;
/* finally data */
__WINE_FINALLY finally_func;
} u;
jmp_buf jmp;
/* hack to make GetExceptionCode() work in handler */
DWORD ExceptionCode;
const struct __tagWINE_FRAME *ExceptionRecord;
} __WINE_FRAME;
extern DWORD WINAPI WINE_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_FRAME *frame,
@ -158,7 +145,7 @@ static inline EXCEPTION_FRAME *EXC_push_frame( EXCEPTION_FRAME *frame )
: "=&r" (prev) : "r" (frame) : "memory" );
return prev;
#else
TEB * teb = NtCurrentTeb();
TEB * teb = CURRENT();
frame->Prev = teb->except;
teb->except = frame;
return frame->Prev;
@ -173,9 +160,16 @@ static inline EXCEPTION_FRAME *EXC_pop_frame( EXCEPTION_FRAME *frame )
return frame->Prev;
#else
NtCurrentTeb()->except = frame->Prev;
CURRENT()->except = frame->Prev;
return frame->Prev;
#endif
}
#ifdef __WINE__
typedef DWORD (*DEBUGHOOK)( EXCEPTION_RECORD *, CONTEXT *, BOOL );
extern void EXC_SetDebugEventHook( DEBUGHOOK hook );
extern DEBUGHOOK EXC_GetDebugEventHook(void);
extern void EXC_InitHandlers(void);
#endif
#endif /* __WINE_WINE_EXCEPTION_H */

30
win32/except.c
View file

@ -69,17 +69,19 @@ DWORD WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers)
char message[80];
PDB *pdb = PROCESS_Current();
if (pdb->flags & PDB32_DEBUGGED)
{
if (DEBUG_SendExceptionEvent( epointers->ExceptionRecord, FALSE ) == DBG_CONTINUE)
return EXCEPTION_CONTINUE_EXECUTION;
}
else if (pdb->top_filter)
if (pdb->flags & PDB32_DEBUGGED) return EXCEPTION_CONTINUE_SEARCH;
if (pdb->top_filter)
{
DWORD ret = pdb->top_filter( epointers );
if (ret != EXCEPTION_CONTINUE_SEARCH) return ret;
}
/* FIXME: does not belong here */
if (((*EXC_GetDebugEventHook())( epointers->ExceptionRecord,
epointers->ContextRecord, FALSE )) == DBG_CONTINUE)
return EXCEPTION_CONTINUE_EXECUTION;
/* FIXME: Should check the current error mode */
sprintf( message, "Unhandled exception 0x%08lx at address 0x%08lx.",
@ -115,15 +117,12 @@ DWORD WINAPI WINE_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *
if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL))
return ExceptionContinueSearch;
if (wine_frame->u.e.filter)
if (wine_frame->u.filter)
{
EXCEPTION_POINTERS ptrs;
__WINE_DUMMY_FRAME dummy;
ptrs.ExceptionRecord = record;
ptrs.ContextRecord = context;
dummy.u.e.code = record->ExceptionCode;
switch(wine_frame->u.e.filter( &ptrs, dummy, wine_frame->u.e.param ))
switch(wine_frame->u.filter( &ptrs ))
{
case EXCEPTION_CONTINUE_SEARCH:
return ExceptionContinueSearch;
@ -136,8 +135,13 @@ DWORD WINAPI WINE_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *
assert( FALSE );
}
}
/* hack to make GetExceptionCode() work in handler */
wine_frame->ExceptionCode = record->ExceptionCode;
wine_frame->ExceptionRecord = wine_frame;
RtlUnwind( frame, 0, record, 0 );
longjmp( wine_frame->u.e.jmp, 1 );
EXC_pop_frame( frame );
longjmp( wine_frame->jmp, 1 );
}
@ -153,6 +157,6 @@ DWORD WINAPI WINE_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_FRAME *fr
if (!(record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)))
return ExceptionContinueSearch;
wine_frame->u.f.finally_func( FALSE, wine_frame->u.f.param );
wine_frame->u.finally_func( FALSE );
return ExceptionContinueSearch;
}