4 Feb
2010
4 Feb
'10
4:31 a.m.
Author: tkreuzer
Date: Thu Feb 4 05:31:02 2010
New Revision: 45408
URL: http://svn.reactos.org/svn/reactos?rev=45408&view=rev
Log:
[NDK]
- fix KGDT64 names
- make asm.h masm/ml compatible by using a HEX macro, that converts constants into either
0xAA or 0AAh format
Modified:
branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h
branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h
Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Thu Feb 4
05:31:02 2010
@@ -18,270 +18,279 @@
#ifndef _ASM_AMD64_H
#define _ASM_AMD64_H
+#ifndef HEX
+ #ifdef MSC_VER
+ #define HEX(x) x##h
+ #else
+ #define HEX(x) 0x0##x
+ #endif
+#endif
#define SIZEOF_FX_SAVE_AREA 528 // HACK
//
// CPU Modes
//
-#define KernelMode 0x0
-#define UserMode 0x1
+#define KernelMode HEX(0)
+#define UserMode HEX(1)
//
// CPU Types
//
-#define CPU_INTEL 0x1
-#define CPU_AMD 0x2
+#define CPU_INTEL HEX(1)
+#define CPU_AMD HEX(2)
//
// KTSS Offsets
//
-#define KTSS64_RSP0 0x04
-#define KTSS64_RSP1 0x0c
-#define KTSS64_RSP2 0x14
-#define KTSS64_IST 0x1c
-#define KTSS64_IO_MAP_BASE 0x66
+#define KTSS64_RSP0 HEX(04)
+#define KTSS64_RSP1 HEX(0c)
+#define KTSS64_RSP2 HEX(14)
+#define KTSS64_IST HEX(1c)
+#define KTSS64_IO_MAP_BASE HEX(66)
//
// KTHREAD Offsets
//
-#define KTHREAD_DEBUG_ACTIVE 0x03
-#define KTHREAD_INITIAL_STACK 0x28
-#define KTHREAD_STACK_LIMIT 0x30
-#define KTHREAD_WAIT_IRQL 0x156
+#define KTHREAD_DEBUG_ACTIVE HEX(03)
+#define KTHREAD_INITIAL_STACK HEX(28)
+#define KTHREAD_STACK_LIMIT HEX(30)
+#define KTHREAD_WAIT_IRQL HEX(156)
//
// KPRCB Offsets
//
-#define KPRCB_CurrentThread 0x08
+#define KPRCB_CurrentThread HEX(08)
//
// KPCR Offsets
//
-#define KPCR_TSS_BASE 0x08
-#define KPCR_SELF 0x18
-#define KPCR_STALL_SCALE_FACTOR 0x64
-#define KPCR_PRCB 0x180
+#define KPCR_TSS_BASE HEX(08)
+#define KPCR_SELF HEX(18)
+#define KPCR_STALL_SCALE_FACTOR HEX(64)
+#define KPCR_PRCB HEX(180
//
// KTRAP_FRAME Offsets
//
-#define KTRAP_FRAME_P1Home 0x00
-#define KTRAP_FRAME_P2Home 0x08
-#define KTRAP_FRAME_P3Home 0x10
-#define KTRAP_FRAME_P4Home 0x18
-#define KTRAP_FRAME_P5 0x20
-#define KTRAP_FRAME_PreviousMode 0x28
-#define KTRAP_FRAME_PreviousIrql 0x29
-#define KTRAP_FRAME_FaultIndicator 0x2A
-#define KTRAP_FRAME_ExceptionActive 0x2B
-#define KTRAP_FRAME_MxCsr 0x2C
-#define KTRAP_FRAME_Rax 0x30
-#define KTRAP_FRAME_Rcx 0x38
-#define KTRAP_FRAME_Rdx 0x40
-#define KTRAP_FRAME_R8 0x48
-#define KTRAP_FRAME_R9 0x50
-#define KTRAP_FRAME_R10 0x58
-#define KTRAP_FRAME_R11 0x60
-#define KTRAP_FRAME_GsBase 0x68
-#define KTRAP_FRAME_Xmm0 0x70
-#define KTRAP_FRAME_Xmm1 0x80
-#define KTRAP_FRAME_Xmm2 0x90
-#define KTRAP_FRAME_Xmm3 0xA0
-#define KTRAP_FRAME_Xmm4 0xB0
-#define KTRAP_FRAME_Xmm5 0xC0
-#define KTRAP_FRAME_FaultAddress 0xD0
-#define KTRAP_FRAME_Dr0 0xD8
-#define KTRAP_FRAME_Dr1 0xE0
-#define KTRAP_FRAME_Dr2 0xE8
-#define KTRAP_FRAME_Dr3 0xF0
-#define KTRAP_FRAME_Dr6 0xF8
-#define KTRAP_FRAME_Dr7 0x100
-#define KTRAP_FRAME_DebugControl 0x108
-#define KTRAP_FRAME_LastBranchToRip 0x110
-#define KTRAP_FRAME_LastBranchFromRip 0x118
-#define KTRAP_FRAME_LastExceptionToRip 0x120
-#define KTRAP_FRAME_LastExceptionFromRip 0x128
-#define KTRAP_FRAME_SegDs 0x130
-#define KTRAP_FRAME_SegEs 0x132
-#define KTRAP_FRAME_SegFs 0x134
-#define KTRAP_FRAME_SegGs 0x136
-#define KTRAP_FRAME_TrapFrame 0x138
-#define KTRAP_FRAME_Rbx 0x140
-#define KTRAP_FRAME_Rdi 0x148
-#define KTRAP_FRAME_Rsi 0x150
-#define KTRAP_FRAME_Rbp 0x158
-#define KTRAP_FRAME_ErrorCode 0x160
-#define KTRAP_FRAME_Rip 0x168
-#define KTRAP_FRAME_SegCs 0x170
-#define KTRAP_FRAME_Logging 0x173
-#define KTRAP_FRAME_EFlags 0x178
-#define KTRAP_FRAME_Rsp 0x180
-#define KTRAP_FRAME_SegSs 0x188
-#define KTRAP_FRAME_CodePatchCycle 0x18c
-#define SIZE_KTRAP_FRAME 0x190
-#define KTRAP_FRAME_ALIGN 0x10
-#define KTRAP_FRAME_LENGTH 0x190
+#define KTRAP_FRAME_P1Home HEX(00)
+#define KTRAP_FRAME_P2Home HEX(08)
+#define KTRAP_FRAME_P3Home HEX(10)
+#define KTRAP_FRAME_P4Home HEX(18)
+#define KTRAP_FRAME_P5 HEX(20)
+#define KTRAP_FRAME_PreviousMode HEX(28)
+#define KTRAP_FRAME_PreviousIrql HEX(29)
+#define KTRAP_FRAME_FaultIndicator HEX(2A)
+#define KTRAP_FRAME_ExceptionActive HEX(2B)
+#define KTRAP_FRAME_MxCsr HEX(2C)
+#define KTRAP_FRAME_Rax HEX(30)
+#define KTRAP_FRAME_Rcx HEX(38)
+#define KTRAP_FRAME_Rdx HEX(40)
+#define KTRAP_FRAME_R8 HEX(48)
+#define KTRAP_FRAME_R9 HEX(50)
+#define KTRAP_FRAME_R10 HEX(58)
+#define KTRAP_FRAME_R11 HEX(60)
+#define KTRAP_FRAME_GsBase HEX(68)
+#define KTRAP_FRAME_Xmm0 HEX(70)
+#define KTRAP_FRAME_Xmm1 HEX(80)
+#define KTRAP_FRAME_Xmm2 HEX(90)
+#define KTRAP_FRAME_Xmm3 HEX(A0)
+#define KTRAP_FRAME_Xmm4 HEX(B0)
+#define KTRAP_FRAME_Xmm5 HEX(C0)
+#define KTRAP_FRAME_FaultAddress HEX(D0)
+#define KTRAP_FRAME_Dr0 HEX(D8)
+#define KTRAP_FRAME_Dr1 HEX(E0)
+#define KTRAP_FRAME_Dr2 HEX(E8)
+#define KTRAP_FRAME_Dr3 HEX(F0)
+#define KTRAP_FRAME_Dr6 HEX(F8)
+#define KTRAP_FRAME_Dr7 HEX(100)
+#define KTRAP_FRAME_DebugControl HEX(108)
+#define KTRAP_FRAME_LastBranchToRip HEX(110)
+#define KTRAP_FRAME_LastBranchFromRip HEX(118)
+#define KTRAP_FRAME_LastExceptionToRip HEX(120)
+#define KTRAP_FRAME_LastExceptionFromRip HEX(128)
+#define KTRAP_FRAME_SegDs HEX(130)
+#define KTRAP_FRAME_SegEs HEX(132)
+#define KTRAP_FRAME_SegFs HEX(134)
+#define KTRAP_FRAME_SegGs HEX(136)
+#define KTRAP_FRAME_TrapFrame HEX(138)
+#define KTRAP_FRAME_Rbx HEX(140)
+#define KTRAP_FRAME_Rdi HEX(148)
+#define KTRAP_FRAME_Rsi HEX(150)
+#define KTRAP_FRAME_Rbp HEX(158)
+#define KTRAP_FRAME_ErrorCode HEX(160)
+#define KTRAP_FRAME_Rip HEX(168)
+#define KTRAP_FRAME_SegCs HEX(170)
+#define KTRAP_FRAME_Logging HEX(173)
+#define KTRAP_FRAME_EFlags HEX(178)
+#define KTRAP_FRAME_Rsp HEX(180)
+#define KTRAP_FRAME_SegSs HEX(188)
+#define KTRAP_FRAME_CodePatchCycle HEX(18c)
+#define SIZE_KTRAP_FRAME HEX(190)
+#define KTRAP_FRAME_ALIGN HEX(10)
+#define KTRAP_FRAME_LENGTH HEX(190)
//
// CONTEXT Offsets
//
#define CONTEXT_P1Home 0
-#define CONTEXT_P2Home 0x08
-#define CONTEXT_P3Home 0x10
-#define CONTEXT_P4Home 0x18
-#define CONTEXT_P5Home 0x20
-#define CONTEXT_P6Home 0x28
-#define CONTEXT_ContextFlags 0x30
-#define CONTEXT_MxCsr 0x34
-#define CONTEXT_SegCs 0x38
-#define CONTEXT_SegDs 0x3a
-#define CONTEXT_SegEs 0x3c
-#define CONTEXT_SegFs 0x3e
-#define CONTEXT_SegGs 0x40
-#define CONTEXT_SegSs 0x42
-#define CONTEXT_EFlags 0x44
-#define CONTEXT_Dr0 0x48
-#define CONTEXT_Dr1 0x50
-#define CONTEXT_Dr2 0x58
-#define CONTEXT_Dr3 0x60
-#define CONTEXT_Dr6 0x68
-#define CONTEXT_Dr7 0x70
-#define CONTEXT_Rax 0x78
-#define CONTEXT_Rcx 0x80
-#define CONTEXT_Rdx 0x88
-#define CONTEXT_Rbx 0x90
-#define CONTEXT_Rsp 0x98
-#define CONTEXT_Rbp 0xa0
-#define CONTEXT_Rsi 0xa8
-#define CONTEXT_Rdi 0xb0
-#define CONTEXT_R8 0xb8
-#define CONTEXT_R9 0xc0
-#define CONTEXT_R10 0xc8
-#define CONTEXT_R11 0xd0
-#define CONTEXT_R12 0xd8
-#define CONTEXT_R13 0xe0
-#define CONTEXT_R14 0xe8
-#define CONTEXT_R15 0xf0
-#define CONTEXT_Rip 0xf8
-#define CONTEXT_Header 0x100
-#define CONTEXT_Legacy 0x120
-#define CONTEXT_Xmm0 0x1a0
-#define CONTEXT_Xmm1 0x1b0
-#define CONTEXT_Xmm2 0x1c0
-#define CONTEXT_Xmm3 0x1d0
-#define CONTEXT_Xmm4 0x1e0
-#define CONTEXT_Xmm5 0x1f0
-#define CONTEXT_Xmm6 0x200
-#define CONTEXT_Xmm7 0x210
-#define CONTEXT_Xmm8 0x220
-#define CONTEXT_Xmm9 0x230
-#define CONTEXT_Xmm10 0x240
-#define CONTEXT_Xmm11 0x250
-#define CONTEXT_Xmm12 0x260
-#define CONTEXT_Xmm13 0x270
-#define CONTEXT_Xmm14 0x280
-#define CONTEXT_Xmm15 0x290
-#define CONTEXT_VectorRegister 0x300
-#define CONTEXT_VectorControl 0x4a0
-#define CONTEXT_DebugControl 0x4a8
-#define CONTEXT_LastBranchToRip 0x4b0
-#define CONTEXT_LastBranchFromRip 0x4b8
-#define CONTEXT_LastExceptionToRip 0x4c0
-#define CONTEXT_LastExceptionFromRip 0x4c8
+#define CONTEXT_P2Home HEX(08)
+#define CONTEXT_P3Home HEX(10)
+#define CONTEXT_P4Home HEX(18)
+#define CONTEXT_P5Home HEX(20)
+#define CONTEXT_P6Home HEX(28)
+#define CONTEXT_ContextFlags HEX(30)
+#define CONTEXT_MxCsr HEX(34)
+#define CONTEXT_SegCs HEX(38)
+#define CONTEXT_SegDs HEX(3a)
+#define CONTEXT_SegEs HEX(3c)
+#define CONTEXT_SegFs HEX(3e)
+#define CONTEXT_SegGs HEX(40)
+#define CONTEXT_SegSs HEX(42)
+#define CONTEXT_EFlags HEX(44)
+#define CONTEXT_Dr0 HEX(48)
+#define CONTEXT_Dr1 HEX(50)
+#define CONTEXT_Dr2 HEX(58)
+#define CONTEXT_Dr3 HEX(60)
+#define CONTEXT_Dr6 HEX(68)
+#define CONTEXT_Dr7 HEX(70)
+#define CONTEXT_Rax HEX(78)
+#define CONTEXT_Rcx HEX(80)
+#define CONTEXT_Rdx HEX(88)
+#define CONTEXT_Rbx HEX(90)
+#define CONTEXT_Rsp HEX(98)
+#define CONTEXT_Rbp HEX(a0)
+#define CONTEXT_Rsi HEX(a8)
+#define CONTEXT_Rdi HEX(b0)
+#define CONTEXT_R8 HEX(b8)
+#define CONTEXT_R9 HEX(c0)
+#define CONTEXT_R10 HEX(c8)
+#define CONTEXT_R11 HEX(d0)
+#define CONTEXT_R12 HEX(d8)
+#define CONTEXT_R13 HEX(e0)
+#define CONTEXT_R14 HEX(e8)
+#define CONTEXT_R15 HEX(f0)
+#define CONTEXT_Rip HEX(f8)
+#define CONTEXT_Header HEX(100)
+#define CONTEXT_Legacy HEX(120)
+#define CONTEXT_Xmm0 HEX(1a0)
+#define CONTEXT_Xmm1 HEX(1b0)
+#define CONTEXT_Xmm2 HEX(1c0)
+#define CONTEXT_Xmm3 HEX(1d0)
+#define CONTEXT_Xmm4 HEX(1e0)
+#define CONTEXT_Xmm5 HEX(1f0)
+#define CONTEXT_Xmm6 HEX(200)
+#define CONTEXT_Xmm7 HEX(210)
+#define CONTEXT_Xmm8 HEX(220)
+#define CONTEXT_Xmm9 HEX(230)
+#define CONTEXT_Xmm10 HEX(240)
+#define CONTEXT_Xmm11 HEX(250)
+#define CONTEXT_Xmm12 HEX(260)
+#define CONTEXT_Xmm13 HEX(270)
+#define CONTEXT_Xmm14 HEX(280)
+#define CONTEXT_Xmm15 HEX(290)
+#define CONTEXT_VectorRegister HEX(300)
+#define CONTEXT_VectorControl HEX(4a0)
+#define CONTEXT_DebugControl HEX(4a8)
+#define CONTEXT_LastBranchToRip HEX(4b0)
+#define CONTEXT_LastBranchFromRip HEX(4b8)
+#define CONTEXT_LastExceptionToRip HEX(4c0)
+#define CONTEXT_LastExceptionFromRip HEX(4c8)
//
// KEXCEPTION_FRAME offsets
//
-#define KEXCEPTION_FRAME_P1Home 0x000
-#define KEXCEPTION_FRAME_P2Home 0x008
-#define KEXCEPTION_FRAME_P3Home 0x010
-#define KEXCEPTION_FRAME_P4Home 0x018
-#define KEXCEPTION_FRAME_P5 0x020
-#define KEXCEPTION_FRAME_InitialStack 0x028
-#define KEXCEPTION_FRAME_Xmm6 0x030
-#define KEXCEPTION_FRAME_Xmm7 0x040
-#define KEXCEPTION_FRAME_Xmm8 0x050
-#define KEXCEPTION_FRAME_Xmm9 0x060
-#define KEXCEPTION_FRAME_Xmm10 0x070
-#define KEXCEPTION_FRAME_Xmm11 0x080
-#define KEXCEPTION_FRAME_Xmm12 0x090
-#define KEXCEPTION_FRAME_Xmm13 0x0A0
-#define KEXCEPTION_FRAME_Xmm14 0x0B0
-#define KEXCEPTION_FRAME_Xmm15 0x0C0
-#define KEXCEPTION_FRAME_TrapFrame 0x0D0
-#define KEXCEPTION_FRAME_CallbackStack 0x0D8
-#define KEXCEPTION_FRAME_OutputBuffer 0x0E0
-#define KEXCEPTION_FRAME_OutputLength 0x0E8
-#define KEXCEPTION_FRAME_MxCsr 0x0F0
-#define KEXCEPTION_FRAME_Rbp 0x0F8
-#define KEXCEPTION_FRAME_Rbx 0x100
-#define KEXCEPTION_FRAME_Rdi 0x108
-#define KEXCEPTION_FRAME_Rsi 0x110
-#define KEXCEPTION_FRAME_R12 0x118
-#define KEXCEPTION_FRAME_R13 0x120
-#define KEXCEPTION_FRAME_R14 0x128
-#define KEXCEPTION_FRAME_R15 0x130
-#define KEXCEPTION_FRAME_Return 0x138
-#define SIZE_KEXCEPTION_FRAME 0x140
+#define KEXCEPTION_FRAME_P1Home HEX(000)
+#define KEXCEPTION_FRAME_P2Home HEX(008)
+#define KEXCEPTION_FRAME_P3Home HEX(010)
+#define KEXCEPTION_FRAME_P4Home HEX(018)
+#define KEXCEPTION_FRAME_P5 HEX(020)
+#define KEXCEPTION_FRAME_InitialStack HEX(028)
+#define KEXCEPTION_FRAME_Xmm6 HEX(030)
+#define KEXCEPTION_FRAME_Xmm7 HEX(040)
+#define KEXCEPTION_FRAME_Xmm8 HEX(050)
+#define KEXCEPTION_FRAME_Xmm9 HEX(060)
+#define KEXCEPTION_FRAME_Xmm10 HEX(070)
+#define KEXCEPTION_FRAME_Xmm11 HEX(080)
+#define KEXCEPTION_FRAME_Xmm12 HEX(090)
+#define KEXCEPTION_FRAME_Xmm13 HEX(0A0)
+#define KEXCEPTION_FRAME_Xmm14 HEX(0B0)
+#define KEXCEPTION_FRAME_Xmm15 HEX(0C0)
+#define KEXCEPTION_FRAME_TrapFrame HEX(0D0)
+#define KEXCEPTION_FRAME_CallbackStack HEX(0D8)
+#define KEXCEPTION_FRAME_OutputBuffer HEX(0E0)
+#define KEXCEPTION_FRAME_OutputLength HEX(0E8)
+#define KEXCEPTION_FRAME_MxCsr HEX(0F0)
+#define KEXCEPTION_FRAME_Rbp HEX(0F8)
+#define KEXCEPTION_FRAME_Rbx HEX(100)
+#define KEXCEPTION_FRAME_Rdi HEX(108)
+#define KEXCEPTION_FRAME_Rsi HEX(110)
+#define KEXCEPTION_FRAME_R12 HEX(118)
+#define KEXCEPTION_FRAME_R13 HEX(120)
+#define KEXCEPTION_FRAME_R14 HEX(128)
+#define KEXCEPTION_FRAME_R15 HEX(130)
+#define KEXCEPTION_FRAME_Return HEX(138)
+#define SIZE_KEXCEPTION_FRAME HEX(140)
//
// EXCEPTION_RECORD Offsets
//
-#define EXCEPTION_RECORD_ExceptionCode 0x00
-#define EXCEPTION_RECORD_ExceptionFlags 0x04
-#define EXCEPTION_RECORD_ExceptionRecord 0x08
-#define EXCEPTION_RECORD_ExceptionAddress 0x10
-#define EXCEPTION_RECORD_NumberParameters 0x18
-#define EXCEPTION_RECORD_ExceptionInformation 0x20
-#define SIZE_EXCEPTION_RECORD 0x98
+#define EXCEPTION_RECORD_ExceptionCode HEX(00)
+#define EXCEPTION_RECORD_ExceptionFlags HEX(04)
+#define EXCEPTION_RECORD_ExceptionRecord HEX(08)
+#define EXCEPTION_RECORD_ExceptionAddress HEX(10)
+#define EXCEPTION_RECORD_NumberParameters HEX(18)
+#define EXCEPTION_RECORD_ExceptionInformation HEX(20)
+#define SIZE_EXCEPTION_RECORD HEX(98)
//
// CR0
//
-#define CR0_PE 0x1
-#define CR0_MP 0x2
-#define CR0_EM 0x4
-#define CR0_TS 0x8
-#define CR0_ET 0x10
-#define CR0_NE 0x20
-#define CR0_WP 0x10000
-#define CR0_AM 0x40000
-#define CR0_NW 0x20000000
-#define CR0_CD 0x40000000
-#define CR0_PG 0x80000000
-
+#define CR0_PE HEX(1)
+#define CR0_MP HEX(2)
+#define CR0_EM HEX(4)
+#define CR0_TS HEX(8)
+#define CR0_ET HEX(10)
+#define CR0_NE HEX(20)
+#define CR0_WP HEX(10000)
+#define CR0_AM HEX(40000)
+#define CR0_NW HEX(20000000)
+#define CR0_CD HEX(40000000)
+#define CR0_PG HEX(80000000)
+
+#ifdef _ASM_
//
// CR4
//
-#define CR4_VME 0x1
-#define CR4_PVI 0x2
-#define CR4_TSD 0x4
-#define CR4_DE 0x8
-#define CR4_PSE 0x10
-#define CR4_PAE 0x20
-#define CR4_MCE 0x40
-#define CR4_PGE 0x80
-#define CR4_FXSR 0x200
-#define CR4_XMMEXCPT 0x400
+#define CR4_VME HEX(1)
+#define CR4_PVI HEX(2)
+#define CR4_TSD HEX(4)
+#define CR4_DE HEX(8)
+#define CR4_PSE HEX(10)
+#define CR4_PAE HEX(20)
+#define CR4_MCE HEX(40)
+#define CR4_PGE HEX(80)
+#define CR4_FXSR HEX(200)
+#define CR4_XMMEXCPT HEX(400)
+#endif
//
// Generic Definitions
//
-#define PRIMARY_VECTOR_BASE 0x30
-#define MAXIMUM_IDTVECTOR 0xFF
+#define PRIMARY_VECTOR_BASE HEX(30)
+#define MAXIMUM_IDTVECTOR HEX(FF)
//
// Usermode callout frame definitions
//
-#define CBSTACK_STACK 0x0
-#define CBSTACK_TRAP_FRAME 0x8
-#define CBSTACK_CALLBACK_STACK 0x10
-#define CBSTACK_RBP 0x18
-#define CBSTACK_RESULT 0x20
-#define CBSTACK_RESULT_LENGTH 0x28
+#define CBSTACK_STACK HEX(0)
+#define CBSTACK_TRAP_FRAME HEX(8)
+#define CBSTACK_CALLBACK_STACK HEX(10)
+#define CBSTACK_RBP HEX(18)
+#define CBSTACK_RESULT HEX(20)
+#define CBSTACK_RESULT_LENGTH HEX(28)
/* Following ones are ASM only! ***********************************************/
@@ -296,80 +305,80 @@
//
// EFLAGS
//
-#define EFLAGS_TF 0x100
-#define EFLAGS_INTERRUPT_MASK 0x200
-#define EFLAGS_NESTED_TASK 0x4000
-#define EFLAGS_V86_MASK 0x20000
-#define EFLAGS_ALIGN_CHECK 0x40000
-#define EFLAGS_VIF 0x80000
-#define EFLAGS_VIP 0x100000
-#define EFLAG_SIGN 0x8000
-#define EFLAG_ZERO 0x4000
+#define EFLAGS_TF HEX(100)
+#define EFLAGS_INTERRUPT_MASK HEX(200)
+#define EFLAGS_NESTED_TASK HEX(4000)
+#define EFLAGS_V86_MASK HEX(20000)
+#define EFLAGS_ALIGN_CHECK HEX(40000)
+#define EFLAGS_VIF HEX(80000)
+#define EFLAGS_VIP HEX(100000)
+#define EFLAG_SIGN HEX(8000)
+#define EFLAG_ZERO HEX(4000)
#define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO)
-#define EFLAGS_USER_SANITIZE 0x3F4DD7
+#define EFLAGS_USER_SANITIZE HEX(3F4DD7)
//
// Exception codes
//
-#define EXCEPTION_DIVIDED_BY_ZERO 0x00000
-#define EXCEPTION_DEBUG 0x00001
-#define EXCEPTION_NMI 0x00002
-#define EXCEPTION_INT3 0x00003
-#define EXCEPTION_BOUND_CHECK 0x00005
-#define EXCEPTION_INVALID_OPCODE 0x00006
-#define EXCEPTION_NPX_NOT_AVAILABLE 0x00007
-#define EXCEPTION_DOUBLE_FAULT 0x00008
-#define EXCEPTION_NPX_OVERRUN 0x00009
-#define EXCEPTION_INVALID_TSS 0x0000A
-#define EXCEPTION_SEGMENT_NOT_PRESENT 0x0000B
-#define EXCEPTION_STACK_FAULT 0x0000C
-#define EXCEPTION_GP_FAULT 0x0000D
-#define EXCEPTION_RESERVED_TRAP 0x0000F
-#define EXCEPTION_NPX_ERROR 0x00010
-#define EXCEPTION_ALIGNMENT_CHECK 0x00011
+#define EXCEPTION_DIVIDED_BY_ZERO HEX(00000)
+#define EXCEPTION_DEBUG HEX(00001)
+#define EXCEPTION_NMI HEX(00002)
+#define EXCEPTION_INT3 HEX(00003)
+#define EXCEPTION_BOUND_CHECK HEX(00005)
+#define EXCEPTION_INVALID_OPCODE HEX(00006)
+#define EXCEPTION_NPX_NOT_AVAILABLE HEX(00007)
+#define EXCEPTION_DOUBLE_FAULT HEX(00008)
+#define EXCEPTION_NPX_OVERRUN HEX(00009)
+#define EXCEPTION_INVALID_TSS HEX(0000A)
+#define EXCEPTION_SEGMENT_NOT_PRESENT HEX(0000B)
+#define EXCEPTION_STACK_FAULT HEX(0000C)
+#define EXCEPTION_GP_FAULT HEX(0000D)
+#define EXCEPTION_RESERVED_TRAP HEX(0000F)
+#define EXCEPTION_NPX_ERROR HEX(00010)
+#define EXCEPTION_ALIGNMENT_CHECK HEX(00011)
//
// NTSTATUS values
//
-#define STATUS_ACCESS_VIOLATION 0xC0000005
-#define STATUS_IN_PAGE_ERROR 0xC0000006
-#define STATUS_GUARD_PAGE_VIOLATION 0x80000001
-#define STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
-#define STATUS_STACK_OVERFLOW 0xC00000FD
-#define KI_EXCEPTION_ACCESS_VIOLATION 0x10000004
-#define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C
-#define STATUS_NO_CALLBACK_ACTIVE 0xC0000258
-#define STATUS_CALLBACK_POP_STACK 0xC0000423
-#define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C
-#define STATUS_ILLEGAL_INSTRUCTION 0xC000001D
-#define STATUS_INVALID_LOCK_SEQUENCE 0xC000001E
-#define STATUS_BREAKPOINT 0x80000003
-#define STATUS_SINGLE_STEP 0x80000004
-#define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
-#define STATUS_INTEGER_OVERFLOW 0xC0000095
-#define STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D
-#define STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008E
-#define STATUS_FLOAT_INEXACT_RESULT 0xC000008F
-#define STATUS_FLOAT_INVALID_OPERATION 0xC0000090
-#define STATUS_FLOAT_OVERFLOW 0xC0000091
-#define STATUS_FLOAT_STACK_CHECK 0xC0000092
-#define STATUS_FLOAT_UNDERFLOW 0xC0000093
-#define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4
-#define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5
-#define STATUS_ASSERTION_FAILURE 0xC0000420
+#define STATUS_ACCESS_VIOLATION HEX(C0000005)
+#define STATUS_IN_PAGE_ERROR HEX(C0000006)
+#define STATUS_GUARD_PAGE_VIOLATION HEX(80000001)
+#define STATUS_PRIVILEGED_INSTRUCTION HEX(C0000096)
+#define STATUS_STACK_OVERFLOW HEX(C00000FD)
+#define KI_EXCEPTION_ACCESS_VIOLATION HEX(10000004)
+#define STATUS_INVALID_SYSTEM_SERVICE HEX(C000001C)
+#define STATUS_NO_CALLBACK_ACTIVE HEX(C0000258)
+#define STATUS_CALLBACK_POP_STACK HEX(C0000423)
+#define STATUS_ARRAY_BOUNDS_EXCEEDED HEX(C000008C)
+#define STATUS_ILLEGAL_INSTRUCTION HEX(C000001D)
+#define STATUS_INVALID_LOCK_SEQUENCE HEX(C000001E)
+#define STATUS_BREAKPOINT HEX(80000003)
+#define STATUS_SINGLE_STEP HEX(80000004)
+#define STATUS_INTEGER_DIVIDE_BY_ZERO HEX(C0000094)
+#define STATUS_INTEGER_OVERFLOW HEX(C0000095)
+#define STATUS_FLOAT_DENORMAL_OPERAND HEX(C000008D)
+#define STATUS_FLOAT_DIVIDE_BY_ZERO HEX(C000008E)
+#define STATUS_FLOAT_INEXACT_RESULT HEX(C000008F)
+#define STATUS_FLOAT_INVALID_OPERATION HEX(C0000090)
+#define STATUS_FLOAT_OVERFLOW HEX(C0000091)
+#define STATUS_FLOAT_STACK_CHECK HEX(C0000092)
+#define STATUS_FLOAT_UNDERFLOW HEX(C0000093)
+#define STATUS_FLOAT_MULTIPLE_FAULTS HEX(C00002B4)
+#define STATUS_FLOAT_MULTIPLE_TRAPS HEX(C00002B5)
+#define STATUS_ASSERTION_FAILURE HEX(C0000420)
//
// Bugcheck Codes
//
-#define APC_INDEX_MISMATCH 0x01
-#define IRQL_NOT_GREATER_OR_EQUAL 0x09
-#define IRQL_NOT_LESS_OR_EQUAL 0x0A
-#define TRAP_CAUSE_UNKNOWN 0x12
-#define KMODE_EXCEPTION_NOT_HANDLED 0x13
-#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A
-#define UNEXPECTED_KERNEL_MODE_TRAP 0x7F
-#define ATTEMPTED_SWITCH_FROM_DPC 0xB8
-#define HARDWARE_INTERRUPT_STORM 0xF2
+#define APC_INDEX_MISMATCH HEX(01)
+#define IRQL_NOT_GREATER_OR_EQUAL HEX(09)
+#define IRQL_NOT_LESS_OR_EQUAL HEX(0A)
+#define TRAP_CAUSE_UNKNOWN HEX(12)
+#define KMODE_EXCEPTION_NOT_HANDLED HEX(13)
+#define IRQL_GT_ZERO_AT_SYSTEM_SERVICE HEX(4A)
+#define UNEXPECTED_KERNEL_MODE_TRAP HEX(7F)
+#define ATTEMPTED_SWITCH_FROM_DPC HEX(B8)
+#define HARDWARE_INTERRUPT_STORM HEX(F2)
//
// IRQL Levels
@@ -387,24 +396,24 @@
//
// Quantum Decrements
//
-#define CLOCK_QUANTUM_DECREMENT 0x3
+#define CLOCK_QUANTUM_DECREMENT HEX(3)
//
// Machine types
//
-#define MACHINE_TYPE_ISA 0x0000
-#define MACHINE_TYPE_EISA 0x0001
-#define MACHINE_TYPE_MCA 0x0002
+#define MACHINE_TYPE_ISA HEX(0000)
+#define MACHINE_TYPE_EISA HEX(0001)
+#define MACHINE_TYPE_MCA HEX(0002)
//
// Kernel Feature Bits
//
-#define KF_RDTSC 0x00000002
+#define KF_RDTSC HEX(00000002)
//
// Kernel Stack Size
//
-#define KERNEL_STACK_SIZE 0x6000
+#define KERNEL_STACK_SIZE HEX(6000)
#endif // __ASM__
Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Feb 4
05:31:02 2010
@@ -58,12 +58,14 @@
//
#define RPL_MASK 0x0003
#define MODE_MASK 0x0001
-#define KGDT_64_R0_CODE 0x0010
-#define KGDT_64_R0_SS 0x0018
-#define KGDT_64_DATA 0x0028 // 2b
-#define KGDT_64_R3_CODE 0x0030 // 33
-#define KGDT_TSS 0x0040
-#define KGDT_32_R3_TEB 0x0050 // 53
+#define KGDT64_NULL 0x0000
+#define KGDT64_R0_CODE 0x0010
+#define KGDT64_R0_DATA 0x0018
+#define KGDT64_R3_CMCODE 0x0020
+#define KGDT64_R3_DATA 0x0028
+#define KGDT64_R3_CODE 0x0030
+#define KGDT64_SYS_TSS 0x0040
+#define KGDT64_R3_CMTEB 0x0050
//
// CR4