[CMAKE]

Provide the asm offset constants that are used throughout the code instead the official ones. We'll have to decide which way to go later.

svn path=/branches/cmake-bringup/; revision=50401

diff --git a/include/asm/ksamd64.template.h b/include/asm/ksamd64.template.h
index 3c6e942..88b9663 100644 (file)
--- a/include/asm/ksamd64.template.h
+++ b/include/asm/ksamd64.template.h
@@ -118,68 +118,68 @@ OFFSET(P3Home, CONTEXT, P1Home),
 OFFSET(P4Home, CONTEXT, P1Home),
 
 HEADER("CONTEXT"),
-OFFSET(CxP1Home, CONTEXT, P1Home),
-OFFSET(CxP2Home, CONTEXT, P2Home),
-OFFSET(CxP3Home, CONTEXT, P3Home),
-OFFSET(CxP4Home, CONTEXT, P4Home),
-OFFSET(CxP5Home, CONTEXT, P5Home),
-OFFSET(CxP6Home, CONTEXT, P6Home),
-OFFSET(CxContextFlags, CONTEXT, ContextFlags),
-OFFSET(CxMxCsr, CONTEXT, MxCsr),
-OFFSET(CxSegCs, CONTEXT, SegCs),
-OFFSET(CxSegDs, CONTEXT, SegDs),
-OFFSET(CxSegEs, CONTEXT, SegEs),
-OFFSET(CxSegFs, CONTEXT, SegFs),
-OFFSET(CxSegGs, CONTEXT, SegGs),
-OFFSET(CxSegSs, CONTEXT, SegSs),
-OFFSET(CxEFlags, CONTEXT, EFlags),
-OFFSET(CxDr0, CONTEXT, Dr0),
-OFFSET(CxDr1, CONTEXT, Dr1),
-OFFSET(CxDr2, CONTEXT, Dr2),
-OFFSET(CxDr3, CONTEXT, Dr3),
-OFFSET(CxDr6, CONTEXT, Dr6),
-OFFSET(CxDr7, CONTEXT, Dr7),
-OFFSET(CxRax, CONTEXT, Rax),
-OFFSET(CxRcx, CONTEXT, Rcx),
-OFFSET(CxRdx, CONTEXT, Rdx),
-OFFSET(CxRbx, CONTEXT, Rbx),
-OFFSET(CxRsp, CONTEXT, Rsp),
-OFFSET(CxRbp, CONTEXT, Rbp),
-OFFSET(CxRsi, CONTEXT, Rsi),
-OFFSET(CxRdi, CONTEXT, Rdi),
-OFFSET(CxR8, CONTEXT, R8),
-OFFSET(CxR9, CONTEXT, R9),
-OFFSET(CxR10, CONTEXT, R10),
-OFFSET(CxR11, CONTEXT, R11),
-OFFSET(CxR12, CONTEXT, R12),
-OFFSET(CxR13, CONTEXT, R13),
-OFFSET(CxR14, CONTEXT, R14),
-OFFSET(CxR15, CONTEXT, R15),
-OFFSET(CxRip, CONTEXT, Rip),
-OFFSET(CxFltSave, CONTEXT, FltSave),
-OFFSET(CxXmm0, CONTEXT, Xmm0),
-OFFSET(CxXmm1, CONTEXT, Xmm1),
-OFFSET(CxXmm2, CONTEXT, Xmm2),
-OFFSET(CxXmm3, CONTEXT, Xmm3),
-OFFSET(CxXmm4, CONTEXT, Xmm4),
-OFFSET(CxXmm5, CONTEXT, Xmm5),
-OFFSET(CxXmm6, CONTEXT, Xmm6),
-OFFSET(CxXmm7, CONTEXT, Xmm7),
-OFFSET(CxXmm8, CONTEXT, Xmm8),
-OFFSET(CxXmm9, CONTEXT, Xmm9),
-OFFSET(CxXmm10, CONTEXT, Xmm10),
-OFFSET(CxXmm11, CONTEXT, Xmm11),
-OFFSET(CxXmm12, CONTEXT, Xmm12),
-OFFSET(CxXmm13, CONTEXT, Xmm13),
-OFFSET(CxXmm14, CONTEXT, Xmm14),
-OFFSET(CxXmm15, CONTEXT, Xmm15),
-OFFSET(CxDebugControl, CONTEXT, DebugControl),
-OFFSET(CxLastBranchToRip, CONTEXT, LastBranchToRip),
-OFFSET(CxLastBranchFromRip, CONTEXT, LastBranchFromRip),
-OFFSET(CxLastExceptionToRip, CONTEXT, LastExceptionToRip),
-OFFSET(CxLastExceptionFromRip, CONTEXT, LastExceptionFromRip),
-OFFSET(CxVectorControl, CONTEXT, VectorControl),
-OFFSET(CxVectorRegister, CONTEXT, VectorRegister),
+OFFSET(CONTEXT_P1Home, CONTEXT, P1Home),
+OFFSET(CONTEXT_P2Home, CONTEXT, P2Home),
+OFFSET(CONTEXT_P3Home, CONTEXT, P3Home),
+OFFSET(CONTEXT_P4Home, CONTEXT, P4Home),
+OFFSET(CONTEXT_P5Home, CONTEXT, P5Home),
+OFFSET(CONTEXT_P6Home, CONTEXT, P6Home),
+OFFSET(CONTEXT_ContextFlags, CONTEXT, ContextFlags),
+OFFSET(CONTEXT_MxCsr, CONTEXT, MxCsr),
+OFFSET(CONTEXT_SegCs, CONTEXT, SegCs),
+OFFSET(CONTEXT_SegDs, CONTEXT, SegDs),
+OFFSET(CONTEXT_SegEs, CONTEXT, SegEs),
+OFFSET(CONTEXT_SegFs, CONTEXT, SegFs),
+OFFSET(CONTEXT_SegGs, CONTEXT, SegGs),
+OFFSET(CONTEXT_SegSs, CONTEXT, SegSs),
+OFFSET(CONTEXT_EFlags, CONTEXT, EFlags),
+OFFSET(CONTEXT_Dr0, CONTEXT, Dr0),
+OFFSET(CONTEXT_Dr1, CONTEXT, Dr1),
+OFFSET(CONTEXT_Dr2, CONTEXT, Dr2),
+OFFSET(CONTEXT_Dr3, CONTEXT, Dr3),
+OFFSET(CONTEXT_Dr6, CONTEXT, Dr6),
+OFFSET(CONTEXT_Dr7, CONTEXT, Dr7),
+OFFSET(CONTEXT_Rax, CONTEXT, Rax),
+OFFSET(CONTEXT_Rcx, CONTEXT, Rcx),
+OFFSET(CONTEXT_Rdx, CONTEXT, Rdx),
+OFFSET(CONTEXT_Rbx, CONTEXT, Rbx),
+OFFSET(CONTEXT_Rsp, CONTEXT, Rsp),
+OFFSET(CONTEXT_Rbp, CONTEXT, Rbp),
+OFFSET(CONTEXT_Rsi, CONTEXT, Rsi),
+OFFSET(CONTEXT_Rdi, CONTEXT, Rdi),
+OFFSET(CONTEXT_R8, CONTEXT, R8),
+OFFSET(CONTEXT_R9, CONTEXT, R9),
+OFFSET(CONTEXT_R10, CONTEXT, R10),
+OFFSET(CONTEXT_R11, CONTEXT, R11),
+OFFSET(CONTEXT_R12, CONTEXT, R12),
+OFFSET(CONTEXT_R13, CONTEXT, R13),
+OFFSET(CONTEXT_R14, CONTEXT, R14),
+OFFSET(CONTEXT_R15, CONTEXT, R15),
+OFFSET(CONTEXT_Rip, CONTEXT, Rip),
+OFFSET(CONTEXT_FltSave, CONTEXT, FltSave),
+OFFSET(CONTEXT_Xmm0, CONTEXT, Xmm0),
+OFFSET(CONTEXT_Xmm1, CONTEXT, Xmm1),
+OFFSET(CONTEXT_Xmm2, CONTEXT, Xmm2),
+OFFSET(CONTEXT_Xmm3, CONTEXT, Xmm3),
+OFFSET(CONTEXT_Xmm4, CONTEXT, Xmm4),
+OFFSET(CONTEXT_Xmm5, CONTEXT, Xmm5),
+OFFSET(CONTEXT_Xmm6, CONTEXT, Xmm6),
+OFFSET(CONTEXT_Xmm7, CONTEXT, Xmm7),
+OFFSET(CONTEXT_Xmm8, CONTEXT, Xmm8),
+OFFSET(CONTEXT_Xmm9, CONTEXT, Xmm9),
+OFFSET(CONTEXT_Xmm10, CONTEXT, Xmm10),
+OFFSET(CONTEXT_Xmm11, CONTEXT, Xmm11),
+OFFSET(CONTEXT_Xmm12, CONTEXT, Xmm12),
+OFFSET(CONTEXT_Xmm13, CONTEXT, Xmm13),
+OFFSET(CONTEXT_Xmm14, CONTEXT, Xmm14),
+OFFSET(CONTEXT_Xmm15, CONTEXT, Xmm15),
+OFFSET(CONTEXT_DebugControl, CONTEXT, DebugControl),
+OFFSET(CONTEXT_LastBranchToRip, CONTEXT, LastBranchToRip),
+OFFSET(CONTEXT_LastBranchFromRip, CONTEXT, LastBranchFromRip),
+OFFSET(CONTEXT_LastExceptionToRip, CONTEXT, LastExceptionToRip),
+OFFSET(CONTEXT_LastExceptionFromRip, CONTEXT, LastExceptionFromRip),
+OFFSET(CONTEXT_VectorControl, CONTEXT, VectorControl),
+OFFSET(CONTEXT_VectorRegister, CONTEXT, VectorRegister),
 SIZE(CONTEXT_FRAME_LENGTH, CONTEXT),
 
 HEADER("DISPATCHER_CONTEXT"),
@@ -195,36 +195,36 @@ OFFSET(DcHistoryTable, DISPATCHER_CONTEXT, HistoryTable),
 OFFSET(DcScopeIndex, DISPATCHER_CONTEXT, ScopeIndex),
 
 HEADER("KEXCEPTION_FRAME"),
-OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home),
-OFFSET(ExP2Home, KEXCEPTION_FRAME, P2Home),
-OFFSET(ExP3Home, KEXCEPTION_FRAME, P3Home),
-OFFSET(ExP4Home, KEXCEPTION_FRAME, P4Home),
-OFFSET(ExP5, KEXCEPTION_FRAME, P5),
-OFFSET(ExXmm6, KEXCEPTION_FRAME, Xmm6),
-OFFSET(ExXmm7, KEXCEPTION_FRAME, Xmm7),
-OFFSET(ExXmm8, KEXCEPTION_FRAME, Xmm8),
-OFFSET(ExXmm9, KEXCEPTION_FRAME, Xmm9),
-OFFSET(ExXmm10, KEXCEPTION_FRAME, Xmm10),
-OFFSET(ExXmm11, KEXCEPTION_FRAME, Xmm11),
-OFFSET(ExXmm12, KEXCEPTION_FRAME, Xmm12),
-OFFSET(ExXmm13, KEXCEPTION_FRAME, Xmm13),
-OFFSET(ExXmm14, KEXCEPTION_FRAME, Xmm14),
-OFFSET(ExXmm15, KEXCEPTION_FRAME, Xmm15),
-OFFSET(ExMxCsr, KEXCEPTION_FRAME, MxCsr),
-OFFSET(ExRbp, KEXCEPTION_FRAME, Rbp),
-OFFSET(ExRbx, KEXCEPTION_FRAME, Rbx),
-OFFSET(ExRdi, KEXCEPTION_FRAME, Rdi),
-OFFSET(ExRsi, KEXCEPTION_FRAME, Rsi),
-OFFSET(ExR12, KEXCEPTION_FRAME, R12),
-OFFSET(ExR13, KEXCEPTION_FRAME, R13),
-OFFSET(ExR14, KEXCEPTION_FRAME, R14),
-OFFSET(ExR15, KEXCEPTION_FRAME, R15),
-OFFSET(ExReturn, KEXCEPTION_FRAME, Return),
-OFFSET(CuInitialStack, KEXCEPTION_FRAME, InitialStack),
-OFFSET(CuTrapFrame, KEXCEPTION_FRAME, TrapFrame),
-OFFSET(CuCallbackStack, KEXCEPTION_FRAME, CallbackStack),
-OFFSET(CuOutputBuffer, KEXCEPTION_FRAME, OutputBuffer),
-OFFSET(CuOutputLength, KEXCEPTION_FRAME, OutputLength),
+OFFSET(KEXCEPTION_FRAME_P1Home, KEXCEPTION_FRAME, P1Home),
+OFFSET(KEXCEPTION_FRAME_P2Home, KEXCEPTION_FRAME, P2Home),
+OFFSET(KEXCEPTION_FRAME_P3Home, KEXCEPTION_FRAME, P3Home),
+OFFSET(KEXCEPTION_FRAME_P4Home, KEXCEPTION_FRAME, P4Home),
+OFFSET(KEXCEPTION_FRAME_P5, KEXCEPTION_FRAME, P5),
+OFFSET(KEXCEPTION_FRAME_Xmm6, KEXCEPTION_FRAME, Xmm6),
+OFFSET(KEXCEPTION_FRAME_Xmm7, KEXCEPTION_FRAME, Xmm7),
+OFFSET(KEXCEPTION_FRAME_Xmm8, KEXCEPTION_FRAME, Xmm8),
+OFFSET(KEXCEPTION_FRAME_Xmm9, KEXCEPTION_FRAME, Xmm9),
+OFFSET(KEXCEPTION_FRAME_Xmm10, KEXCEPTION_FRAME, Xmm10),
+OFFSET(KEXCEPTION_FRAME_Xmm11, KEXCEPTION_FRAME, Xmm11),
+OFFSET(KEXCEPTION_FRAME_Xmm12, KEXCEPTION_FRAME, Xmm12),
+OFFSET(KEXCEPTION_FRAME_Xmm13, KEXCEPTION_FRAME, Xmm13),
+OFFSET(KEXCEPTION_FRAME_Xmm14, KEXCEPTION_FRAME, Xmm14),
+OFFSET(KEXCEPTION_FRAME_Xmm15, KEXCEPTION_FRAME, Xmm15),
+OFFSET(KEXCEPTION_FRAME_MxCsr, KEXCEPTION_FRAME, MxCsr),
+OFFSET(KEXCEPTION_FRAME_Rbp, KEXCEPTION_FRAME, Rbp),
+OFFSET(KEXCEPTION_FRAME_Rbx, KEXCEPTION_FRAME, Rbx),
+OFFSET(KEXCEPTION_FRAME_Rdi, KEXCEPTION_FRAME, Rdi),
+OFFSET(KEXCEPTION_FRAME_Rsi, KEXCEPTION_FRAME, Rsi),
+OFFSET(KEXCEPTION_FRAME_R12, KEXCEPTION_FRAME, R12),
+OFFSET(KEXCEPTION_FRAME_R13, KEXCEPTION_FRAME, R13),
+OFFSET(KEXCEPTION_FRAME_R14, KEXCEPTION_FRAME, R14),
+OFFSET(KEXCEPTION_FRAME_R15, KEXCEPTION_FRAME, R15),
+OFFSET(KEXCEPTION_FRAME_Return, KEXCEPTION_FRAME, Return),
+OFFSET(KEXCEPTION_FRAME_InitialStack, KEXCEPTION_FRAME, InitialStack),
+OFFSET(KEXCEPTION_FRAME_TrapFrame, KEXCEPTION_FRAME, TrapFrame),
+OFFSET(KEXCEPTION_FRAME_CallbackStack, KEXCEPTION_FRAME, CallbackStack),
+OFFSET(KEXCEPTION_FRAME_OutputBuffer, KEXCEPTION_FRAME, OutputBuffer),
+OFFSET(KEXCEPTION_FRAME_OutputLength, KEXCEPTION_FRAME, OutputLength),
 SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME),
 
 HEADER("JUMP_BUFFER"),
@@ -491,64 +491,64 @@ SIZE(SwitchFrameLength, KSWITCH_FRAME),
 SIZE(KSWITCH_FRAME_LENGTH, KSWITCH_FRAME),
 
 HEADER("KTRAP_FRAME"),
-OFFSET(TrP1Home, KTRAP_FRAME, P1Home),
-OFFSET(TrP2Home, KTRAP_FRAME, P2Home),
-OFFSET(TrP3Home, KTRAP_FRAME, P3Home),
-OFFSET(TrP4Home, KTRAP_FRAME, P4Home),
-OFFSET(TrP5, KTRAP_FRAME, P5),
-OFFSET(TrPreviousMode, KTRAP_FRAME, PreviousMode),
-OFFSET(TrPreviousIrql, KTRAP_FRAME, PreviousIrql),
-OFFSET(TrFaultIndicator, KTRAP_FRAME, FaultIndicator),
-OFFSET(TrExceptionActive, KTRAP_FRAME, ExceptionActive),
-OFFSET(TrMxCsr, KTRAP_FRAME, MxCsr),
-OFFSET(TrRax, KTRAP_FRAME, Rax),
-OFFSET(TrRcx, KTRAP_FRAME, Rcx),
-OFFSET(TrRdx, KTRAP_FRAME, Rdx),
-OFFSET(TrR8, KTRAP_FRAME, R8),
-OFFSET(TrR9, KTRAP_FRAME, R9),
-OFFSET(TrR10, KTRAP_FRAME, R10),
-OFFSET(TrR11, KTRAP_FRAME, R11),
-OFFSET(TrGsBase, KTRAP_FRAME, GsBase),
-OFFSET(TrGsSwap, KTRAP_FRAME,GsSwap),
-OFFSET(TrXmm0, KTRAP_FRAME, Xmm0),
-OFFSET(TrXmm1, KTRAP_FRAME, Xmm1),
-OFFSET(TrXmm2, KTRAP_FRAME, Xmm2),
-OFFSET(TrXmm3, KTRAP_FRAME, Xmm3),
-OFFSET(TrXmm4, KTRAP_FRAME, Xmm4),
-OFFSET(TrXmm5, KTRAP_FRAME, Xmm5),
-OFFSET(TrFaultAddress, KTRAP_FRAME, FaultAddress),
-OFFSET(TrTimeStampCKCL, KTRAP_FRAME, TimeStampCKCL),
-OFFSET(TrDr0, KTRAP_FRAME, Dr0),
-OFFSET(TrDr1, KTRAP_FRAME, Dr1),
-OFFSET(TrDr2, KTRAP_FRAME, Dr2),
-OFFSET(TrDr3, KTRAP_FRAME, Dr3),
-OFFSET(TrDr6, KTRAP_FRAME, Dr6),
-OFFSET(TrDr7, KTRAP_FRAME, Dr7),
-OFFSET(TrDebugControl, KTRAP_FRAME, DebugControl),
-OFFSET(TrLastBranchToRip, KTRAP_FRAME, LastBranchToRip),
-OFFSET(TrLastBranchFromRip, KTRAP_FRAME, LastBranchFromRip),
-OFFSET(TrLastExceptionToRip, KTRAP_FRAME, LastExceptionToRip),
-OFFSET(TrLastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip),
-OFFSET(TrLastBranchControl, KTRAP_FRAME, LastBranchControl),
-OFFSET(TrLastBranchMSR, KTRAP_FRAME, LastBranchMSR),
-OFFSET(TrSegDs, KTRAP_FRAME, SegDs),
-OFFSET(TrSegEs, KTRAP_FRAME, SegEs),
-OFFSET(TrSegFs, KTRAP_FRAME, SegFs),
-OFFSET(TrSegGs, KTRAP_FRAME, SegGs),
-OFFSET(TrTrapFrame, KTRAP_FRAME, TrapFrame),
-OFFSET(TrRbx, KTRAP_FRAME, Rbx),
-OFFSET(TrRdi, KTRAP_FRAME, Rdi),
-OFFSET(TrRsi, KTRAP_FRAME, Rsi),
-OFFSET(TrRbp, KTRAP_FRAME, Rbp),
-OFFSET(TrErrorCode, KTRAP_FRAME, ErrorCode),
-OFFSET(TrTimeStampKlog, KTRAP_FRAME, TimeStampKlog),
-OFFSET(TrRip, KTRAP_FRAME, Rip),
-OFFSET(TrSegCs, KTRAP_FRAME, SegCs),
-OFFSET(TrLogging, KTRAP_FRAME, Logging),
-OFFSET(TrEFlags, KTRAP_FRAME, EFlags),
-OFFSET(TrRsp, KTRAP_FRAME, Rsp),
-OFFSET(TrSegSs, KTRAP_FRAME, SegSs),
-OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle),
+OFFSET(KTRAP_FRAME_P1Home, KTRAP_FRAME, P1Home),
+OFFSET(KTRAP_FRAME_P2Home, KTRAP_FRAME, P2Home),
+OFFSET(KTRAP_FRAME_P3Home, KTRAP_FRAME, P3Home),
+OFFSET(KTRAP_FRAME_P4Home, KTRAP_FRAME, P4Home),
+OFFSET(KTRAP_FRAME_P5, KTRAP_FRAME, P5),
+OFFSET(KTRAP_FRAME_PreviousMode, KTRAP_FRAME, PreviousMode),
+OFFSET(KTRAP_FRAME_PreviousIrql, KTRAP_FRAME, PreviousIrql),
+OFFSET(KTRAP_FRAME_FaultIndicator, KTRAP_FRAME, FaultIndicator),
+OFFSET(KTRAP_FRAME_ExceptionActive, KTRAP_FRAME, ExceptionActive),
+OFFSET(KTRAP_FRAME_MxCsr, KTRAP_FRAME, MxCsr),
+OFFSET(KTRAP_FRAME_Rax, KTRAP_FRAME, Rax),
+OFFSET(KTRAP_FRAME_Rcx, KTRAP_FRAME, Rcx),
+OFFSET(KTRAP_FRAME_Rdx, KTRAP_FRAME, Rdx),
+OFFSET(KTRAP_FRAME_R8, KTRAP_FRAME, R8),
+OFFSET(KTRAP_FRAME_R9, KTRAP_FRAME, R9),
+OFFSET(KTRAP_FRAME_R10, KTRAP_FRAME, R10),
+OFFSET(KTRAP_FRAME_R11, KTRAP_FRAME, R11),
+OFFSET(KTRAP_FRAME_GsBase, KTRAP_FRAME, GsBase),
+OFFSET(KTRAP_FRAME_GsSwap, KTRAP_FRAME,GsSwap),
+OFFSET(KTRAP_FRAME_Xmm0, KTRAP_FRAME, Xmm0),
+OFFSET(KTRAP_FRAME_Xmm1, KTRAP_FRAME, Xmm1),
+OFFSET(KTRAP_FRAME_Xmm2, KTRAP_FRAME, Xmm2),
+OFFSET(KTRAP_FRAME_Xmm3, KTRAP_FRAME, Xmm3),
+OFFSET(KTRAP_FRAME_Xmm4, KTRAP_FRAME, Xmm4),
+OFFSET(KTRAP_FRAME_Xmm5, KTRAP_FRAME, Xmm5),
+OFFSET(KTRAP_FRAME_FaultAddress, KTRAP_FRAME, FaultAddress),
+OFFSET(KTRAP_FRAME_TimeStampCKCL, KTRAP_FRAME, TimeStampCKCL),
+OFFSET(KTRAP_FRAME_Dr0, KTRAP_FRAME, Dr0),
+OFFSET(KTRAP_FRAME_Dr1, KTRAP_FRAME, Dr1),
+OFFSET(KTRAP_FRAME_Dr2, KTRAP_FRAME, Dr2),
+OFFSET(KTRAP_FRAME_Dr3, KTRAP_FRAME, Dr3),
+OFFSET(KTRAP_FRAME_Dr6, KTRAP_FRAME, Dr6),
+OFFSET(KTRAP_FRAME_Dr7, KTRAP_FRAME, Dr7),
+OFFSET(KTRAP_FRAME_DebugControl, KTRAP_FRAME, DebugControl),
+OFFSET(KTRAP_FRAME_LastBranchToRip, KTRAP_FRAME, LastBranchToRip),
+OFFSET(KTRAP_FRAME_LastBranchFromRip, KTRAP_FRAME, LastBranchFromRip),
+OFFSET(KTRAP_FRAME_LastExceptionToRip, KTRAP_FRAME, LastExceptionToRip),
+OFFSET(KTRAP_FRAME_LastExceptionFromRip, KTRAP_FRAME, LastExceptionFromRip),
+OFFSET(KTRAP_FRAME_LastBranchControl, KTRAP_FRAME, LastBranchControl),
+OFFSET(KTRAP_FRAME_LastBranchMSR, KTRAP_FRAME, LastBranchMSR),
+OFFSET(KTRAP_FRAME_SegDs, KTRAP_FRAME, SegDs),
+OFFSET(KTRAP_FRAME_SegEs, KTRAP_FRAME, SegEs),
+OFFSET(KTRAP_FRAME_SegFs, KTRAP_FRAME, SegFs),
+OFFSET(KTRAP_FRAME_SegGs, KTRAP_FRAME, SegGs),
+OFFSET(KTRAP_FRAME_TrapFrame, KTRAP_FRAME, TrapFrame),
+OFFSET(KTRAP_FRAME_Rbx, KTRAP_FRAME, Rbx),
+OFFSET(KTRAP_FRAME_Rdi, KTRAP_FRAME, Rdi),
+OFFSET(KTRAP_FRAME_Rsi, KTRAP_FRAME, Rsi),
+OFFSET(KTRAP_FRAME_Rbp, KTRAP_FRAME, Rbp),
+OFFSET(KTRAP_FRAME_ErrorCode, KTRAP_FRAME, ErrorCode),
+OFFSET(KTRAP_FRAME_TimeStampKlog, KTRAP_FRAME, TimeStampKlog),
+OFFSET(KTRAP_FRAME_Rip, KTRAP_FRAME, Rip),
+OFFSET(KTRAP_FRAME_SegCs, KTRAP_FRAME, SegCs),
+OFFSET(KTRAP_FRAME_Logging, KTRAP_FRAME, Logging),
+OFFSET(KTRAP_FRAME_EFlags, KTRAP_FRAME, EFlags),
+OFFSET(KTRAP_FRAME_Rsp, KTRAP_FRAME, Rsp),
+OFFSET(KTRAP_FRAME_SegSs, KTRAP_FRAME, SegSs),
+OFFSET(KTRAP_FRAME_CodePatchCycle, KTRAP_FRAME, CodePatchCycle),
 SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME),
 
 #if (NTDDI_VERSION >= NTDDI_WIN7)
@@ -570,3 +570,12 @@ OFFSET(TssNmiStack, KTSS64, Ist[3]),
 OFFSET(TssIoMapBase, KTSS64, IoMapBase),
 SIZE(TssLength, KTSS64),
 
+HEADER("EXCEPTION_RECORD"),
+OFFSET(EXCEPTION_RECORD_ExceptionCode, EXCEPTION_RECORD, ExceptionCode),
+OFFSET(EXCEPTION_RECORD_ExceptionFlags, EXCEPTION_RECORD, ExceptionFlags),
+OFFSET(EXCEPTION_RECORD_ExceptionRecord, EXCEPTION_RECORD, ExceptionRecord),
+OFFSET(EXCEPTION_RECORD_ExceptionAddress, EXCEPTION_RECORD, ExceptionAddress),
+OFFSET(EXCEPTION_RECORD_NumberParameters, EXCEPTION_RECORD, NumberParameters),
+OFFSET(EXCEPTION_RECORD_ExceptionInformation, EXCEPTION_RECORD, ExceptionInformation),
+
+OFFSET(KTHREAD_WAIT_IRQL, KTHREAD, WaitIrql),