Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 38090: Fix 64bit widl stubs.
by sserapion＠svn.reactos.org 15 Dec '08

15 Dec '08

Author: sserapion Date: Sun Dec 14 18:23:37 2008 New Revision: 38090 URL: http://svn.reactos.org/svn/reactos?rev=38090&view=rev Log: Fix 64bit widl stubs. Modified: branches/ros-amd64-bringup/reactos/tools/widl/client.c branches/ros-amd64-bringup/reactos/tools/widl/parser.y branches/ros-amd64-bringup/reactos/tools/widl/proxy.c branches/ros-amd64-bringup/reactos/tools/widl/server.c Modified: branches/ros-amd64-bringup/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/client.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/client.c [iso-8859-1] Sun Dec 14 18:23:37 2008 @@ -461,7 +461,11 @@ write_stubdescdecl(iface); write_function_stubs(iface, proc_offset); +#ifdef TARGET_amd64 + print_client("#if !defined(__RPC_WIN64__)\n"); +#else print_client("#if !defined(__RPC_WIN32__)\n"); +#endif print_client("#error Invalid build platform for this stub.\n"); print_client("#endif\n"); Modified: branches/ros-amd64-bringup/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/parser.y [iso-8859-1] Sun Dec 14 18:23:37 2008 @@ -2062,14 +2062,27 @@ break; case RPC_FC_RP: + return RPC_FC_BOGUS_STRUCT; + case RPC_FC_UP: case RPC_FC_FP: case RPC_FC_OP: + if(sizeof(void*) != 4) + return RPC_FC_BOGUST_STRUCT; + has_pointer = 1; + break; case RPC_FC_CARRAY: case RPC_FC_CVARRAY: case RPC_FC_BOGUS_ARRAY: + { + unsigned int ptr_type = get_attrv(field->attrs, ATTR_POINTERTYPE); + if(!ptr_type || ptr_type == RPC_FC_RP) + return RPC_FC_BOGUS_STRUCT; + else if (sizeof(void*) != 4) + return RPC_FC_BOGUS_STRUCT; has_pointer = 1; break; + } /* * Propagate member attributes Modified: branches/ros-amd64-bringup/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/proxy.c [iso-8859-1] Sun Dec 14 18:23:37 2008 @@ -704,7 +704,11 @@ write_user_quad_list(proxy); write_stubdesc(expr_eval_routines); +#ifdef TARGET_amd64 + print_proxy( "#if !defined(__RPC_WIN64__)\n"); +#else print_proxy( "#if !defined(__RPC_WIN32__)\n"); +#endif print_proxy( "#error Currently only Wine and WIN32 are supported.\n"); print_proxy( "#endif\n"); print_proxy( "\n"); Modified: branches/ros-amd64-bringup/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/widl/server.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/widl/server.c [iso-8859-1] Sun Dec 14 18:23:37 2008 @@ -401,7 +401,11 @@ write_function_stubs(iface, proc_offset); - print_server("#if !defined(__RPC_WIN32__)\n"); +#ifdef TARGET_amd64 + print_server("#if !defined(__RPC_WIN64__)\n"); +#else + print_server( "#if !defined(__RPC_WIN32__)\n"); +#endif print_server("#error Invalid build platform for this stub.\n"); print_server("#endif\n");

1 0

[sserapion] 38089: define _SEH2_FINALLY
by sserapion＠svn.reactos.org 15 Dec '08

15 Dec '08

Author: sserapion Date: Sun Dec 14 18:22:04 2008 New Revision: 38089 URL: http://svn.reactos.org/svn/reactos?rev=38089&view=rev Log: define _SEH2_FINALLY Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2_64.h [iso-8859-1] Sun Dec 14 18:22:04 2008 @@ -8,6 +8,7 @@ #define _SEH2_GetExceptionCode() (0) #define _SEH2_YIELD(x) x #define _SEH2_LEAVE +#define _SEH2_FINALLY

1 0

[tkreuzer] 38088: mbctype.h: fix broken _mbctype[] and _mbcasemap[] declarations sec_api/time_s.h: add asctime_s stdio.h: comment out defines for non-conforming swprintfs sys/utime.h: fix definition of _utime / _utime32 to be compatible to msvc while linking to msvcrt.dll tchar.h: add secure time functions fixes msvcrt_winetest
by tkreuzer＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: tkreuzer Date: Sun Dec 14 17:41:51 2008 New Revision: 38088 URL: http://svn.reactos.org/svn/reactos?rev=38088&view=rev Log: mbctype.h: fix broken _mbctype[] and _mbcasemap[] declarations sec_api/time_s.h: add asctime_s stdio.h: comment out defines for non-conforming swprintfs sys/utime.h: fix definition of _utime / _utime32 to be compatible to msvc while linking to msvcrt.dll tchar.h: add secure time functions fixes msvcrt_winetest Modified: trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/sec_api/time_s.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/tchar.h Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbctype.h [iso-8859-1] Sun Dec 14 17:41:51 2008 @@ -14,29 +14,16 @@ #endif /* CRT stuff */ -#if 1 -#if defined (_DLL) && defined (_M_IX86) +#if defined(_M_CEE_PURE) /* Retained for compatibility with VC++ 5.0 and earlier versions */ _CRTIMP unsigned char * __cdecl __p__mbctype(void); _CRTIMP unsigned char * __cdecl __p__mbcasemap(void); -#endif /* defined (_DLL) && defined (_M_IX86) */ -#endif -#ifndef _mbctype -#ifdef _MSVCRT_ - extern unsigned char _mbctype[257]; + #define _mbctype (__p__mbctype()) + #define _mbcasemap (__p__mbcasemap()) #else -#define _mbctype (*_imp___mbctype) - extern unsigned char **_imp___mbctype; -#endif -#endif -#ifndef _mbcasemap -#ifdef _MSVCRT_ - extern unsigned char *_mbcasemap; -#else -#define _mbcasemap (*_imp___mbcasemap) - extern unsigned char **_imp___mbcasemap; -#endif -#endif + _CRTIMP extern unsigned char _mbctype[]; + _CRTIMP extern unsigned char _mbcasemap[]; +#endif // defined(_M_CEE_PURE) /* CRT stuff */ #if 1 Modified: trunk/reactos/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/time_s… ============================================================================== --- trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/time_s.h [iso-8859-1] Sun Dec 14 17:41:51 2008 @@ -14,6 +14,7 @@ extern "C" { #endif + _CRTIMP errno_t __cdecl asctime_s(char *_Buf,size_t _SizeInWords,const struct tm *_Tm); _CRTIMP errno_t __cdecl _ctime32_s(char *_Buf,size_t _SizeInBytes,const __time32_t *_Time); _CRTIMP errno_t __cdecl _gmtime32_s(struct tm *_Tm,const __time32_t *_Time); _CRTIMP errno_t __cdecl _localtime32_s(struct tm *_Tm,const __time32_t *_Time); Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Sun Dec 14 17:41:51 2008 @@ -352,14 +352,14 @@ #include <vadefs.h> #endif -#ifdef _CRT_NON_CONFORMING_SWPRINTFS -#ifndef __cplusplus -#define swprintf _swprintf -#define vswprintf _vswprintf -#define _swprintf_l __swprintf_l -#define _vswprintf_l __vswprintf_l -#endif -#endif +//#ifdef _CRT_NON_CONFORMING_SWPRINTFS +//#ifndef __cplusplus +//#define swprintf _swprintf +//#define vswprintf _vswprintf +//#define _swprintf_l __swprintf_l +//#define _vswprintf_l __vswprintf_l +//#endif +//#endif _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix); _CRTIMP int __cdecl _vscwprintf(const wchar_t *_Format,va_list _ArgList); Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Sun Dec 14 17:41:51 2008 @@ -103,31 +103,32 @@ _CRTIMP int __cdecl _wutime64(const wchar_t *_Filename,struct __utimbuf64 *_Time); #endif -#if 0 +// Do it like this to keep compatibility to MSVC while using msvcrt.dll #ifndef RC_INVOKED -#ifdef _USE_32BIT_TIME_T -__CRT_INLINE int __cdecl _utime32(const char *_Filename,struct _utimbuf *_Utimbuf) { - return _utime32(_Filename,(struct __utimbuf32 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { - return _futime32(_Desc,(struct __utimbuf32 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { - return _wutime32(_Filename,(struct __utimbuf32 *)_Utimbuf); -} -#else -__CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { - return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { - return _futime64(_Desc,(struct __utimbuf64 *)_Utimbuf); -} -__CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { - return _wutime64(_Filename,(struct __utimbuf64 *)_Utimbuf); -} -#endif -#endif -#endif + #ifdef _USE_32BIT_TIME_T + __CRT_INLINE int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Utimbuf) { + return _utime(_Filename,(struct __timbuf *)_Utimbuf); + } + __CRT_INLINE int __cdecl _futime32(int _Desc,struct __utimbuf32 *_Utimbuf) { + return _futime(_Desc,(struct _utimbuf *)_Utimbuf); + } + __CRT_INLINE int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Utimbuf) { + return _wutime(_Filename,(struct _utimbuf *)_Utimbuf); + } + #else // !_USE_32BIT_TIME_T + #ifndef _WIN64 + __CRT_INLINE int __cdecl _utime(const char *_Filename,struct _utimbuf *_Utimbuf) { + return _utime64(_Filename,(struct __utimbuf64 *)_Utimbuf); + } + __CRT_INLINE int __cdecl _futime(int _Desc,struct _utimbuf *_Utimbuf) { + return _futime64(_Desc,(struct __utimbuf64 *)_Utimbuf); + } + __CRT_INLINE int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Utimbuf) { + return _wutime64(_Filename,(struct __utimbuf64 *)_Utimbuf); + } + #endif + #endif // _USE_32BIT_TIME_T +#endif // RC_INVOKED #ifndef NO_OLDNAMES __CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Sun Dec 14 17:41:51 2008 @@ -320,6 +320,13 @@ #define _tcsftime wcsftime #define _tcsftime_l _wcsftime_l +#define _tasctime_s _wasctime_s +#define _tctime_s _wctime_s +#define _tctime32_s _wctime32_s +#define _tctime64_s _wctime64_s +#define _tstrdate_s _wstrdate_s +#define _tstrtime_s _wstrtime_s + #define _tchdir _wchdir #define _tgetcwd _wgetcwd #define _tgetdcwd _wgetdcwd @@ -653,6 +660,13 @@ #define _tutime64 _utime64 #define _tcsftime strftime #define _tcsftime_l _strftime_l + +#define _tasctime_s asctime_s +#define _tctime_s ctime_s +#define _tctime32_s _ctime32_s +#define _tctime64_s _ctime64_s +#define _tstrdate_s _strdate_s +#define _tstrtime_s _strtime_s #define _tchdir _chdir #define _tgetcwd _getcwd

1 0

[tkreuzer] 38087: - Replace a 'for' with a 'do .. while ' - Make sure OutputDebugStringA terminates with a newline Fixes winetest debug output. I wonder how it worked before. Dedicated to Stefan100.
by tkreuzer＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: tkreuzer Date: Sun Dec 14 17:18:59 2008 New Revision: 38087 URL: http://svn.reactos.org/svn/reactos?rev=38087&view=rev Log: - Replace a 'for' with a 'do .. while ' - Make sure OutputDebugStringA terminates with a newline Fixes winetest debug output. I wonder how it worked before. Dedicated to Stefan100. Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Sun Dec 14 17:18:59 2008 @@ -317,7 +317,7 @@ #if 0 __try #else - do + do #endif { /* size of the current output block */ @@ -326,17 +326,10 @@ /* size of the remainder of the string */ SIZE_T nOutputStringLen; - for - ( - /* output the whole string */ - nOutputStringLen = strlen(_OutputString); - - /* repeat until the string has been fully output */ - nOutputStringLen > 0; - - /* move to the next block */ - _OutputString += nRoundLen, nOutputStringLen -= nRoundLen - ) + /* output the whole string */ + nOutputStringLen = strlen(_OutputString); + + do { /* we're connected to the debug monitor: write the current block to the shared buffer */ @@ -375,13 +368,25 @@ CHAR a_cBuffer[512]; /* write a maximum of 511 bytes */ - if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) - nRoundLen = sizeof(a_cBuffer) - 1; + if(nOutputStringLen > (sizeof(a_cBuffer) - 2)) + nRoundLen = sizeof(a_cBuffer) - 2; else nRoundLen = nOutputStringLen; /* copy the current block */ memcpy(a_cBuffer, _OutputString, nRoundLen); + + /* Have we reached the end of the string? */ + if (nRoundLen == nOutputStringLen) + { + /* Make sure we terminate with a line break */ + if (a_cBuffer[nRoundLen - 1] != '\n') + { + a_cBuffer[nRoundLen] = '\n'; + nRoundLen++; + nOutputStringLen++; + } + } /* null-terminate the current block */ a_cBuffer[nRoundLen] = 0; @@ -389,7 +394,14 @@ /* send the current block to the kernel debugger */ DbgPrint("%s", a_cBuffer); } + + /* move to the next block */ + _OutputString += nRoundLen; + nOutputStringLen -= nRoundLen; } + /* repeat until the string has been fully output */ + while (nOutputStringLen > 0); + } #if 0 /* ignore access violations and let other exceptions fall through */

1 0

[tkreuzer] 38086: [FORMATTING] Fix indentation, no code change
by tkreuzer＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: tkreuzer Date: Sun Dec 14 16:52:51 2008 New Revision: 38086 URL: http://svn.reactos.org/svn/reactos?rev=38086&view=rev Log: [FORMATTING] Fix indentation, no code change Modified: trunk/reactos/dll/win32/kernel32/debug/output.c Modified: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/debug/output.c [iso-8859-1] Sun Dec 14 16:52:51 2008 @@ -317,9 +317,9 @@ #if 0 __try #else - do -#endif - { + do +#endif + { /* size of the current output block */ SIZE_T nRoundLen; @@ -337,60 +337,60 @@ /* move to the next block */ _OutputString += nRoundLen, nOutputStringLen -= nRoundLen ) - { - /* we're connected to the debug monitor: write the current block to the - shared buffer */ - if(hDBMonDataReady) { - /* wait a maximum of 10 seconds for the debug monitor to finish processing - the shared buffer */ - if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) + /* we're connected to the debug monitor: + write the current block to the shared buffer */ + if(hDBMonDataReady) { - /* timeout or failure: give up */ - break; + /* wait a maximum of 10 seconds for the debug monitor + to finish processing the shared buffer */ + if(WaitForSingleObject(hDBMonBufferReady, 10000) != WAIT_OBJECT_0) + { + /* timeout or failure: give up */ + break; + } + + /* write the process id into the buffer */ + pDBMonBuffer->ProcessId = GetCurrentProcessId(); + + /* write only as many bytes as they fit in the buffer */ + if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) + nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block into the buffer */ + memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + pDBMonBuffer->Buffer[nRoundLen] = 0; + + /* signal that the data contains meaningful data and can be read */ + SetEvent(hDBMonDataReady); } - - /* write the process id into the buffer */ - pDBMonBuffer->ProcessId = GetCurrentProcessId(); - - /* write only as many bytes as they fit in the buffer */ - if(nOutputStringLen > (PAGE_SIZE - sizeof(DWORD) - 1)) - nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; + /* else, send the current block to the kernel debugger */ else - nRoundLen = nOutputStringLen; - - /* copy the current block into the buffer */ - memcpy(pDBMonBuffer->Buffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - pDBMonBuffer->Buffer[nRoundLen] = 0; - - /* signal that the data contains meaningful data and can be read */ - SetEvent(hDBMonDataReady); + { + /* output in blocks of 512 characters */ + CHAR a_cBuffer[512]; + + /* write a maximum of 511 bytes */ + if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) + nRoundLen = sizeof(a_cBuffer) - 1; + else + nRoundLen = nOutputStringLen; + + /* copy the current block */ + memcpy(a_cBuffer, _OutputString, nRoundLen); + + /* null-terminate the current block */ + a_cBuffer[nRoundLen] = 0; + + /* send the current block to the kernel debugger */ + DbgPrint("%s", a_cBuffer); + } } - /* else, send the current block to the kernel debugger */ - else - { - /* output in blocks of 512 characters */ - CHAR a_cBuffer[512]; - - /* write a maximum of 511 bytes */ - if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) - nRoundLen = sizeof(a_cBuffer) - 1; - else - nRoundLen = nOutputStringLen; - - /* copy the current block */ - memcpy(a_cBuffer, _OutputString, nRoundLen); - - /* null-terminate the current block */ - a_cBuffer[nRoundLen] = 0; - - /* send the current block to the kernel debugger */ - DbgPrint("%s", a_cBuffer); - } - } - } + } #if 0 /* ignore access violations and let other exceptions fall through */ __except

1 0

[hyperion] 38085: Revert r38084 Sigh.
by hyperion＠svn.reactos.org 14 Dec '08

14 Dec '08

Author: hyperion Date: Sun Dec 14 16:44:33 2008 New Revision: 38085 URL: http://svn.reactos.org/svn/reactos?rev=38085&view=rev Log: Revert r38084 Sigh. 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 16:44:33 2008 @@ -48,7 +48,6 @@ 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; @@ -56,6 +55,7 @@ typedef struct __SEH2TryLevel { volatile struct __SEH2TryLevel * ST_Next; + void * ST_FramePointer; void * ST_Filter; void * ST_Body; } @@ -119,41 +119,33 @@ /* A no-op without any real side effects, but silences warnings */ #define __SEH_PRETEND_SIDE_EFFECT (void)0 -/* Forces the specified label to be reachable */ -#define __SEH_USE_LABEL(L_) if(__SEH_VOLATILE_FALSE) goto L_; +/* Forces GCC to consider the specified label reachable */ +#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(), 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_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_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_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_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) #define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) @@ -163,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_) \ @@ -194,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; \ @@ -201,6 +200,9 @@ (void)_SEHTopTryLevel; \ (void)_SEHCurFrameP; \ (void)_SEHPrevTryLevelP; \ + \ + __SEH_USE_LABEL(_SEHBeginScope); \ + __SEH_USE_LABEL(_SEHEndScope); \ \ { \ __label__ _SEHBeforeTry; \ @@ -225,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; \ } @@ -237,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 \ { @@ -257,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:; \ @@ -273,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; \ \ @@ -283,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(); \ @@ -349,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; \ @@ -362,12 +352,11 @@ __SEH_BARRIER; \ } \ } \ - \ - _SEHEndExcept:; \ + _SEHEndExcept: __SEH_SIDE_EFFECT; \ } \ __SEH_END_SCOPE; -#define _SEH2_GetExceptionInformation() ((_SEH2FrameP)->SF_ExceptionInformation) +#define _SEH2_GetExceptionInformation() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) #define _SEH2_GetExceptionCode() ((_SEH2FrameP)->SF_Code) #define _SEH2_AbnormalTermination() (!!_SEH2_GetExceptionCode()) @@ -390,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 16:44:33 2008 @@ -40,7 +40,7 @@ extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); extern void _SEH2GlobalUnwind(void *); -extern int __SEH2Except(void *, void *); +extern int __SEH2Except(void *, void *, void *); extern void __SEH2Finally(void *, void *); extern DECLSPEC_NORETURN int __SEH2Handle(void *, void *, void *); @@ -51,27 +51,9 @@ extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); FORCEINLINE -int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) +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); + 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,22 +132,25 @@ { 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) { - ret = _SEH2Except(frame, trylevel); + 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); + } } } 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 16:44:33 2008 @@ -49,8 +49,18 @@ jmp eax .globl ___SEH2Except +___SEH2Except: + mov eax, [esp+4] + mov ecx, [esp+8] + + push [esp+12] + call eax + + pop ecx + + ret + .globl ___SEH2Finally -___SEH2Except: ___SEH2Finally: mov eax, [esp+4] mov ecx, [esp+8]

1 0

[dgorbachev] 38083: - Use HEAP_ZERO_MEMORY instead of memset(). - Do not crash if no adapter found.
by dgorbachev＠svn.reactos.org 14 Dec '08

14 Dec '08

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) {

2 1

[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 14 Dec '08

14 Dec '08

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]

1 0

[hyperion] 38082: Revert r38081
by hyperion＠svn.reactos.org 14 Dec '08

14 Dec '08

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); + } } }

1 0

[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 14 Dec '08

14 Dec '08

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); } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs