[tkreuzer] 46385: [XDK] - Fix and update some amd64 definitions - Ros-diffs

24 Mar 2010

Author: tkreuzer
Date: Wed Mar 24 02:39:36 2010
New Revision: 46385
URL: http://svn.reactos.org/svn/reactos?rev=46385&view=rev
Log:
[XDK]
- Fix and update some amd64 definitions
Modified:
    branches/header-work/include/ddk/ntddk.h
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/xdk/amd64/ke.h
    branches/header-work/include/xdk/amd64/mm.h
    branches/header-work/include/xdk/interlocked.h
    branches/header-work/include/xdk/iofuncs.h
    branches/header-work/include/xdk/rtltypes.h
Modified: branches/header-work/include/ddk/ntddk.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h?...
==============================================================================

--- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -3214,7 +3214,6 @@
 #define MM_USER_PROBE_ADDRESS             MmUserProbeAddress
 #define MM_LOWEST_USER_ADDRESS   (PVOID)0x10000
 #define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
-#define KI_USER_SHARED_DATA       0xFFFFF78000000000ULL
#elif defined(_M_IA64)
@@ -3702,6 +3701,7 @@
   IN PVOID Context);
 #endif
+#if !defined(DMA_MACROS_DEFINED)
 //DECLSPEC_DEPRECATED_DDK
 NTHALAPI
 PHYSICAL_ADDRESS
@@ -3713,6 +3713,7 @@
   IN PVOID CurrentVa,
   IN OUT PULONG Length,
   IN BOOLEAN WriteToDevice);
+#endif
NTKERNELAPI
 VOID
Modified: branches/header-work/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?re...
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -249,6 +249,10 @@
 #define InterlockedBitTestAndReset _interlockedbittestandreset
#ifdef _M_AMD64
+#define BitTest64 _bittest64
+#define BitTestAndComplement64 _bittestandcomplement64
+#define BitTestAndSet64 _bittestandset64
+#define BitTestAndReset64 _bittestandreset64
 #define InterlockedBitTestAndSet64 _interlockedbittestandset64
 #define InterlockedBitTestAndReset64 _interlockedbittestandreset64
 #endif
@@ -453,7 +457,7 @@
 #if defined(_WIN64)
typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
-  PSLIST_ENTRY Next;
+  struct _SLIST_ENTRY *Next;
 } SLIST_ENTRY, *PSLIST_ENTRY;
typedef struct _SLIST_ENTRY32 {
@@ -7835,11 +7839,22 @@
 #define PROFILE_LEVEL           15
 #define HIGH_LEVEL              15
+#define KI_USER_SHARED_DATA     0xFFFFF78000000000ULL
+#define SharedUserData          ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
+#define SharedInterruptTime     (KI_USER_SHARED_DATA + 0x8)
+#define SharedSystemTime        (KI_USER_SHARED_DATA + 0x14)
+#define SharedTickCount         (KI_USER_SHARED_DATA + 0x320)
+
 #define PAGE_SIZE               0x1000
 #define PAGE_SHIFT              12L
-#define KI_USER_SHARED_DATA     0xFFFFF78000000000UI64
-#define SharedUserData          ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
+#define EFLAG_SIGN              0x8000
+#define EFLAG_ZERO              0x4000
+#define EFLAG_SELECT            (EFLAG_SIGN | EFLAG_ZERO)
+
+#define RESULT_NEGATIVE         ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
+#define RESULT_ZERO             ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
+#define RESULT_POSITIVE         ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
typedef struct _KFLOATING_SAVE {
@@ -7872,7 +7887,7 @@
 VOID
 KeLowerIrql(IN KIRQL NewIrql)
 {
-  ASSERT(KeGetCurrentIrql() >= NewIrql);
+  //ASSERT(KeGetCurrentIrql() >= NewIrql);
   __writecr8(NewIrql);
 }
@@ -7883,7 +7898,7 @@
   KIRQL OldIrql;
OldIrql = __readcr8();
-  ASSERT(OldIrql <= NewIrql);
+  //ASSERT(OldIrql <= NewIrql);
   __writecr8(NewIrql);
   return OldIrql;
 }
Modified: branches/header-work/include/xdk/amd64/ke.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/ke...
==============================================================================
--- branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -14,11 +14,22 @@
 #define PROFILE_LEVEL           15
 #define HIGH_LEVEL              15
+#define KI_USER_SHARED_DATA     0xFFFFF78000000000ULL
+#define SharedUserData          ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
+#define SharedInterruptTime     (KI_USER_SHARED_DATA + 0x8)
+#define SharedSystemTime        (KI_USER_SHARED_DATA + 0x14)
+#define SharedTickCount         (KI_USER_SHARED_DATA + 0x320)
+
 #define PAGE_SIZE               0x1000
 #define PAGE_SHIFT              12L
-#define KI_USER_SHARED_DATA     0xFFFFF78000000000UI64
-#define SharedUserData          ((PKUSER_SHARED_DATA const)KI_USER_SHARED_DATA)
+#define EFLAG_SIGN              0x8000
+#define EFLAG_ZERO              0x4000
+#define EFLAG_SELECT            (EFLAG_SIGN | EFLAG_ZERO)
+
+#define RESULT_NEGATIVE         ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
+#define RESULT_ZERO             ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
+#define RESULT_POSITIVE         ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
typedef struct _KFLOATING_SAVE {
@@ -51,7 +62,7 @@
 VOID
 KeLowerIrql(IN KIRQL NewIrql)
 {
-  ASSERT(KeGetCurrentIrql() >= NewIrql);
+  //ASSERT(KeGetCurrentIrql() >= NewIrql);
   __writecr8(NewIrql);
 }
@@ -62,7 +73,7 @@
   KIRQL OldIrql;
OldIrql = __readcr8();
-  ASSERT(OldIrql <= NewIrql);
+  //ASSERT(OldIrql <= NewIrql);
   __writecr8(NewIrql);
   return OldIrql;
 }
Modified: branches/header-work/include/xdk/amd64/mm.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/mm...
==============================================================================
--- branches/header-work/include/xdk/amd64/mm.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/amd64/mm.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -28,7 +28,6 @@
 #define MM_USER_PROBE_ADDRESS             MmUserProbeAddress
 #define MM_LOWEST_USER_ADDRESS   (PVOID)0x10000
 #define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
-#define KI_USER_SHARED_DATA       0xFFFFF78000000000ULL
$endif /* _NTDDK_ */
Modified: branches/header-work/include/xdk/interlocked.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/interloc...
==============================================================================
--- branches/header-work/include/xdk/interlocked.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/interlocked.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -57,6 +57,10 @@
 #define InterlockedBitTestAndReset _interlockedbittestandreset
#ifdef _M_AMD64
+#define BitTest64 _bittest64
+#define BitTestAndComplement64 _bittestandcomplement64
+#define BitTestAndSet64 _bittestandset64
+#define BitTestAndReset64 _bittestandreset64
 #define InterlockedBitTestAndSet64 _interlockedbittestandset64
 #define InterlockedBitTestAndReset64 _interlockedbittestandreset64
 #endif
Modified: branches/header-work/include/xdk/iofuncs.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs....
==============================================================================
--- branches/header-work/include/xdk/iofuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/iofuncs.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -587,6 +587,7 @@
   IN PVOID Context);
 #endif
+#if !defined(DMA_MACROS_DEFINED)
 //DECLSPEC_DEPRECATED_DDK
 NTHALAPI
 PHYSICAL_ADDRESS
@@ -598,6 +599,7 @@
   IN PVOID CurrentVa,
   IN OUT PULONG Length,
   IN BOOLEAN WriteToDevice);
+#endif
NTKERNELAPI
 VOID
Modified: branches/header-work/include/xdk/rtltypes.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtltypes...
==============================================================================
--- branches/header-work/include/xdk/rtltypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/rtltypes.h [iso-8859-1] Wed Mar 24 02:39:36 2010
@@ -73,7 +73,7 @@
 #if defined(_WIN64)
typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY {
-  PSLIST_ENTRY Next;
+  struct _SLIST_ENTRY *Next;
 } SLIST_ENTRY, *PSLIST_ENTRY;
typedef struct _SLIST_ENTRY32 {

    