[ros-diffs] [tkreuzer] 66285: [PSDK] Add _SH_ to processor definitions, fix some processor #ifdefs Patch by Yuntian Zhang CORE-7946 #resolve

Author: tkreuzer
Date: Sun Feb 15 11:22:29 2015
New Revision: 66285

URL: http://svn.reactos.org/svn/reactos?rev=66285&view=rev
Log:
[PSDK]
Add _SH_ to processor definitions, fix some processor #ifdefs
Patch by Yuntian Zhang
CORE-7946 #resolve

Modified:
    trunk/reactos/include/psdk/windows.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/xdk/winnt_old.h

Modified: trunk/reactos/include/psdk/windows.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev=...
==============================================================================
--- trunk/reactos/include/psdk/windows.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windows.h	[iso-8859-1] Sun Feb 15 11:22:29 2015
@@ -18,7 +18,7 @@
 #endif

#if !defined(_X86_) && !defined(_AMD64_) && !defined(_IA64_) && !defined(_ALPHA_) && \
-    !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_)
+    !defined(_ARM_) && !defined(_PPC_) && !defined(_MIPS_) && !defined(_68K_) && !defined(_SH_)

#if defined(_M_AMD64) || defined(__x86_64__)
 #define _AMD64_
@@ -36,6 +36,8 @@
 #define _MIPS_
 #elif defined(_M_M68K) || defined(__68k__)
 #define _68K_
+#elif defined(_SHX_) || defined(__sh__)
+#define _SH_
 #endif

#endif

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=66...
==============================================================================
--- trunk/reactos/include/psdk/winnt.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h	[iso-8859-1] Sun Feb 15 11:22:29 2015
@@ -2959,7 +2959,7 @@
 #endif /* _LDT_ENTRY_DEFINED */

/* FIXME: add more machines */
-#if defined(_X86_) && !defined(__PowerPC__)
+#if defined(_X86_)
 #define SIZE_OF_80387_REGISTERS    80
 #define CONTEXT_i386    0x10000
 #define CONTEXT_i486    0x10000
@@ -3015,7 +3015,7 @@
   DWORD SegSs;
   BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
 } CONTEXT;
-#elif defined(__x86_64__)
+#elif defined(_AMD64_)

#define CONTEXT_AMD64 0x100000

@@ -3464,7 +3464,7 @@
     DWORD ContextFlags;
     DWORD Fill[4];
 } CONTEXT;
-#elif defined(SHx)
+#elif defined(_SH_)

/* These are the debug or break registers on the SH3 */
 typedef struct _DEBUG_REGISTERS {

Modified: trunk/reactos/include/xdk/winnt_old.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?rev...
==============================================================================
--- trunk/reactos/include/xdk/winnt_old.h	[iso-8859-1] (original)
+++ trunk/reactos/include/xdk/winnt_old.h	[iso-8859-1] Sun Feb 15 11:22:29 2015
@@ -1602,7 +1602,7 @@
 #endif /* _LDT_ENTRY_DEFINED */

/* FIXME: add more machines */
-#if defined(_X86_) && !defined(__PowerPC__)
+#if defined(_X86_)
 #define SIZE_OF_80387_REGISTERS    80
 #define CONTEXT_i386    0x10000
 #define CONTEXT_i486    0x10000
@@ -1658,7 +1658,7 @@
   DWORD SegSs;
   BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
 } CONTEXT;
-#elif defined(__x86_64__)
+#elif defined(_AMD64_)

#define CONTEXT_AMD64 0x100000

@@ -2107,7 +2107,7 @@
     DWORD ContextFlags;
     DWORD Fill[4];
 } CONTEXT;
-#elif defined(SHx)
+#elif defined(_SH_)

/* These are the debug or break registers on the SH3 */
 typedef struct _DEBUG_REGISTERS {