[NTOS:MM] Make x64 address space layout more like Vista+

[reactos.git] / ntoskrnl / include / internal / amd64 / ke.h

diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h
index b01e994..977a8f8 100644 (file)
--- a/ntoskrnl/include/internal/amd64/ke.h
+++ b/ntoskrnl/include/internal/amd64/ke.h
@@ -22,18 +22,42 @@
 #define X86_CR4_OSFXSR          0x00000200 /* enable FXSAVE/FXRSTOR instructions */
 #define X86_CR4_OSXMMEXCPT      0x00000400 /* enable #XF exception */
 
+/* EDX flags */
+#define X86_FEATURE_FPU         0x00000001 /* x87 FPU is present */
 #define X86_FEATURE_VME         0x00000002 /* Virtual 8086 Extensions are present */
+#define X86_FEATURE_DBG         0x00000004 /* Debugging extensions are present */
+#define X86_FEATURE_PSE         0x00000008 /* Page Size Extension is present */
 #define X86_FEATURE_TSC         0x00000010 /* time stamp counters are present */
 #define X86_FEATURE_PAE         0x00000040 /* physical address extension is present */
 #define X86_FEATURE_CX8         0x00000100 /* CMPXCHG8B instruction present */
 #define X86_FEATURE_SYSCALL     0x00000800 /* SYSCALL/SYSRET support present */
+#define X86_FEATURE_MTTR        0x00001000 /* Memory type range registers are present */
 #define X86_FEATURE_PGE         0x00002000 /* Page Global Enable */
+#define X86_FEATURE_CMOV        0x00008000 /* "Conditional move" instruction supported */
+#define X86_FEATURE_PAT         0x00010000 /* Page Attribute Table is supported */
+#define X86_FEATURE_DS          0x00200000 /* Debug Store is present */
 #define X86_FEATURE_MMX         0x00800000 /* MMX extension present */
 #define X86_FEATURE_FXSR        0x01000000 /* FXSAVE/FXRSTOR instructions present */
 #define X86_FEATURE_SSE         0x02000000 /* SSE extension present */
 #define X86_FEATURE_SSE2        0x04000000 /* SSE2 extension present */
 #define X86_FEATURE_HT          0x10000000 /* Hyper-Threading present */
 
+/* ECX flags */
+#define X86_FEATURE_SSE3        0x00000001 /* SSE3 is supported */
+#define X86_FEATURE_MONITOR     0x00000008 /* SSE3 Monitor instructions supported */
+#define X86_FEATURE_VMX         0x00000020 /* Virtual Machine eXtensions are available */
+#define X86_FEATURE_SSSE3       0x00000200 /* Supplemental SSE3 are available */
+#define X86_FEATURE_FMA3        0x00001000 /* Fused multiple-add supported */
+#define X86_FEATURE_CX16        0x00002000 /* CMPXCHG16B instruction are available */
+#define X86_FEATURE_PCID        0x00020000 /* Process Context IDentifiers are supported */
+#define X86_FEATURE_SSE41       0x00080000 /* SSE 4.1 is supported */
+#define X86_FEATURE_SSE42       0x00100000 /* SSE 4.2 is supported */
+#define X86_FEATURE_POPCNT      0x00800000 /* POPCNT instruction is available */
+#define X86_FEATURE_XSAVE       0x04000000 /* XSAVE family are available */
+
+/* EDX extended flags */
+#define X86_FEATURE_NX          0x00100000 /* NX support present */
+
 #define X86_EXT_FEATURE_SSE3    0x00000001 /* SSE3 extension present */
 #define X86_EXT_FEATURE_3DNOW   0x40000000 /* 3DNOW! extension present */
 
@@ -47,12 +71,12 @@
 #define X86_MSR_CSTAR           0xC0000083
 #define X86_MSR_SFMASK          0xC0000084
 
-#define EFER_SCE 0x01
-#define EFER_LME 0x10
-#define EFER_LMA 0x40
-#define EFER_NXE 0x80
-#define EFER_SVME 0x100
-#define EFER_FFXSR 0x400
+#define EFER_SCE    0x0001
+#define EFER_LME    0x0100
+#define EFER_LMA    0x0400
+#define EFER_NXE    0x0800
+#define EFER_SVME   0x1000
+#define EFER_FFXSR  0x4000
 
 #define AMD64_TSS 9
 
@@ -81,7 +105,6 @@ typedef struct _KI_INTERRUPT_DISPATCH_ENTRY
 } KI_INTERRUPT_DISPATCH_ENTRY, *PKI_INTERRUPT_DISPATCH_ENTRY;
 #include <poppack.h>
 
-extern ULONG Ke386CacheAlignment;
 extern ULONG KeI386NpxPresent;
 extern ULONG KeI386XMMIPresent;
 extern ULONG KeI386FxsrPresent;
@@ -189,6 +212,19 @@ KeFlushProcessTb(VOID)
     __writecr3(__readcr3());
 }
 
+FORCEINLINE
+VOID
+KeSweepICache(IN PVOID BaseAddress,
+              IN SIZE_T FlushSize)
+{
+    //
+    // Always sweep the whole cache
+    //
+    UNREFERENCED_PARAMETER(BaseAddress);
+    UNREFERENCED_PARAMETER(FlushSize);
+    __wbinvd();
+}
+
 FORCEINLINE
 VOID
 KiRundownThread(IN PKTHREAD Thread)
@@ -248,7 +284,7 @@ KeQueryInterruptHandler(IN ULONG Vector)
 
 VOID
 FORCEINLINE
-KiSendEOI()
+KiSendEOI(VOID)
 {
     /* Write 0 to the apic EOI register */
     *((volatile ULONG*)APIC_EOI_REGISTER) = 0;