[CRT]

- Add __readcr4 to crt to compensate for MSVC bug
- Compile strnset with MSVC

svn path=/branches/cmake-bringup/; revision=49669

include/crt/msc/intrin.h

@@ -283,12 +283,9 @@ void __writedr(unsigned reg, unsigned __int64 value);
 unsigned long __readcr0(void);
 unsigned long __readcr2(void);
 unsigned long __readcr3(void);
-//unsigned long __readcr4(void);
+unsigned long __readcr4(void);
 //#pragma intrinsic(__readcr4)
-// HACK: MSVC is broken
+#pragma function(__readcr4) // HACK: MSVC is broken
-unsigned long  ___readcr4(void);
-#define __readcr4 ___readcr4
-
 unsigned int __readdr(unsigned int reg);
 void __writedr(unsigned reg, unsigned int value);
 #endif

lib/sdk/crt/CMakeLists.txt

@@ -336,6 +336,7 @@ list(APPEND CRT_SOURCE
     mem/i386/memchr_asm.s
     mem/i386/memmove_asm.s
     mem/i386/memset_asm.s
+    misc/i386/readcr4.S
     string/i386/strcat_asm.s
     string/i386/strchr_asm.s
     string/i386/strcmp_asm.s

lib/sdk/crt/misc/i386/readcr4.S

@@ -0,0 +1,12 @@
+
+#include <asm.inc>
+
+.code
+
+PUBLIC ___readcr4
+___readcr4:
+    mov eax, cr4
+    ret
+
+END
+

lib/sdk/crt/string/strset.c

@@ -8,10 +8,10 @@
  *              25/11/05: Added license header
  */
 
-#ifndef _MSC_VER
-
 #if defined(__GNUC__) && !defined(__clang__)
 #define __int64 long long
+#elif defined(_MSC_VER)
+#pragma function(_strset)
 #endif
 
 #ifdef _WIN64
@@ -52,4 +52,3 @@ char* _strset(char* szToFill, int szFill)
 	return t;
 }
 
-#endif