[ros-diffs] [tkreuzer] 50180: [CMAKE] Fix genincdata for amd64

Author: tkreuzer
Date: Tue Dec 28 01:06:06 2010
New Revision: 50180

URL: http://svn.reactos.org/svn/reactos?rev=50180&view=rev
Log:
[CMAKE]
Fix genincdata for amd64

Modified:
    branches/cmake-bringup/include/asm/genincdata.c
    branches/cmake-bringup/include/asm/ksamd64.template.h
    branches/cmake-bringup/include/asm/ksx.template.h

Modified: branches/cmake-bringup/include/asm/genincdata.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin…
==============================================================================
--- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Tue Dec 28 01:06:06 2010
@@ -3,6 +3,7 @@
 
 /* DDK/IFS/NDK Headers */
 #include <excpt.h>
+#include <setjmp.h>
 #include <ntdef.h>
 #include <ntifs.h>
 #include <arc/arc.h>
@@ -60,6 +61,7 @@
 #else
 #error Your compiler is not supported.
 #endif
+
 ASMGENDATA Table[] =
 {
 

Modified: branches/cmake-bringup/include/asm/ksamd64.template.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd…
==============================================================================
--- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Tue Dec 28 01:06:06
2010
@@ -1,4 +1,3 @@
-
 
 HEADER("CR0 flags"),
 CONSTANT(CR0_PE),
@@ -39,7 +38,6 @@
 CONSTANT(MACHINE_TYPE_EISA),
 CONSTANT(MACHINE_TYPE_MCA),
 
-#endif
 HEADER("EFLAGS"),
 CONSTANT(EFLAGS_TF_MASK),
 CONSTANT(EFLAGS_TF_SHIFT),
@@ -48,14 +46,14 @@
 CONSTANT(EFLAGS_ID_MASK),
 
 HEADER("Hypervisor Enlightenment Definitions"),
-CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH),
-CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH),
-CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH),
-CONSTANT(HV_X64_MSR_APIC_EOI),
-CONSTANT(HV_APIC_ENLIGHTENED),
-CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT),
-CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V),
-CONSTANT(HvApicFlags),
+//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH),
+//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH),
+//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH),
+//CONSTANT(HV_X64_MSR_APIC_EOI),
+//CONSTANT(HV_APIC_ENLIGHTENED),
+//CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT),
+//CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V),
+//CONSTANT(HvApicFlags),
 
 HEADER("KDGT selectors"),
 CONSTANT(KGDT64_NULL),
@@ -92,10 +90,9 @@
 CONSTANT(MSR_LAST_EXCEPTION_TO),
 
 HEADER("Flags for MSR_DEGUG_CTL"),
-CONSTANT(MSR_DEBUG_CTL_LBR),
-CONSTANT(MSR_DEBUG_CRL_BTF),
-
-#if 0
+//CONSTANT(MSR_DEBUG_CTL_LBR),
+//CONSTANT(MSR_DEBUG_CRL_BTF),
+
 HEADER("Fatal exception codes"),
 CONSTANT(EXCEPTION_DIVIDED_BY_ZERO),
 CONSTANT(EXCEPTION_DEBUG),
@@ -113,7 +110,6 @@
 CONSTANT(EXCEPTION_RESERVED_TRAP),
 CONSTANT(EXCEPTION_NPX_ERROR),
 CONSTANT(EXCEPTION_ALIGNMENT_CHECK),
-#endif
 
 HEADER("Argument Home Address"),
 OFFSET(P1Home, CONTEXT, P1Home),
@@ -187,16 +183,16 @@
 SIZE(CONTEXT_FRAME_LENGTH, CONTEXT),
 
 HEADER("DISPATCHER_CONTEXT"),
-OFFSET(DcControlPc, TYPE, ControlPc),
-OFFSET(DcImageBase, TYPE, ImageBase),
-OFFSET(DcFunctionEntry, TYPE, FunctionEntry),
-OFFSET(DcEstablisherFrame, TYPE, EstablisherFrame),
-OFFSET(DcTargetIp, TYPE, TargetIp),
-OFFSET(DcContextRecord, TYPE, ContextRecord),
-OFFSET(DcLanguageHandler, TYPE, LanguageHandler),
-OFFSET(DcHandlerData, TYPE, HandlerData),
-OFFSET(DcHistoryTable, TYPE, HistoryTable),
-OFFSET(DcScopeIndex, TYPE, ScopeIndex),
+OFFSET(DcControlPc, DISPATCHER_CONTEXT, ControlPc),
+OFFSET(DcImageBase, DISPATCHER_CONTEXT, ImageBase),
+OFFSET(DcFunctionEntry, DISPATCHER_CONTEXT, FunctionEntry),
+OFFSET(DcEstablisherFrame, DISPATCHER_CONTEXT, EstablisherFrame),
+OFFSET(DcTargetIp, DISPATCHER_CONTEXT, TargetIp),
+OFFSET(DcContextRecord, DISPATCHER_CONTEXT, ContextRecord),
+OFFSET(DcLanguageHandler, DISPATCHER_CONTEXT, LanguageHandler),
+OFFSET(DcHandlerData, DISPATCHER_CONTEXT, HandlerData),
+OFFSET(DcHistoryTable, DISPATCHER_CONTEXT, HistoryTable),
+OFFSET(DcScopeIndex, DISPATCHER_CONTEXT, ScopeIndex),
 
 HEADER("KEXCEPTION_FRAME"),
 OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home),
@@ -232,38 +228,38 @@
 SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME),
 
 HEADER("JUMP_BUFFER"),
-OFFSET(JbFrame, JUMP_BUFFER, Frame),
-OFFSET(JbRbx, JUMP_BUFFER, Rbx),
-OFFSET(JbRsp, JUMP_BUFFER, Rsp),
-OFFSET(JbRbp, JUMP_BUFFER, Rbp),
-OFFSET(JbRsi, JUMP_BUFFER, Rsi),
-OFFSET(JbRdi, JUMP_BUFFER, Rdi),
-OFFSET(JbR12, JUMP_BUFFER, R12),
-OFFSET(JbR13, JUMP_BUFFER, R13),
-OFFSET(JbR14, JUMP_BUFFER, R14),
-OFFSET(JbR15, JUMP_BUFFER, R15),
-OFFSET(JbRip, JUMP_BUFFER, Rip),
-OFFSET(JbMxCsr, JUMP_BUFFER, MxCsr),
-OFFSET(JbFpCsr, JUMP_BUFFER, FpCsr),
-OFFSET(JbXmm6, JUMP_BUFFER, Xmm6),
-OFFSET(JbXmm7, JUMP_BUFFER, Xmm7),
-OFFSET(JbXmm8, JUMP_BUFFER, Xmm8),
-OFFSET(JbXmm9, JUMP_BUFFER, Xmm9),
-OFFSET(JbXmm10, JUMP_BUFFER, Xmm10),
-OFFSET(JbXmm11, JUMP_BUFFER, Xmm11),
-OFFSET(JbXmm12, JUMP_BUFFER, Xmm12),
-OFFSET(JbXmm13, JUMP_BUFFER, Xmm13),
-OFFSET(JbXmm14, JUMP_BUFFER, Xmm14),
-OFFSET(JbXmm15, JUMP_BUFFER, Xmm15),
-
-HEADER("KGDT64"),
-OFFSET(KgdtBaseLow, KGDT64, BaseLow),
-OFFSET(KgdtBaseMiddle, KGDT64, BaseMiddle),
-OFFSET(KgdtBaseHigh, KGDT64, BaseHigh),
-OFFSET(KgdtBaseUpper, KGDT64, BaseUpper),
-OFFSET(KgdtLimitHigh, KGDT64, LimitHigh),
-OFFSET(KgdtLimitLow, KGDT64, LimitLow),
-CONSTANT(KGDT_LIMIT_ENCODE_MASK),
+OFFSET(JbFrame, _JUMP_BUFFER, Frame),
+OFFSET(JbRbx, _JUMP_BUFFER, Rbx),
+OFFSET(JbRsp, _JUMP_BUFFER, Rsp),
+OFFSET(JbRbp, _JUMP_BUFFER, Rbp),
+OFFSET(JbRsi, _JUMP_BUFFER, Rsi),
+OFFSET(JbRdi, _JUMP_BUFFER, Rdi),
+OFFSET(JbR12, _JUMP_BUFFER, R12),
+OFFSET(JbR13, _JUMP_BUFFER, R13),
+OFFSET(JbR14, _JUMP_BUFFER, R14),
+OFFSET(JbR15, _JUMP_BUFFER, R15),
+OFFSET(JbRip, _JUMP_BUFFER, Rip),
+//OFFSET(JbMxCsr, _JUMP_BUFFER, MxCsr), // Spare
+//OFFSET(JbFpCsr, _JUMP_BUFFER, FpCsr),
+OFFSET(JbXmm6, _JUMP_BUFFER, Xmm6),
+OFFSET(JbXmm7, _JUMP_BUFFER, Xmm7),
+OFFSET(JbXmm8, _JUMP_BUFFER, Xmm8),
+OFFSET(JbXmm9, _JUMP_BUFFER, Xmm9),
+OFFSET(JbXmm10, _JUMP_BUFFER, Xmm10),
+OFFSET(JbXmm11, _JUMP_BUFFER, Xmm11),
+OFFSET(JbXmm12, _JUMP_BUFFER, Xmm12),
+OFFSET(JbXmm13, _JUMP_BUFFER, Xmm13),
+OFFSET(JbXmm14, _JUMP_BUFFER, Xmm14),
+OFFSET(JbXmm15, _JUMP_BUFFER, Xmm15),
+
+HEADER("KGDTENTRY64"),
+OFFSET(KgdtBaseLow, KGDTENTRY64, BaseLow),
+OFFSET(KgdtBaseMiddle, KGDTENTRY64, Bytes.BaseMiddle),
+OFFSET(KgdtBaseHigh, KGDTENTRY64, Bytes.BaseHigh),
+OFFSET(KgdtBaseUpper, KGDTENTRY64, BaseUpper),
+OFFSET(KgdtLimitHigh, KGDTENTRY64, Bytes.Flags2),
+OFFSET(KgdtLimitLow, KGDTENTRY64, LimitLow),
+//CONSTANT(KGDT_LIMIT_ENCODE_MASK),
 
 HEADER("KPRCB"),
 OFFSET(PbMxCsr, KPRCB, MxCsr),
@@ -286,13 +282,13 @@
 OFFSET(PbMajorVersion, KPRCB, MajorVersion),
 OFFSET(PbBuildType, KPRCB, BuildType),
 OFFSET(PbCpuVendor, KPRCB, CpuVendor),
-OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor),
-OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore),
+//OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor),
+//OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore),
 OFFSET(PbApicMask, KPRCB, ApicMask),
 OFFSET(PbCFlushSize, KPRCB, CFlushSize),
 OFFSET(PbAcpiReserved, KPRCB, AcpiReserved),
 OFFSET(PbInitialApicId, KPRCB, InitialApicId),
-OFFSET(PbStride, KPRCB, Stride),
+//OFFSET(PbStride, KPRCB, Stride),
 OFFSET(PbLockQueue, KPRCB, LockQueue),
 OFFSET(PbPPLookasideList, KPRCB, PPLookasideList),
 OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList),
@@ -300,22 +296,22 @@
 OFFSET(PbPacketBarrier, KPRCB, PacketBarrier),
 OFFSET(PbDeferredReadyListHead, KPRCB, DeferredReadyListHead),
 OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat),
-OFFSET(PbSystemCalls, KPRCB, SystemCalls),
-OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount),
-OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount),
-OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount),
-OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount),
-OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount),
-OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount),
-OFFSET(PbContextSwitches, KPRCB, ContextSwitches),
+//OFFSET(PbSystemCalls, KPRCB, SystemCalls),
+//OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount),
+//OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount),
+//OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount),
+//OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount),
+//OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount),
+//OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount),
+//OFFSET(PbContextSwitches, KPRCB, ContextSwitches),
 OFFSET(PbTargetSet, KPRCB, TargetSet),
 OFFSET(PbIpiFrozen, KPRCB, IpiFrozen),
 OFFSET(PbRequestMailbox, KPRCB, RequestMailbox),
 OFFSET(PbSenderSummary, KPRCB, SenderSummary),
-OFFSET(PbDpcListHead, KPRCB, DpcListHead),
-OFFSET(PbDpcLock, KPRCB, DpcLock),
-OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth),
-OFFSET(PbDpcCount, KPRCB, DpcCount),
+//OFFSET(PbDpcListHead, KPRCB, DpcListHead),
+//OFFSET(PbDpcLock, KPRCB, DpcLock),
+//OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth),
+//OFFSET(PbDpcCount, KPRCB, DpcCount),
 OFFSET(PbDpcStack, KPRCB, DpcStack),
 OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth),
 OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate),
@@ -345,49 +341,50 @@
 OFFSET(PbParentNode, KPRCB, ParentNode),
 OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet),
 OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster),
-OFFSET(PbStartCycles, KPRCB, StartCycles),
+//OFFSET(PbStartCycles, KPRCB, StartCycles),
 OFFSET(PbPageColor, KPRCB, PageColor),
 OFFSET(PbNodeColor, KPRCB, NodeColor),
 OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor),
 OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask),
 OFFSET(PbSleeping, KPRCB, Sleeping),
-OFFSET(PbCycleTime, KPRCB, CycleTime),
-OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait),
-OFFSET(PbFastReadWait, KPRCB, FastReadWait),
-OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible),
-OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait),
-OFFSET(PbCopyReadWait, KPRCB, CopyReadWait),
-OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss),
-OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount),
-OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount),
+//OFFSET(PbCycleTime, KPRCB, CycleTime),
+//OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait),
+//OFFSET(PbFastReadWait, KPRCB, FastReadWait),
+//OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible),
+//OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait),
+//OFFSET(PbCopyReadWait, KPRCB, CopyReadWait),
+//OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss),
+//OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount),
+//OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount),
 OFFSET(PbVendorString, KPRCB, VendorString),
 OFFSET(PbPowerState, KPRCB, PowerState),
 SIZE(ProcessorBlockLength, KPRCB),
 
 HEADER("KPCR"),
-OFFSET(PcGdt, KPCR, Gdt),
-OFFSET(PcTss, KPCR, Tss),
+//OFFSET(PcGdt, KPCR, Gdt),
+//OFFSET(PcTss, KPCR, Tss),
 OFFSET(PcUserRsp, KPCR, UserRsp),
 OFFSET(PcSelf, KPCR, Self),
 OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb),
 OFFSET(PcLockArray, KPCR, LockArray),
-OFFSET(PcTeb, KPCR, Teb),
-OFFSET(PcIdt, KPCR, Idt),
+//OFFSET(PcTeb, KPCR, Teb),
+//OFFSET(PcIdt, KPCR, Idt),
 OFFSET(PcIrql, KPCR, Irql),
 OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor),
 OFFSET(PcHalReserved, KPCR, HalReserved),
-OFFSET(PcPrcb, KPCR, Prcb),
-OFFSET(PcMxCsr, KPCR, MxCsr),
-OFFSET(PcNumber, KPCR, Number),
-OFFSET(PcInterruptRequest, KPCR, InterruptRequest),
-OFFSET(PcIdleHalt, KPCR, IdleHalt),
-OFFSET(PcCurrentThread, KPCR, CurrentThread),
-OFFSET(PcNextThread, KPCR, NextThread),
-OFFSET(PcIdleThread, KPCR, IdleThread),
-OFFSET(PcIpiFrozen, KPCR, IpiFrozen),
-OFFSET(PcNestingLevel, KPCR, NestingLevel),
-OFFSET(PcRspBase, KPCR, RspBase),
-OFFSET(PcPrcbLock, KPCR, PrcbLock),
+//OFFSET(PcPrcb, KPCR, Prcb),
+//OFFSET(PcMxCsr, KPCR, MxCsr),
+//OFFSET(PcNumber, KPCR, Number),
+//OFFSET(PcInterruptRequest, KPCR, InterruptRequest),
+//OFFSET(PcIdleHalt, KPCR, IdleHalt),
+//OFFSET(PcCurrentThread, KPCR, CurrentThread),
+//OFFSET(PcNextThread, KPCR, NextThread),
+//OFFSET(PcIdleThread, KPCR, IdleThread),
+//OFFSET(PcIpiFrozen, KPCR, IpiFrozen),
+//OFFSET(PcNestingLevel, KPCR, NestingLevel),
+//OFFSET(PcRspBase, KPCR, RspBase),
+//OFFSET(PcPrcbLock, KPCR, PrcbLock),
+#if 0
 OFFSET(PcSetMember, KPCR, SetMember),
 OFFSET(PcCr0, KPCR, Cr0),
 OFFSET(PcCr2, KPCR, Cr2),
@@ -426,31 +423,32 @@
 OFFSET(PcSkipTick, KPCR, SkipTick),
 OFFSET(PcStartCycles, KPCR, StartCycles),
 SIZE(ProcessorControlRegisterLength, KPCR),
+#endif
 
 HEADER("KPROCESSOR_STATE"),
 OFFSET(PsSpecialRegisters, KPROCESSOR_STATE, SpecialRegisters),
-OFFSET(PsCr0, KPROCESSOR_STATE, Cr0),
-OFFSET(PsCr2, KPROCESSOR_STATE, Cr2),
-OFFSET(PsCr3, KPROCESSOR_STATE, Cr3),
-OFFSET(PsCr4, KPROCESSOR_STATE, Cr4),
-OFFSET(PsKernelDr0, KPROCESSOR_STATE, KernelDr0),
-OFFSET(PsKernelDr1, KPROCESSOR_STATE, KernelDr1),
-OFFSET(PsKernelDr2, KPROCESSOR_STATE, KernelDr2),
-OFFSET(PsKernelDr3, KPROCESSOR_STATE, KernelDr3),
-OFFSET(PsKernelDr6, KPROCESSOR_STATE, KernelDr6),
-OFFSET(PsKernelDr7, KPROCESSOR_STATE, KernelDr7),
-OFFSET(PsGdtr, KPROCESSOR_STATE, Gdtr),
-OFFSET(PsIdtr, KPROCESSOR_STATE, Idtr),
-OFFSET(PsTr, KPROCESSOR_STATE, Tr),
-OFFSET(PsLdtr, KPROCESSOR_STATE, Ldtr),
-OFFSET(PsMxCsr, KPROCESSOR_STATE, MxCsr),
+OFFSET(PsCr0, KPROCESSOR_STATE, SpecialRegisters.Cr0),
+OFFSET(PsCr2, KPROCESSOR_STATE, SpecialRegisters.Cr2),
+OFFSET(PsCr3, KPROCESSOR_STATE, SpecialRegisters.Cr3),
+OFFSET(PsCr4, KPROCESSOR_STATE, SpecialRegisters.Cr4),
+OFFSET(PsKernelDr0, KPROCESSOR_STATE, SpecialRegisters.KernelDr0),
+OFFSET(PsKernelDr1, KPROCESSOR_STATE, SpecialRegisters.KernelDr1),
+OFFSET(PsKernelDr2, KPROCESSOR_STATE, SpecialRegisters.KernelDr2),
+OFFSET(PsKernelDr3, KPROCESSOR_STATE, SpecialRegisters.KernelDr3),
+OFFSET(PsKernelDr6, KPROCESSOR_STATE, SpecialRegisters.KernelDr6),
+OFFSET(PsKernelDr7, KPROCESSOR_STATE, SpecialRegisters.KernelDr7),
+OFFSET(PsGdtr, KPROCESSOR_STATE, SpecialRegisters.Gdtr),
+OFFSET(PsIdtr, KPROCESSOR_STATE, SpecialRegisters.Idtr),
+OFFSET(PsTr, KPROCESSOR_STATE, SpecialRegisters.Tr),
+OFFSET(PsLdtr, KPROCESSOR_STATE, SpecialRegisters.Ldtr),
+OFFSET(PsMxCsr, KPROCESSOR_STATE, SpecialRegisters.MxCsr),
 OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame),
-OFFSET(PsDebugControl, KPROCESSOR_STATE, DebugControl),
-OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, LastBranchToRip),
-OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, LastBranchFromRip),
-OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, LastExceptionToRip),
-OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, LastExceptionFromRip),
-OFFSET(PsCr8, KPROCESSOR_STATE, Cr8),
+OFFSET(PsDebugControl, KPROCESSOR_STATE, SpecialRegisters.DebugControl),
+OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchToRip),
+OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchFromRip),
+OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionToRip),
+OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionFromRip),
+OFFSET(PsCr8, KPROCESSOR_STATE, SpecialRegisters.Cr8),
 SIZE(ProcessorStateLength, KPROCESSOR_STATE),
 
 HEADER("KSTART_FRAME"),
@@ -480,7 +478,7 @@
 OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask),
 
 HEADER("KSYSTEM_TIME"),
-OFFSET(StLowTime, KSYSTEM_TIME, LowTime),
+OFFSET(StLowTime, KSYSTEM_TIME, LowPart),
 OFFSET(StHigh1Time, KSYSTEM_TIME, High1Time),
 OFFSET(StHigh2Time, KSYSTEM_TIME, High2Time),
 
@@ -555,18 +553,18 @@
 
 HEADER("KTIMER_TABLE"),
 OFFSET(TtEntry, KTIMER_TABLE, TimerEntries),
-OFFSET(TtTime, KTIMER_TABLE, Time),
-SIZE(TIMER_ENTRY_SIZE, KTIMER_ENTRY),
+OFFSET(TtTime, KTIMER_TABLE_ENTRY, Time),
+SIZE(TIMER_ENTRY_SIZE, KTIMER_TABLE_ENTRY),
 SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE),
 SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE),
 
 HEADER("KTSS"),
-OFFSET(TssRsp0, TYPE, Rsp0),
-OFFSET(TssRsp1, TYPE, Rsp1),
-OFFSET(TssRsp2, TYPE, Rsp2),
-OFFSET(TssPanicStack, TYPE, PanicStack),
-OFFSET(TssMcaStack, TYPE, McaStack),
-OFFSET(TssNmiStack, TYPE, NmiStack),
-OFFSET(TssIoMapBase, TYPE, IoMapBase),
-SIZE(TssLength, TYPE),
-
+OFFSET(TssRsp0, KTSS64, Rsp0),
+OFFSET(TssRsp1, KTSS64, Rsp1),
+OFFSET(TssRsp2, KTSS64, Rsp2),
+OFFSET(TssPanicStack, KTSS64, Ist[1]),
+OFFSET(TssMcaStack, KTSS64, Ist[2]),
+OFFSET(TssNmiStack, KTSS64, Ist[3]),
+OFFSET(TssIoMapBase, KTSS64, IoMapBase),
+SIZE(TssLength, KTSS64),
+

Modified: branches/cmake-bringup/include/asm/ksx.template.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t…
==============================================================================
--- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Tue Dec 28 01:06:06
2010
@@ -498,9 +498,7 @@
 OFFSET(PrDirectoryTableBase, KPROCESS, DirectoryTableBase),
 #ifdef _M_IX86
 OFFSET(PrLdtDescriptor, KPROCESS, LdtDescriptor),
-#endif
 OFFSET(PrIopmOffset, KPROCESS, IopmOffset),
-#ifdef _M_IX86
 OFFSET(PrInt21Descriptor, KPROCESS, Int21Descriptor),
 OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler),
 //OFFSET(PrVdmObjects, KPROCESS, VdmObjects),