Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-22 13:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PSEH3]

Browse source 
Make sure _abnormal_termination() returns the correct result and make sure the compiler does not rely on register values in the finally and filter function.
The C++ PSEH tests now all pass.
=> We now have PSEH support for C++.

svn path=/trunk/; revision=62630
This commit is contained in:
Timo Kreuzer 2014-04-05 16:56:00 +00:00
parent 73512e7ad4
commit 913e1ed8b9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/include/reactos/libs/pseh/pseh3.h
View file

@ -230,17 +230,19 @@ _SEH3$_AutoCleanup(
#define _SEH3$_NESTED_FUNC_RETURN(_Result) \ #define _SEH3$_NESTED_FUNC_RETURN(_Result) \
/* Restore esp and return to the caller */ \ /* Restore esp and return to the caller */ \
asm volatile ("movl %[FixedEsp], %%esp\nret\n" \ asm volatile ("movl %[FixedEsp], %%esp\nret\n" \
: : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "memory") : : "a"(_Result), [FixedEsp]"m"(_SEH3$_TrylevelFrame.AllocaFrame) : "ebx", "ecx", "edx", "esi", "edi", "flags", "memory")
/* The filter "function" */ /* The filter "function" */
#define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ #define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \
{ \ { \
/* Evaluate and return the filter expression */ \ /* Evaluate and return the filter expression */ \
asm volatile ("#\n" : : : "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"); \
_SEH3$_NESTED_FUNC_RETURN((expression)); \ _SEH3$_NESTED_FUNC_RETURN((expression)); \
} }
#define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ #define _SEH3$_FINALLY_FUNC_OPEN(_Name) \
{ \ { \
asm volatile ("#\n" : : : "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory"); \
/* This construct makes sure that the finally function returns */ \ /* This construct makes sure that the finally function returns */ \
/* a proper value at the end */ \ /* a proper value at the end */ \
for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(0); 0;})) for (; ; (void)({_SEH3$_NESTED_FUNC_RETURN(0); 0;}))
@ -429,6 +431,7 @@ _SEH3$_AutoCleanup(
/* Register the registration record. */ \ /* Register the registration record. */ \
if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ if (_SEH3$_TryLevel == 1) _SEH3$_RegisterFrame_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \ else _SEH3$_RegisterTryLevel_(&_SEH3$_TrylevelFrame, &_SEH3$_ScopeTable); \
_SEH3$_TrylevelFrame.ExceptionPointers = (PSEH3$_EXCEPTION_POINTERS)1; \
\ \
goto _SEH3$_l_DoTry; \ goto _SEH3$_l_DoTry; \
\ \