[ros-diffs] [tkreuzer] 52478: [CRT] - comment out gcc specific code on MSVC builds - add some files for amd64 to msvcrtex

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sun Jun 26 22:57:12 2011
New Revision: 52478

URL: http://svn.reactos.org/svn/reactos?rev=52478&view=rev
Log:
[CRT]
- comment out gcc specific code on MSVC builds
- add some files for amd64 to msvcrtex

Modified:
    trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
    trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s
    trunk/reactos/lib/sdk/crt/msvcrtex.cmake
    trunk/reactos/lib/sdk/crt/startup/crt_handler.c
    trunk/reactos/lib/sdk/crt/startup/crtexe.c

Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s?rev=52478&r1=52477&r2=52478&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Sun Jun 26 22:57:12 2011
@@ -13,7 +13,8 @@
 /* CODE **********************************************************************/
 .code64
 
-EXTERN MsgUnimplemented:BYTE
+MsgUnimplemented:
+    .ascii "Unimplemented", CR, LF, NUL
 
 FUNC __chkstk
     .endprolog

Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s?rev=52478&r1=52477&r2=52478&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] Sun Jun 26 22:57:12 2011
@@ -28,17 +28,17 @@
     lea rcx, [rsp + 24]         /* point past return addr */
     jb l_LessThanAPage
 
-.l_MoreThanAPage:
+l_MoreThanAPage:
     sub rcx, PAGE_SIZE          /* yes, move pointer down 4k */
-    or [rcx], 0                 /* probe there */
+    or byte ptr [rcx], 0        /* probe there */
     sub rax, PAGE_SIZE          /* decrement count */
 
     cmp rax, PAGE_SIZE
     ja l_MoreThanAPage          /* and do it again */
 
-.l_LessThanAPage:
+l_LessThanAPage:
     sub rcx, rax
-    or [rcx], 0                 /* less than 4k, just peek here */
+    or byte ptr [rcx], 0        /* less than 4k, just peek here */
 
     pop rax
     //cfi_pop(%rax)

Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake?rev=52478&r1=52477&r2=52478&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Jun 26 22:57:12 2011
@@ -49,6 +49,11 @@
     math/i386/ftol2_asm.s
     math/i386/alldiv_asm.s
 )
+elseif(ARCH MATCHES amd64)
+list(APPEND MSVCRTEX_SOURCE
+    except/amd64/chkstk_asm.s
+    except/amd64/chkstk_ms.s
+    math/amd64/alldiv.S)
 endif()
 
 if(MSVC)

Modified: trunk/reactos/lib/sdk/crt/startup/crt_handler.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crt_handler.c?rev=52478&r1=52477&r2=52478&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] Sun Jun 26 22:57:12 2011
@@ -40,7 +40,7 @@
 int __mingw_init_ehandler (void);
 extern void _fpreset (void);
 
-#ifdef _WIN64
+#if defined(_WIN64) && !defined(_MSC_VER)
 EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *);
 
 #define MAX_PDATA_ENTRIES 32

Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe.c?rev=52478&r1=52477&r2=52478&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Sun Jun 26 22:57:12 2011
@@ -277,7 +277,7 @@
     _pei386_runtime_relocator ();
 #endif
     __mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler);
-#ifdef _WIN64
+#if defined(_WIN64) && !defined(_MSC_VER)
     __mingw_init_ehandler ();
 #endif
     __mingw_prepare_except_for_msvcr80_and_higher ();