Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[dgorbachev] 38083: - Use HEAP_ZERO_MEMORY instead of memset(). - Do not crash if no adapter found.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 14 14:45:16 2008 New Revision: 38083 URL: http://svn.reactos.org/svn/reactos?rev=38083&view=rev Log: - Use HEAP_ZERO_MEMORY instead of memset(). - Do not crash if no adapter found. Modified: trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=38… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Sun Dec 14 14:45:16 2008 @@ -162,7 +162,7 @@ InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc, PropPages[i].Callback); } - /* NOTE: Don;t call SHAddFromPropSheetExtArray here because this applet only allows + /* NOTE: Don't call SHAddFromPropSheetExtArray here because this applet only allows replacing the background page but not extending the applet by more pages */ ret = (LONG)(PropertySheet(&psh) != -1); Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/settings.c [iso-8859-1] Sun Dec 14 14:45:16 2008 @@ -151,8 +151,7 @@ DWORD ResolutionsCount = 1; DWORD i; - newEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(DISPLAY_DEVICE_ENTRY)); - memset(newEntry, 0, sizeof(DISPLAY_DEVICE_ENTRY)); + newEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DISPLAY_DEVICE_ENTRY)); if (!newEntry) goto ByeBye; newEntry->Settings = GetPossibleSettings(DisplayDevice->DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); @@ -311,6 +310,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_ADVANCED), FALSE); + ShowWindow(GetDlgItem(hwndDlg, IDC_SETTINGS_SPECTRUM), SW_HIDE); } else if (Result == 1) {

16 years

[hyperion] 38084: Supersedes r38081 modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Simulate a no-o

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Dec 14 15:50:31 2008 New Revision: 38084 URL: http://svn.reactos.org/svn/reactos?rev=38084&view=rev Log: Supersedes r38081 modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Simulate a no-op setjmp so that GCC correctly handles variables in registers, instead of surprise-corrupting random variables in random conditions Save EBP every time a _SEH2_TRY/_SEH2_EXCEPT is entered, instead of only the first time: correctly handles code compiled with -fomit-frame-pointers Don't generate a nested function for a _SEH2_EXCEPT() filter expression if the value is a compile-time constant: convert the value to (void *)0, (void *)1 or (void *)-1, and set that as the filter, instead (like Visual C++ does, incidentally) If a _SEH2_EXCEPT() filter expression is a compile-time constant evaluating to EXCEPTION_CONTINUE_EXECUTION or EXCEPTION_CONTINUE_SEARCH, allow GCC to optimize out the body of the _SEH2_EXCEPT (because it'd be unreachable). This should really result in a compile-time warning, but #pragma message is unsupported in GCC 4.1.3 Let _SEH2_EXCEPT() accept a comma expression as filter expression (e.g. _SEH2_EXCEPT(MessageBox(...), EXCEPTION_EXECUTE_HANDLER) instead of _SEH2_EXCEPT((MessageBox(...), EXCEPTION_EXECUTE_HANDLER))) Small optimizations in PSEH library Clean up GCC hacks Remove currently unused PSEH 3 hacks Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Dec 14 15:50:31 2008 @@ -48,6 +48,7 @@ volatile struct __SEH2TryLevel * volatile SF_TopTryLevel; void * volatile SF_FramePointer; void * volatile SF_StackPointer; + struct _EXCEPTION_POINTERS * volatile SF_ExceptionInformation; volatile unsigned long SF_Code; } _SEH2Frame_t; @@ -55,7 +56,6 @@ typedef struct __SEH2TryLevel { volatile struct __SEH2TryLevel * ST_Next; - void * ST_FramePointer; void * ST_Filter; void * ST_Body; } @@ -119,33 +119,41 @@ /* A no-op without any real side effects, but silences warnings */ #define __SEH_PRETEND_SIDE_EFFECT (void)0 -/* Forces GCC to consider the specified label reachable */ -#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) +/* Forces the specified label to be reachable */ +#define __SEH_USE_LABEL(L_) if(__SEH_VOLATILE_FALSE) goto L_; /* Makes GCC pretend the specified label is reachable, to silence warnings */ #define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) -/* Forces GCC to emit the specified nested function as a function */ -#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ - /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") /* GCC doesn't know that this equals zero */ -#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) - -#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) -#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) +#define __SEH_VOLATILE_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +/* GCC believes this is setjmp */ +#define __SEH_PRETEND_SETJMP() (_SEH2PretendSetjmp(), 0) + +#define __SEH_VOLATILE_FALSE __builtin_expect(__SEH_VOLATILE_ZERO, 0) +#define __SEH_VOLATILE_TRUE __builtin_expect(!__SEH_VOLATILE_ZERO, 1) + +#define ___SEH_STRINGIFY(X_) # X_ +#define __SEH_STRINGIFY(X_) ___SEH_STRINGIFY(X_) + +static +__inline__ +__attribute__((returns_twice)) +__attribute__((always_inline)) +void _SEH2PretendSetjmp(void) +{ +} #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) -#define __SEH_NESTED_PROLOG \ - __SEH_FORCE_NEST; - -#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) -#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) -#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void * _SEHExceptionPointers) +#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void) +#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void) +#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void) #define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) #define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) @@ -155,21 +163,19 @@ #define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ + if(!__SEH_PRETEND_SETJMP()) \ { \ - __label__ _SEHBeginTry; \ __label__ _SEHEndTry; \ - \ - __SEH_USE_LABEL(_SEHBeginTry); \ - __SEH_USE_LABEL(_SEHEndTry); \ - \ - _SEHBeginTry: __SEH_SIDE_EFFECT; \ + \ + __SEH_PRETEND_USE_LABEL(_SEHEndTry); \ + \ { \ __SEH_BARRIER; #define __SEH_END_TRY \ __SEH_BARRIER; \ } \ - _SEHEndTry: __SEH_SIDE_EFFECT; \ + _SEHEndTry:; \ } #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ @@ -188,11 +194,6 @@ #define __SEH_BEGIN_SCOPE \ for(;;) \ { \ - __label__ _SEHBeginScope; \ - __label__ _SEHEndScope; \ - \ - _SEHBeginScope: __SEH_SIDE_EFFECT; \ - \ const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ @@ -200,9 +201,6 @@ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ (void)_SEHPrevTryLevelP; \ - \ - __SEH_USE_LABEL(_SEHBeginScope); \ - __SEH_USE_LABEL(_SEHEndScope); \ \ { \ __label__ _SEHBeforeTry; \ @@ -227,15 +225,10 @@ __SEH_ENTER_TRYLEVEL(); \ \ if(_SEHTopTryLevel) \ - { \ - __SEH_BARRIER; __asm__ __volatile__("mov %%ebp, %0\n#%1" : "=m" (_SEHFrame.SF_FramePointer) : "r" (__builtin_frame_address(0))); __SEH_BARRIER; \ _SEH2EnterFrame(&_SEHFrame); \ - } \ #define __SEH_END_SCOPE \ } \ - \ - _SEHEndScope: __SEH_SIDE_EFFECT; \ \ break; \ } @@ -244,14 +237,13 @@ __label__ _SEHBeginExcept; \ __label__ _SEHEndExcept; \ \ - auto __SEH_DECLARE_EXCEPT(_SEHExcept); \ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \ -\ + \ __SEH_BEGIN_TRY \ { @@ -265,11 +257,8 @@ __SEH_PRETEND_USE_LABEL(_SEHBeginExcept); \ __SEH_PRETEND_USE_LABEL(_SEHEndExcept); \ \ - __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ _SEHTryLevel.ST_Filter = 0; \ - _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ + _SEHTryLevel.ST_Body = &_SEHFinally; \ \ goto _SEHDoTry; \ _SEHAfterTry:; \ @@ -284,10 +273,9 @@ _SEHFinally(); \ goto _SEHEndExcept; \ \ - _SEHBeginExcept: __SEH_PRETEND_SIDE_EFFECT; \ - __attribute__((unused)) __SEH_DEFINE_EXCEPT(_SEHExcept) { __SEH_RETURN_EXCEPT(0); } \ - \ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_FINALLY(_SEHFinally) \ + _SEHBeginExcept:; \ + \ + __attribute__((noinline)) __SEH_DEFINE_FINALLY(_SEHFinally) \ { \ __SEH_END_SCOPE_CHAIN; \ \ @@ -295,39 +283,64 @@ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \ - __SEH_NESTED_PROLOG; \ - \ for(;; ({ __SEH_RETURN_FINALLY(); })) \ { -#define _SEH2_EXCEPT(E_) \ +#define _SEH2_EXCEPT(...) \ } \ __SEH_END_TRY; \ \ goto _SEHAfterTry; \ \ _SEHBeforeTry:; \ -\ - __SEH_USE_LABEL(_SEHBeginExcept); \ - __SEH_USE_LABEL(_SEHEndExcept); \ -\ - __SEH_USE_NESTED_FUNCTION(_SEHExcept); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ -\ + \ + if(__builtin_constant_p((__VA_ARGS__))) \ + { \ + if((__VA_ARGS__) > 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)1; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + else if((__VA_ARGS__) < 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)-1; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + else \ + { \ + _SEHTryLevel.ST_Filter = (void *)0; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + } \ + else \ + { \ + __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + } \ + \ + _SEHTryLevel.ST_Filter = &_SEHExcept; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + \ + __SEH_BARRIER; \ + \ + __asm__ __volatile__ \ + ( \ + "mov %%ebp, %0\n" \ + "mov %%esp, %1" : \ + "=m" (_SEH2FrameP->SF_FramePointer), \ + "=m" (_SEH2FrameP->SF_StackPointer) \ + ); \ + \ + __SEH_BARRIER; \ + \ goto _SEHDoTry; \ -\ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_EXCEPT(_SEHExcept) \ - { \ - __SEH_NESTED_PROLOG; \ - __SEH_RETURN_EXCEPT(E_); \ - } \ -\ + \ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ -\ + \ _SEHAfterTry:; \ if(_SEHTopTryLevel) \ _SEH2LeaveFrame(); \ @@ -336,12 +349,9 @@ __SEH_LEAVE_TRYLEVEL(); \ } \ \ - if(__SEH_FALSE) \ - goto _SEHBeginExcept; \ - else \ - goto _SEHEndExcept; \ -\ - _SEHBeginExcept: __SEH_SIDE_EFFECT; \ + goto _SEHEndExcept; \ + \ + _SEHBeginExcept:; \ { \ { \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ @@ -352,11 +362,12 @@ __SEH_BARRIER; \ } \ } \ - _SEHEndExcept: __SEH_SIDE_EFFECT; \ + \ + _SEHEndExcept:; \ } \ __SEH_END_SCOPE; -#define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) +#define _SEH2_GetExceptionInformation() ((_SEH2FrameP)->SF_ExceptionInformation) #define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) #define _SEH2_AbnormalTermination() (!!_SEH2_GetExceptionCode()) @@ -379,7 +390,7 @@ #define _SEH2_TRY __try #define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(E_) __except((E_)) +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) #define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sun Dec 14 15:50:31 2008 @@ -40,7 +40,7 @@ extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); extern void _SEH2GlobalUnwind(void *); -extern int __SEH2Except(void *, void *, void *); +extern int __SEH2Except(void *, void *); extern void __SEH2Finally(void *, void *); extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); @@ -51,9 +51,27 @@ extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); FORCEINLINE -int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) -{ - return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); +int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) +{ + void * filter = trylevel->ST_Filter; + void * context = NULL; + + if(filter == (void *)0) + return 0; + + if(filter == (void *)1) + return 1; + + if(filter == (void *)-1) + return -1; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)filter)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)filter); + filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); + } + + return __SEH2Except(filter, context); } static @@ -62,7 +80,16 @@ #endif void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { - __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); + void * body = trylevel->ST_Body; + void * context = NULL; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)body)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)body); + body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); + } + + __SEH2Finally(body, context); } extern @@ -91,10 +118,7 @@ __SEH2EnterFrame(&nestedframe); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) - { - if(!trylevel->ST_Filter) - _SEH2Finally(frame, trylevel); - } + _SEH2Finally(frame, trylevel); frame->SF_TopTryLevel = dsttrylevel; @@ -132,25 +156,22 @@ { int ret = 0; volatile _SEH2TryLevel_t * trylevel; + EXCEPTION_POINTERS ep; + + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; frame->SF_Code = ExceptionRecord->ExceptionCode; + frame->SF_ExceptionInformation = &ep; for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) { - if(trylevel->ST_Filter) - { - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; - - ret = _SEH2Except(frame, trylevel, &ep); - - if(ret < 0) - return ExceptionContinueExecution; - else if(ret > 0) - _SEH2Handle(frame, trylevel); - } + ret = _SEH2Except(frame, trylevel); + + if(ret < 0) + return ExceptionContinueExecution; + else if(ret > 0) + _SEH2Handle(frame, trylevel); } } Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Sun Dec 14 15:50:31 2008 @@ -49,18 +49,8 @@ jmp eax .globl ___SEH2Except +.globl ___SEH2Finally ___SEH2Except: - mov eax, [esp+4] - mov ecx, [esp+8] - - push [esp+12] - call eax - - pop ecx - - ret - -.globl ___SEH2Finally ___SEH2Finally: mov eax, [esp+4] mov ecx, [esp+8]

16 years

[hyperion] 38082: Revert r38081

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Dec 14 13:54:52 2008 New Revision: 38082 URL: http://svn.reactos.org/svn/reactos?rev=38082&view=rev Log: Revert r38081 Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Dec 14 13:54:52 2008 @@ -55,6 +55,7 @@ typedef struct __SEH2TryLevel { volatile struct __SEH2TryLevel * ST_Next; + void * ST_FramePointer; void * ST_Filter; void * ST_Body; } @@ -119,36 +120,28 @@ #define __SEH_PRETEND_SIDE_EFFECT (void)0 /* Forces GCC to consider the specified label reachable */ -#define __SEH_USE_LABEL(L_) if(__SEH_VOLATILE_FALSE) goto L_; +#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) /* Makes GCC pretend the specified label is reachable, to silence warnings */ #define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) +/* Forces GCC to emit the specified nested function as a function */ +#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ + /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") /* GCC doesn't know that this equals zero */ -#define __SEH_VOLATILE_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) - -/* GCC believes this is setjmp */ -#define __SEH_PRETEND_SETJMP() (_SEH2PretendSetjmp(), __SEH_VOLATILE_FALSE) - -#define __SEH_VOLATILE_FALSE __builtin_expect(__SEH_VOLATILE_ZERO, 0) -#define __SEH_VOLATILE_TRUE __builtin_expect(!__SEH_VOLATILE_ZERO, 1) - -#define ___SEH_STRINGIFY(X_) # X_ -#define __SEH_STRINGIFY(X_) ___SEH_STRINGIFY(X_) - -static -__inline__ -__attribute__((returns_twice)) -__attribute__((always_inline)) -void _SEH2PretendSetjmp(void) -{ -} +#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) +#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) + +#define __SEH_NESTED_PROLOG \ + __SEH_FORCE_NEST; #define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) #define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) @@ -162,19 +155,21 @@ #define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ - if(!__SEH_PRETEND_SETJMP()) \ - { \ + { \ + __label__ _SEHBeginTry; \ __label__ _SEHEndTry; \ - \ - __SEH_PRETEND_USE_LABEL(_SEHEndTry); \ - \ + \ + __SEH_USE_LABEL(_SEHBeginTry); \ + __SEH_USE_LABEL(_SEHEndTry); \ + \ + _SEHBeginTry: __SEH_SIDE_EFFECT; \ { \ __SEH_BARRIER; #define __SEH_END_TRY \ __SEH_BARRIER; \ } \ - _SEHEndTry:; \ + _SEHEndTry: __SEH_SIDE_EFFECT; \ } #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ @@ -193,6 +188,11 @@ #define __SEH_BEGIN_SCOPE \ for(;;) \ { \ + __label__ _SEHBeginScope; \ + __label__ _SEHEndScope; \ + \ + _SEHBeginScope: __SEH_SIDE_EFFECT; \ + \ const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ @@ -200,6 +200,9 @@ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ (void)_SEHPrevTryLevelP; \ + \ + __SEH_USE_LABEL(_SEHBeginScope); \ + __SEH_USE_LABEL(_SEHEndScope); \ \ { \ __label__ _SEHBeforeTry; \ @@ -224,10 +227,15 @@ __SEH_ENTER_TRYLEVEL(); \ \ if(_SEHTopTryLevel) \ + { \ + __SEH_BARRIER; __asm__ __volatile__("mov %%ebp, %0\n#%1" : "=m" (_SEHFrame.SF_FramePointer) : "r" (__builtin_frame_address(0))); __SEH_BARRIER; \ _SEH2EnterFrame(&_SEHFrame); \ + } \ #define __SEH_END_SCOPE \ } \ + \ + _SEHEndScope: __SEH_SIDE_EFFECT; \ \ break; \ } @@ -236,13 +244,14 @@ __label__ _SEHBeginExcept; \ __label__ _SEHEndExcept; \ \ + auto __SEH_DECLARE_EXCEPT(_SEHExcept); \ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \ - \ +\ __SEH_BEGIN_TRY \ { @@ -256,8 +265,11 @@ __SEH_PRETEND_USE_LABEL(_SEHBeginExcept); \ __SEH_PRETEND_USE_LABEL(_SEHEndExcept); \ \ + __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ + \ + _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ _SEHTryLevel.ST_Filter = 0; \ - _SEHTryLevel.ST_Body = &_SEHFinally; \ + _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ \ goto _SEHDoTry; \ _SEHAfterTry:; \ @@ -272,9 +284,10 @@ _SEHFinally(); \ goto _SEHEndExcept; \ \ - _SEHBeginExcept:; \ - \ - __attribute__((noinline)) __SEH_DEFINE_FINALLY(_SEHFinally) \ + _SEHBeginExcept: __SEH_PRETEND_SIDE_EFFECT; \ + __attribute__((unused)) __SEH_DEFINE_EXCEPT(_SEHExcept) { __SEH_RETURN_EXCEPT(0); } \ + \ + __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_FINALLY(_SEHFinally) \ { \ __SEH_END_SCOPE_CHAIN; \ \ @@ -282,64 +295,39 @@ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \ + __SEH_NESTED_PROLOG; \ + \ for(;; ({ __SEH_RETURN_FINALLY(); })) \ { -#define _SEH2_EXCEPT(...) \ +#define _SEH2_EXCEPT(E_) \ } \ __SEH_END_TRY; \ \ goto _SEHAfterTry; \ \ _SEHBeforeTry:; \ - \ - if(__builtin_constant_p((__VA_ARGS__))) \ - { \ - if((__VA_ARGS__) > 0) \ - { \ - _SEHTryLevel.ST_Filter = (void *)1; \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_USE_LABEL(_SEHBeginExcept); \ - } \ - else if((__VA_ARGS__) < 0) \ - { \ - _SEHTryLevel.ST_Filter = (void *)-1; \ - _SEHTryLevel.ST_Body = NULL; \ - } \ - else \ - { \ - _SEHTryLevel.ST_Filter = (void *)0; \ - _SEHTryLevel.ST_Body = NULL; \ - } \ - } \ - else \ - { \ - __SEH_DEFINE_EXCEPT(_SEHExcept) \ - { \ - __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ - } \ - \ - _SEHTryLevel.ST_Filter = &_SEHExcept; \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_USE_LABEL(_SEHBeginExcept); \ - } \ - \ - __SEH_BARRIER; \ - \ - __asm__ __volatile__ \ - ( \ - "mov %%ebp, %0\n" \ - "mov %%esp, %1" : \ - "=m" (_SEH2FrameP->SF_FramePointer), \ - "=m" (_SEH2FrameP->SF_StackPointer) \ - ); \ - \ - __SEH_BARRIER; \ - \ +\ + __SEH_USE_LABEL(_SEHBeginExcept); \ + __SEH_USE_LABEL(_SEHEndExcept); \ +\ + __SEH_USE_NESTED_FUNCTION(_SEHExcept); \ + \ + _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ + _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ +\ goto _SEHDoTry; \ - \ +\ + __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_NESTED_PROLOG; \ + __SEH_RETURN_EXCEPT(E_); \ + } \ +\ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ - \ +\ _SEHAfterTry:; \ if(_SEHTopTryLevel) \ _SEH2LeaveFrame(); \ @@ -348,9 +336,12 @@ __SEH_LEAVE_TRYLEVEL(); \ } \ \ - goto _SEHEndExcept; \ - \ - _SEHBeginExcept:; \ + if(__SEH_FALSE) \ + goto _SEHBeginExcept; \ + else \ + goto _SEHEndExcept; \ +\ + _SEHBeginExcept: __SEH_SIDE_EFFECT; \ { \ { \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ @@ -361,8 +352,7 @@ __SEH_BARRIER; \ } \ } \ - \ - _SEHEndExcept:; \ + _SEHEndExcept: __SEH_SIDE_EFFECT; \ } \ __SEH_END_SCOPE; @@ -389,7 +379,7 @@ #define _SEH2_TRY __try #define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) +#define _SEH2_EXCEPT(E_) __except((E_)) #define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sun Dec 14 13:54:52 2008 @@ -53,25 +53,7 @@ FORCEINLINE int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { - void * filter = trylevel->ST_Filter; - void * context = NULL; - - if(filter == (void *)0) - return 0; - - if(filter == (void *)1) - return 1; - - if(filter == (void *)-1) - return -1; - - if(_SEHIsTrampoline((_SEHTrampoline_t *)filter)) - { - context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)filter); - filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); - } - - return __SEH2Except(filter, context, ep); + return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); } static @@ -80,16 +62,7 @@ #endif void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { - void * body = trylevel->ST_Body; - void * context = NULL; - - if(_SEHIsTrampoline((_SEHTrampoline_t *)body)) - { - context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)body); - body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); - } - - __SEH2Finally(body, context); + __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); } extern @@ -118,7 +91,10 @@ __SEH2EnterFrame(&nestedframe); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) - _SEH2Finally(frame, trylevel); + { + if(!trylevel->ST_Filter) + _SEH2Finally(frame, trylevel); + } frame->SF_TopTryLevel = dsttrylevel; @@ -156,21 +132,25 @@ { int ret = 0; volatile _SEH2TryLevel_t * trylevel; - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; frame->SF_Code = ExceptionRecord->ExceptionCode; for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) { - ret = _SEH2Except(frame, trylevel, &ep); + if(trylevel->ST_Filter) + { + EXCEPTION_POINTERS ep; - if(ret < 0) - return ExceptionContinueExecution; - else if(ret > 0) - _SEH2Handle(frame, trylevel); + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; + + ret = _SEH2Except(frame, trylevel, &ep); + + if(ret < 0) + return ExceptionContinueExecution; + else if(ret > 0) + _SEH2Handle(frame, trylevel); + } } }

16 years

[hyperion] 38081: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Simulate a no-op setjmp so that GCC correctly handles variables in registers,

by hyperion＠svn.reactos.org

Author: hyperion Date: Sun Dec 14 13:49:05 2008 New Revision: 38081 URL: http://svn.reactos.org/svn/reactos?rev=38081&view=rev Log: modified include/reactos/libs/pseh/pseh2.h modified lib/pseh/framebased-gcchack.c Disassemble trampolines in the library, instead of the macros. Results in better, smaller code. As a side effect, PSEH no longer requires a trampoline for nested functions - which results in even better, even smaller code in many common cases where the nested functions don't use any variables from the containing function Simulate a no-op setjmp so that GCC correctly handles variables in registers, instead of surprise-corrupting random variables in random conditions Save EBP every time a _SEH2_TRY/_SEH2_EXCEPT is entered, instead of only the first time: correctly handles code compiled with -fomit-frame-pointers Don't generate a nested function for a _SEH2_EXCEPT() filter expression if the value is a compile-time constant: convert the value to (void *)0, (void *)1 or (void *)-1, and set that as the filter, instead (like Visual C++ does, incidentally) If a _SEH2_EXCEPT() filter expression is a compile-time constant evaluating to EXCEPTION_CONTINUE_EXECUTION or EXCEPTION_CONTINUE_SEARCH, allow GCC to optimize out the body of the _SEH2_EXCEPT (because it'd be unreachable). This should really result in a compile-time warning, but #pragma message is unsupported in GCC 4.1.3 Let _SEH2_EXCEPT() accept a comma expression as filter expression (e.g. _SEH2_EXCEPT(MessageBox(...), EXCEPTION_EXECUTE_HANDLER) instead of _SEH2_EXCEPT((MessageBox(...), EXCEPTION_EXECUTE_HANDLER))) Small optimizations in PSEH library Clean up GCC hacks Remove currently unused PSEH 3 hacks Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h trunk/reactos/lib/pseh/framebased-gcchack.c Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Sun Dec 14 13:49:05 2008 @@ -55,7 +55,6 @@ typedef struct __SEH2TryLevel { volatile struct __SEH2TryLevel * ST_Next; - void * ST_FramePointer; void * ST_Filter; void * ST_Body; } @@ -120,28 +119,36 @@ #define __SEH_PRETEND_SIDE_EFFECT (void)0 /* Forces GCC to consider the specified label reachable */ -#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) +#define __SEH_USE_LABEL(L_) if(__SEH_VOLATILE_FALSE) goto L_; /* Makes GCC pretend the specified label is reachable, to silence warnings */ #define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) -/* Forces GCC to emit the specified nested function as a function */ -#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ - /* Soft memory barrier */ #define __SEH_BARRIER __asm__ __volatile__("#":::"memory") /* GCC doesn't know that this equals zero */ -#define __SEH_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) - -#define __SEH_FALSE __builtin_expect(__SEH_ZERO, 0) -#define __SEH_TRUE __builtin_expect(!__SEH_ZERO, 1) +#define __SEH_VOLATILE_ZERO ({ int zero = 0; __asm__ __volatile__("#" : "+g" (zero)); zero; }) + +/* GCC believes this is setjmp */ +#define __SEH_PRETEND_SETJMP() (_SEH2PretendSetjmp(), __SEH_VOLATILE_FALSE) + +#define __SEH_VOLATILE_FALSE __builtin_expect(__SEH_VOLATILE_ZERO, 0) +#define __SEH_VOLATILE_TRUE __builtin_expect(!__SEH_VOLATILE_ZERO, 1) + +#define ___SEH_STRINGIFY(X_) # X_ +#define __SEH_STRINGIFY(X_) ___SEH_STRINGIFY(X_) + +static +__inline__ +__attribute__((returns_twice)) +__attribute__((always_inline)) +void _SEH2PretendSetjmp(void) +{ +} #define __SEH_FORCE_NEST \ __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) - -#define __SEH_NESTED_PROLOG \ - __SEH_FORCE_NEST; #define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) #define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) @@ -155,21 +162,19 @@ #define __SEH_RETURN_FINALLY() return #define __SEH_BEGIN_TRY \ + if(!__SEH_PRETEND_SETJMP()) \ { \ - __label__ _SEHBeginTry; \ __label__ _SEHEndTry; \ - \ - __SEH_USE_LABEL(_SEHBeginTry); \ - __SEH_USE_LABEL(_SEHEndTry); \ - \ - _SEHBeginTry: __SEH_SIDE_EFFECT; \ + \ + __SEH_PRETEND_USE_LABEL(_SEHEndTry); \ + \ { \ __SEH_BARRIER; #define __SEH_END_TRY \ __SEH_BARRIER; \ } \ - _SEHEndTry: __SEH_SIDE_EFFECT; \ + _SEHEndTry:; \ } #define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ @@ -188,11 +193,6 @@ #define __SEH_BEGIN_SCOPE \ for(;;) \ { \ - __label__ _SEHBeginScope; \ - __label__ _SEHEndScope; \ - \ - _SEHBeginScope: __SEH_SIDE_EFFECT; \ - \ const int _SEHTopTryLevel = (_SEH2ScopeKind != 0); \ _SEH2Frame_t * const _SEHCurFrameP = _SEH2FrameP; \ volatile _SEH2TryLevel_t * const _SEHPrevTryLevelP = _SEH2TryLevelP; \ @@ -200,9 +200,6 @@ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ (void)_SEHPrevTryLevelP; \ - \ - __SEH_USE_LABEL(_SEHBeginScope); \ - __SEH_USE_LABEL(_SEHEndScope); \ \ { \ __label__ _SEHBeforeTry; \ @@ -227,15 +224,10 @@ __SEH_ENTER_TRYLEVEL(); \ \ if(_SEHTopTryLevel) \ - { \ - __SEH_BARRIER; __asm__ __volatile__("mov %%ebp, %0\n#%1" : "=m" (_SEHFrame.SF_FramePointer) : "r" (__builtin_frame_address(0))); __SEH_BARRIER; \ _SEH2EnterFrame(&_SEHFrame); \ - } \ #define __SEH_END_SCOPE \ } \ - \ - _SEHEndScope: __SEH_SIDE_EFFECT; \ \ break; \ } @@ -244,14 +236,13 @@ __label__ _SEHBeginExcept; \ __label__ _SEHEndExcept; \ \ - auto __SEH_DECLARE_EXCEPT(_SEHExcept); \ auto __SEH_DECLARE_FINALLY(_SEHFinally); #define _SEH2_TRY \ __SEH_BEGIN_SCOPE \ { \ __SEH_SCOPE_LOCALS; \ -\ + \ __SEH_BEGIN_TRY \ { @@ -265,11 +256,8 @@ __SEH_PRETEND_USE_LABEL(_SEHBeginExcept); \ __SEH_PRETEND_USE_LABEL(_SEHEndExcept); \ \ - __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ _SEHTryLevel.ST_Filter = 0; \ - _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ + _SEHTryLevel.ST_Body = &_SEHFinally; \ \ goto _SEHDoTry; \ _SEHAfterTry:; \ @@ -284,10 +272,9 @@ _SEHFinally(); \ goto _SEHEndExcept; \ \ - _SEHBeginExcept: __SEH_PRETEND_SIDE_EFFECT; \ - __attribute__((unused)) __SEH_DEFINE_EXCEPT(_SEHExcept) { __SEH_RETURN_EXCEPT(0); } \ - \ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_FINALLY(_SEHFinally) \ + _SEHBeginExcept:; \ + \ + __attribute__((noinline)) __SEH_DEFINE_FINALLY(_SEHFinally) \ { \ __SEH_END_SCOPE_CHAIN; \ \ @@ -295,39 +282,64 @@ (void)_SEH2FrameP; \ (void)_SEH2TryLevelP; \ \ - __SEH_NESTED_PROLOG; \ - \ for(;; ({ __SEH_RETURN_FINALLY(); })) \ { -#define _SEH2_EXCEPT(E_) \ +#define _SEH2_EXCEPT(...) \ } \ __SEH_END_TRY; \ \ goto _SEHAfterTry; \ \ _SEHBeforeTry:; \ -\ - __SEH_USE_LABEL(_SEHBeginExcept); \ - __SEH_USE_LABEL(_SEHEndExcept); \ -\ - __SEH_USE_NESTED_FUNCTION(_SEHExcept); \ - \ - _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ - _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ - __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEH2FrameP->SF_StackPointer)); __SEH_BARRIER; \ -\ + \ + if(__builtin_constant_p((__VA_ARGS__))) \ + { \ + if((__VA_ARGS__) > 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)1; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + else if((__VA_ARGS__) < 0) \ + { \ + _SEHTryLevel.ST_Filter = (void *)-1; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + else \ + { \ + _SEHTryLevel.ST_Filter = (void *)0; \ + _SEHTryLevel.ST_Body = NULL; \ + } \ + } \ + else \ + { \ + __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_RETURN_EXCEPT((__VA_ARGS__)); \ + } \ + \ + _SEHTryLevel.ST_Filter = &_SEHExcept; \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_USE_LABEL(_SEHBeginExcept); \ + } \ + \ + __SEH_BARRIER; \ + \ + __asm__ __volatile__ \ + ( \ + "mov %%ebp, %0\n" \ + "mov %%esp, %1" : \ + "=m" (_SEH2FrameP->SF_FramePointer), \ + "=m" (_SEH2FrameP->SF_StackPointer) \ + ); \ + \ + __SEH_BARRIER; \ + \ goto _SEHDoTry; \ -\ - __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_EXCEPT(_SEHExcept) \ - { \ - __SEH_NESTED_PROLOG; \ - __SEH_RETURN_EXCEPT(E_); \ - } \ -\ + \ __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ -\ + \ _SEHAfterTry:; \ if(_SEHTopTryLevel) \ _SEH2LeaveFrame(); \ @@ -336,12 +348,9 @@ __SEH_LEAVE_TRYLEVEL(); \ } \ \ - if(__SEH_FALSE) \ - goto _SEHBeginExcept; \ - else \ - goto _SEHEndExcept; \ -\ - _SEHBeginExcept: __SEH_SIDE_EFFECT; \ + goto _SEHEndExcept; \ + \ + _SEHBeginExcept:; \ { \ { \ _SEH2Frame_t * const _SEH2FrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ @@ -352,7 +361,8 @@ __SEH_BARRIER; \ } \ } \ - _SEHEndExcept: __SEH_SIDE_EFFECT; \ + \ + _SEHEndExcept:; \ } \ __SEH_END_SCOPE; @@ -379,7 +389,7 @@ #define _SEH2_TRY __try #define _SEH2_FINALLY __finally -#define _SEH2_EXCEPT(E_) __except((E_)) +#define _SEH2_EXCEPT(...) __except(__VA_ARGS__) #define _SEH2_END #define _SEH2_GetExceptionInformation() (GetExceptionInformation()) Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sun Dec 14 13:49:05 2008 @@ -53,7 +53,25 @@ FORCEINLINE int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel, EXCEPTION_POINTERS * ep) { - return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); + void * filter = trylevel->ST_Filter; + void * context = NULL; + + if(filter == (void *)0) + return 0; + + if(filter == (void *)1) + return 1; + + if(filter == (void *)-1) + return -1; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)filter)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)filter); + filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)filter); + } + + return __SEH2Except(filter, context, ep); } static @@ -62,7 +80,16 @@ #endif void _SEH2Finally(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) { - __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); + void * body = trylevel->ST_Body; + void * context = NULL; + + if(_SEHIsTrampoline((_SEHTrampoline_t *)body)) + { + context = _SEHClosureFromTrampoline((_SEHTrampoline_t *)body); + body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)body); + } + + __SEH2Finally(body, context); } extern @@ -91,10 +118,7 @@ __SEH2EnterFrame(&nestedframe); for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) - { - if(!trylevel->ST_Filter) - _SEH2Finally(frame, trylevel); - } + _SEH2Finally(frame, trylevel); frame->SF_TopTryLevel = dsttrylevel; @@ -132,25 +156,21 @@ { int ret = 0; volatile _SEH2TryLevel_t * trylevel; + EXCEPTION_POINTERS ep; + + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; frame->SF_Code = ExceptionRecord->ExceptionCode; for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) { - if(trylevel->ST_Filter) - { - EXCEPTION_POINTERS ep; - - ep.ExceptionRecord = ExceptionRecord; - ep.ContextRecord = ContextRecord; - - ret = _SEH2Except(frame, trylevel, &ep); - - if(ret < 0) - return ExceptionContinueExecution; - else if(ret > 0) - _SEH2Handle(frame, trylevel); - } + ret = _SEH2Except(frame, trylevel, &ep); + + if(ret < 0) + return ExceptionContinueExecution; + else if(ret > 0) + _SEH2Handle(frame, trylevel); } }

16 years

[tkreuzer] 38080: Patch by encoded: update SHARED_CACHE_MAP

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 14 11:59:11 2008 New Revision: 38080 URL: http://svn.reactos.org/svn/reactos?rev=38080&view=rev Log: Patch by encoded: update SHARED_CACHE_MAP Modified: branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/cctypes.h [iso-8859-1] Sun Dec 14 11:59:11 2008 @@ -98,7 +98,11 @@ LARGE_INTEGER ValidDataGoal; PVACB InitialVacbs[4]; PVACB *Vacbs; - PFILE_OBJECT FileObject; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + EX_FAST_REF FileObjectFastRef; +#else + PFILE_OBJECT FileObject; +#endif PVACB ActiveVacb; PVOID NeedToZero; ULONG ActivePage; @@ -127,9 +131,19 @@ ULONG BcbSpinLock; PVOID Reserved; KEVENT Event; - EX_PUSH_LOCK VacbPushLock; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) //guess + LARGE_INTEGER HighWaterMappingOffset; +#else + EX_PUSH_LOCK VacbPushLock; +#endif PRIVATE_CACHE_MAP PrivateCacheMap; -} SHARED_CACHE_MAP; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PVOID WriteBehindWorkQueueEntry; + PVOLUME_CACHE_MAP VolumeCacheMap; + ULONG ProcImagePathHash; + ULONG MappedWritesInProgress; +#endif +} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP; #endif /* _NTIFS_INCLUDED_ */ #endif /* NTOS_MODE_USER */

16 years

[dgorbachev] 38079: Fix winsta.dll rbuild file.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Dec 14 07:52:28 2008 New Revision: 38079 URL: http://svn.reactos.org/svn/reactos?rev=38079&view=rev Log: Fix winsta.dll rbuild file. Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.rb… ============================================================================== --- trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] Sun Dec 14 07:52:28 2008 @@ -1,6 +1,6 @@ <module name="winsta" type="win32dll" baseaddress="${BASEADDRESS_WINSTA}" installbase="system32" installname="winsta.dll"> <importlibrary definition="winsta.def" /> - <include base="winsta">include</include> + <include base="winsta">.</include> <library>wine</library> <library>kernel32</library> <library>ntdll</library>

16 years

[ekohl] 38078: - SEH-protect LsaClose, LsaDelete and LsaOpenPolicy. - Move the code of LsaOpenPolicy into LsarOpenPolicy and make LsaOpenPolicy call LsarOpenPolicy.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Dec 14 07:16:16 2008 New Revision: 38078 URL: http://svn.reactos.org/svn/reactos?rev=38078&view=rev Log: - SEH-protect LsaClose, LsaDelete and LsaOpenPolicy. - Move the code of LsaOpenPolicy into LsarOpenPolicy and make LsaOpenPolicy call LsarOpenPolicy. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Dec 14 07:16:16 2008 @@ -78,13 +78,21 @@ NTSTATUS WINAPI LsaClose(LSA_HANDLE ObjectHandle) { + NTSTATUS Status; + TRACE("LsaClose(0x%p) called\n", ObjectHandle); - /* This is our fake handle, don't go too much long way */ - if (ObjectHandle == (LSA_HANDLE)0xcafe) - return STATUS_SUCCESS; - - return LsarClose((PLSAPR_HANDLE)&ObjectHandle); + _SEH2_TRY + { + Status = LsarClose((PLSAPR_HANDLE)&ObjectHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + return Status; } @@ -94,9 +102,21 @@ NTSTATUS WINAPI LsaDelete(LSA_HANDLE ObjectHandle) { + NTSTATUS Status; + TRACE("LsaDelete(0x%p) called\n", ObjectHandle); - return LsarDelete((LSAPR_HANDLE)ObjectHandle); + _SEH2_TRY + { + Status = LsarDelete((LSAPR_HANDLE)ObjectHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + return Status; } @@ -365,13 +385,32 @@ IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - TRACE("(%s,%p,0x%08x,%p) stub\n", + NTSTATUS Status; + + TRACE("LsaOpenPolicy (%s,%p,0x%08x,%p)\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle); - if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe; - return STATUS_SUCCESS; -} + _SEH2_TRY + { + *PolicyHandle = NULL; + + Status = LsarOpenPolicy(SystemName->Buffer, + (PLSAPR_OBJECT_ATTRIBUTES)ObjectAttributes, + DesiredAccess, + PolicyHandle); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + _SEH2_END; + + TRACE("LsaOpenPolicy() done (Status: 0x%08lx)\n", Status); + + return Status; +} + /* * @unimplemented Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Dec 14 07:16:16 2008 @@ -162,8 +162,8 @@ /* Function 0 */ -NTSTATUS LsarClose( - LSAPR_HANDLE *ObjectHandle) +NTSTATUS +LsarClose(LSAPR_HANDLE *ObjectHandle) { #if 0 PLSAR_POLICY_HANDLE Policy = NULL; @@ -183,14 +183,24 @@ return Status; #endif - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + TRACE("LsarClose called!\n"); + + /* This is our fake handle, don't go too much long way */ + if (*ObjectHandle == (LSA_HANDLE)0xcafe) + Status = STATUS_SUCCESS; + + + TRACE("LsarClose done (Status: 0x%08lx)!\n", Status); + + return Status; } /* Function 1 */ -NTSTATUS LsarDelete( - LSAPR_HANDLE ObjectHandle) +NTSTATUS +LsarDelete(LSAPR_HANDLE ObjectHandle) { /* Deprecated */ return STATUS_NOT_SUPPORTED; @@ -252,16 +262,13 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { - ERR("LsarOpenPolicy called!\n"); + TRACE("LsarOpenPolicy called!\n"); *PolicyHandle = (LSAPR_HANDLE)0xcafe; - ERR("LsarOpenPolicy done!\n"); + TRACE("LsarOpenPolicy done!\n"); return STATUS_SUCCESS; - -// UNIMPLEMENTED; -// return STATUS_NOT_IMPLEMENTED; }

16 years

[mjmartin] 38077: - Use volatile with PagesLocked and MdlAddress. Fixes bug #3674. - For safety may have to declare all variable used in except this way.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Dec 14 06:14:00 2008 New Revision: 38077 URL: http://svn.reactos.org/svn/reactos?rev=38077&view=rev Log: - Use volatile with PagesLocked and MdlAddress. Fixes bug #3674. - For safety may have to declare all variable used in except this way. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Dec 14 06:14:00 2008 @@ -65,9 +65,9 @@ PMDL Mdl = (PMDL)MdlBuffer; SIZE_T TotalSize, CurrentSize, RemainingSize; volatile BOOLEAN FailedInProbe = FALSE, FailedInMapping = FALSE, FailedInMoving; - BOOLEAN PagesLocked; + volatile BOOLEAN PagesLocked; PVOID CurrentAddress = SourceAddress, CurrentTargetAddress = TargetAddress; - PVOID MdlAddress; + volatile PVOID MdlAddress; KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress;

16 years

[fireball] 38076: - Undo one "fix" from 38075. Coverity warned you about possible double check of the same pointer (though in || you probably can't go without it), but one check should definately stay! SpiGetLunExtension can return NULL!

by fireball＠svn.reactos.org

Author: fireball Date: Sun Dec 14 05:59:21 2008 New Revision: 38076 URL: http://svn.reactos.org/svn/reactos?rev=38076&view=rev Log: - Undo one "fix" from 38075. Coverity warned you about possible double check of the same pointer (though in || you probably can't go without it), but one check should definately stay! SpiGetLunExtension can return NULL! Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Dec 14 05:59:21 2008 @@ -1956,6 +1956,9 @@ PathId, TargetId, Lun); + + /* If returned LunExtension is NULL, break out */ + if (!LunExtension) break; /* This request should not be processed if */ if ((LunExtension->ReadyLun) ||

16 years

[sginsberg] 38075: - Fix a broken loop - Remove unnecessary checks - Fixes CID 171, 172 and 655

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Dec 14 04:15:49 2008 New Revision: 38075 URL: http://svn.reactos.org/svn/reactos?rev=38075&view=rev Log: - Fix a broken loop - Remove unnecessary checks - Fixes CID 171, 172 and 655 Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Dec 14 04:15:49 2008 @@ -1733,7 +1733,7 @@ LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; - while (!LunInfo) + while (LunInfo) { /* Free current, but save pointer to the next one */ Ptr = LunInfo->Next; @@ -1958,8 +1958,8 @@ Lun); /* This request should not be processed if */ - if ((LunExtension && LunExtension->ReadyLun) || - (LunExtension && LunExtension->SrbInfo.Srb)) + if ((LunExtension->ReadyLun) || + (LunExtension->SrbInfo.Srb)) { /* Nothing to do here */ break; @@ -2900,7 +2900,7 @@ // Store the MDL virtual address in SrbInfo structure SrbInfo->DataOffset = MmGetMdlVirtualAddress(Irp->MdlAddress); - if (DeviceExtension->MapBuffers && Irp->MdlAddress) + if (DeviceExtension->MapBuffers) { /* Calculate offset within DataBuffer */ SrbInfo->DataOffset = MmGetSystemAddressForMdl(Irp->MdlAddress);

16 years

← Newer
1
...
39
40
41
42
43
44
45
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008