//CONSTANT(KF_XSTATE),
HEADER("KDGT selectors"),
-CONSTANT(KGDT_R3_DATA),
-CONSTANT(KGDT_R3_CODE),
+CONSTANT(KGDT_NULL),
CONSTANT(KGDT_R0_CODE),
CONSTANT(KGDT_R0_DATA),
-CONSTANT(KGDT_R0_PCR),
-//CONSTANT(KGDT_STACK16),// obsolete
-//CONSTANT(KGDT_CODE16),// obsolete
+CONSTANT(KGDT_R3_CODE),
+CONSTANT(KGDT_R3_DATA),
CONSTANT(KGDT_TSS),
+CONSTANT(KGDT_R0_PCR),
CONSTANT(KGDT_R3_TEB),
-//CONSTANT(KGDT_R3_GS),
+CONSTANT(KGDT_VDM_TILE),
+CONSTANT(KGDT_LDT),
CONSTANT(KGDT_DF_TSS),
CONSTANT(KGDT_NMI_TSS),
-CONSTANT(KGDT_LDT),
+//CONSTANT(KGDT_R3_GS),
+//CONSTANT(KGDT_STACK16),// obsolete
+//CONSTANT(KGDT_CODE16), // obsolete
HEADER("Machine type definitions"),
CONSTANT(MACHINE_TYPE_ISA),
OFFSET(PcContextSwitches, KIPCR, ContextSwitches),
OFFSET(PcSetMemberCopy, KIPCR, SetMemberCopy),
OFFSET(PcTeb, KIPCR, NtTib.Self),
-OFFSET(PcSelfPcr, KIPCR, Self),
+OFFSET(PcSelfPcr, KIPCR, SelfPcr),
OFFSET(PcPrcb, KIPCR, Prcb),
OFFSET(PcIrql, KIPCR, Irql),
OFFSET(PcIRR, KIPCR, IRR),
RAW("#define USERDATA ds:[HEX(0FFDF0000)]"),
RAW("#define PCR fs:"),
-#if (NTDDI_VERSION >= NTDDI_VISTA)
+#if (NTDDI_VERSION >= NTDDI_WIN8)
HEADER("KNODE offsets"),
OFFSET(NdIdleCpuSet, KNODE, IdleCpuSet),
#endif
OFFSET(KPCR_PERF_GLOBAL_GROUP_MASK, KIPCR, PerfGlobalGroupMask),
OFFSET(KPCR_CONTEXT_SWITCHES, KPCR, ContextSwitches),
OFFSET(KPCR_TEB, KIPCR, Used_Self),
-OFFSET(KPCR_SELF, KIPCR, Self),
+OFFSET(KPCR_SELF, KIPCR, SelfPcr),
OFFSET(KPCR_PRCB, KPCR, Prcb),
OFFSET(KPCR_IDT, KIPCR, IDT),
OFFSET(KPCR_GDT, KIPCR, GDT),