[ASM][NDK][NTOS] Rename Self to SelfPcr in the KIPCR structure.

[reactos.git] / ntoskrnl / kd64 / kddata.c

diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c
index 5a1e10e..681eb9b 100644 (file)
--- a/ntoskrnl/kd64/kddata.c
+++ b/ntoskrnl/kd64/kddata.c
@@ -11,7 +11,7 @@
 #include <ntoskrnl.h>
 #define NDEBUG
 #include <debug.h>
-#include "../mm/ARM3/miarm.h"
+#include <mm/ARM3/miarm.h>
 #undef MmSystemRangeStart
 
 VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
@@ -19,13 +19,13 @@ VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
 //
 // Apply the KIPCR WDK workaround for x86 and AMD64
 //
-#if defined(_X86_) || defined(_AMD64_)
+#if defined(_M_IX86) || defined(_M_AMD64)
 #define KPCR KIPCR
 #endif
 
-#if defined(_X86_)
+#if defined(_M_IX86)
 
-#define KPCR_SELF_PCR_OFFSET           FIELD_OFFSET(KPCR, Self)
+#define KPCR_SELF_PCR_OFFSET           FIELD_OFFSET(KPCR, SelfPcr)
 #define KPCR_CURRENT_PRCB_OFFSET       FIELD_OFFSET(KPCR, Prcb)
 #define KPCR_CONTAINED_PRCB_OFFSET     FIELD_OFFSET(KPCR, PrcbData)
 #define KPCR_INITIAL_STACK_OFFSET      0
@@ -33,7 +33,7 @@ VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
 #define KPRCB_PCR_PAGE_OFFSET          0
 #define CBSTACK_FRAME_POINTER          Ebp
 
-#elif defined(_AMD64_)
+#elif defined(_M_AMD64)
 
 #define KPCR_SELF_PCR_OFFSET           FIELD_OFFSET(KPCR, Self)
 #define KPCR_CURRENT_PRCB_OFFSET       FIELD_OFFSET(KPCR, CurrentPrcb)
@@ -43,10 +43,10 @@ VOID NTAPI RtlpBreakWithStatusInstruction(VOID);
 #define KPRCB_PCR_PAGE_OFFSET          0
 #define CBSTACK_FRAME_POINTER          Rbp
 
-#elif defined(_ARM_)
+#elif defined(_M_ARM)
 
 #define KPCR_SELF_PCR_OFFSET           0
-#define KPCR_CURRENT_PRCB_OFFSET       FIELD_OFFSET(KPCR, Prcb)
+#define KPCR_CURRENT_PRCB_OFFSET       FIELD_OFFSET(KIPCR, Prcb)
 #define KPCR_CONTAINED_PRCB_OFFSET     0
 #define KPCR_INITIAL_STACK_OFFSET      FIELD_OFFSET(KPCR, InitialStack)
 #define KPCR_STACK_LIMIT_OFFSET        FIELD_OFFSET(KPCR, StackLimit)
@@ -374,7 +374,7 @@ DBGKD_GET_VERSION64 KdVersionBlock =
     0,
     DBGKD_64BIT_PROTOCOL_VERSION2,
     CURRENT_KD_SECONDARY_VERSION,
-#if defined(_WIN64)
+#if defined(_M_AMD64) || defined(_M_ARM64)
     DBGKD_VERS_FLAG_DATA | DBGKD_VERS_FLAG_PTR64,
 #else
     DBGKD_VERS_FLAG_DATA,
@@ -396,8 +396,13 @@ KDDEBUGGER_DATA64 KdDebuggerDataBlock =
     {(ULONG_PTR)RtlpBreakWithStatusInstruction},
     0,
     FIELD_OFFSET(KTHREAD, CallbackStack),
+#if defined(_M_ARM) || defined(_M_AMD64)
+    0,
+    0,
+#else
     FIELD_OFFSET(KCALLOUT_FRAME, CallbackStack),
     FIELD_OFFSET(KCALLOUT_FRAME, CBSTACK_FRAME_POINTER),
+#endif
     FALSE,
     {(ULONG_PTR)KiCallUserMode},
     0,
@@ -505,11 +510,18 @@ KDDEBUGGER_DATA64 KdDebuggerDataBlock =
     KPCR_CONTAINED_PRCB_OFFSET,
     0,
     0,
+#if defined(_M_ARM)
+    _WARN("KPCR_INITIAL_STACK_OFFSET, KPCR_STACK_LIMIT_OFFSET and KPRCB_PCR_PAGE_OFFSET not properly defined on ARM")
+    0,
+    0,
+    0,
+#else
     KPCR_INITIAL_STACK_OFFSET,
     KPCR_STACK_LIMIT_OFFSET,
     KPRCB_PCR_PAGE_OFFSET,
+#endif
     FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters),
-#if defined(_X86_)
+#if defined(_M_IX86)
     //
     // x86 GDT/LDT/TSS constants
     //
@@ -523,7 +535,7 @@ KDDEBUGGER_DATA64 KdDebuggerDataBlock =
     KGDT_TSS,
     0,
     0,
-#elif defined(_AMD64_)
+#elif defined(_M_AMD64)
     //
     // AMD64 GDT/LDT/TSS constants
     //