[tkreuzer] 49594: [GENINCDATA] - Use 32 bit constants by default and add macros for 64 bit and pointer size. Fixes some constants.

Author: tkreuzer
Date: Mon Nov 15 19:14:56 2010
New Revision: 49594

URL: http://svn.reactos.org/svn/reactos?rev=49594&view=rev
Log:
[GENINCDATA]
- Use 32 bit constants by default and add macros for 64 bit and pointer size. Fixes some constants.

Modified:
    branches/cmake-bringup/include/asm/genincdata.c
    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/geninc...
==============================================================================
--- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Mon Nov 15 19:14:56 2010
@@ -28,7 +28,10 @@
 #define TYPE_HEADER 3

#define RAW(x) {TYPE_RAW, x, 0}
-#define CONSTANT(name) {TYPE_CONSTANT, #name, name > (ULONG)-1 ? (ULONGLONG)name : (ULONG)name}
+#define CONSTANT(name) {TYPE_CONSTANT, #name, (ULONG)name}
+#define CONSTANT64(name) {TYPE_CONSTANT, #name, (ULONGLONG)name}
+#define CONSTANTPTR(name) {TYPE_CONSTANT, #name, (ULONG_PTR)name}
+#define CONSTANTX(name, value) {TYPE_CONSTANT, #name, value}
 #define OFFSET(name, struct, member) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member)}
 #define RELOFFSET(name, struct, member, to) {TYPE_CONSTANT, #name, FIELD_OFFSET(struct, member) - FIELD_OFFSET(struct, to)}
 #define SIZE(name, struct) {TYPE_CONSTANT, #name, sizeof(struct)}

Modified: branches/cmake-bringup/include/asm/ksx.template.h
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.te...
==============================================================================
--- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Mon Nov 15 19:14:56 2010
@@ -32,7 +32,7 @@
 CONSTANT(EXCEPTION_CONTINUE_SEARCH),
 CONSTANT(EXCEPTION_CONTINUE_EXECUTION),
 #ifdef _X86_
-//CONSTANT(EXCEPTION_CHAIN_END),
+CONSTANT(EXCEPTION_CHAIN_END),
 //CONSTANT(FIXED_NTVDMSTATE_LINEAR),
 #endif

@@ -47,7 +47,7 @@
 CONSTANT(LOCK_QUEUE_OWNER),
 CONSTANT(LockQueueDispatcherLock),

-HEADER("Performance Definitions"),
+//HEADER("Performance Definitions"),
 //CONSTANT(PERF_CONTEXTSWAP_OFFSET),
 //CONSTANT(PERF_CONTEXTSWAP_FLAG),
 //CONSTANT(PERF_INTERRUPT_OFFSET),
@@ -138,8 +138,8 @@
 CONSTANT(WaitAll),

HEADER("Interrupt object types"),
-//CONSTANT(InLevelSensitive),
-//CONSTANT(InLatched),
+CONSTANTX(InLevelSensitive, LevelSensitive),
+CONSTANTX(InLatched, Latched),

HEADER("Bug Check Codes"),
 CONSTANT(APC_INDEX_MISMATCH),
@@ -206,7 +206,7 @@
 CONSTANT(NMI_STACK_SIZE),
 #endif

-HEADER("Thread flags"),
+//HEADER("Thread flags"),
 //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING),
 //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK_BIT),
 //CONSTANT(THREAD_FLAGS_CYCLE_PROFILING_LOCK),
@@ -240,7 +240,7 @@
 CONSTANT(FALSE),
 CONSTANT(TRUE),
 CONSTANT(DBG_STATUS_CONTROL_C),
-CONSTANT(USER_SHARED_DATA),
+CONSTANTPTR(USER_SHARED_DATA),
 //CONSTANT(MM_SHARED_USER_DATA_VA),
 CONSTANT(PAGE_SIZE),
 //CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK),
@@ -264,10 +264,10 @@

/* STRUCTURE OFFSETS *********************************************************/

-HEADER("KAFFINITY_EX"),
+//HEADER("KAFFINITY_EX"),
 //OFFSET(AfBitmap, KAFFINITY_EX, Bitmap),

-HEADER("Aligned Affinity"),
+//HEADER("Aligned Affinity"),
 //OFFSET(AfsCpuSet, ???, CpuSet),

HEADER("KAPC"),
@@ -397,14 +397,14 @@
 OFFSET(IoPointer, IO_STATUS_BLOCK, Pointer),
 OFFSET(IoInformation, IO_STATUS_BLOCK, Information),

+//HEADER("KERNEL_STACK_CONTROL"),
 #ifdef _M_IX86
 //  Kernel Stack Control Structure Offset (relative to initial stack pointer) Definitions
-//RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???),
-//RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???),
-//RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???),
-//RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???),
+//RELOFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase, ???), -40
+//RELOFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousBase, ???), -36
+//RELOFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousBase, ???), -32
+//RELOFFSET(KcPreviousInitial, KERNEL_STACK_CONTROL, PreviousBase, ???), -28
 #else
-HEADER("KERNEL_STACK_CONTROL"),
 //OFFSET(KcPreviousBase, KERNEL_STACK_CONTROL, PreviousBase),
 //OFFSET(KcPreviousLimit, KERNEL_STACK_CONTROL, PreviousLimit),
 //OFFSET(KcPreviousKernel, KERNEL_STACK_CONTROL, PreviousKernel),