mirror of
https://github.com/reactos/reactos.git
synced 2024-09-28 13:34:53 +00:00
[NDK] Add IMAGE_FILE_MACHINE_NATIVE
[NTOS] Remove IMAGE_FILE_MACHINE_NATIVE and IMAGE_FILE_MACHINE_ARCHITECTURE definitions, use only the former svn path=/trunk/; revision=50098
This commit is contained in:
parent
76ff797dcb
commit
b1730a09db
|
@ -143,6 +143,19 @@ Author:
|
|||
C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF);
|
||||
#endif
|
||||
|
||||
//
|
||||
// Native image architecture
|
||||
//
|
||||
#if defined(_M_IX86)
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386
|
||||
#elif defined(_M_ARM)
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_ARM
|
||||
#elif defined(_M_AMD64)
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64
|
||||
#else
|
||||
#error Define these please!
|
||||
#endif
|
||||
|
||||
//
|
||||
// Registry Keys
|
||||
//
|
||||
|
|
|
@ -1286,8 +1286,8 @@ ExpInitializeExecutive(IN ULONG Cpu,
|
|||
SharedUserData->NtMinorVersion = NtMinorVersion;
|
||||
|
||||
/* Set the machine type */
|
||||
SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARCHITECTURE;
|
||||
SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE;
|
||||
SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE;
|
||||
SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE;
|
||||
}
|
||||
|
||||
VOID
|
||||
|
|
|
@ -75,8 +75,6 @@ extern ULONG KeI386FxsrPresent;
|
|||
extern ULONG KeI386CpuType;
|
||||
extern ULONG KeI386CpuStep;
|
||||
|
||||
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_AMD64
|
||||
|
||||
//
|
||||
// INT3 is 1 byte long
|
||||
//
|
||||
|
|
|
@ -10,8 +10,6 @@
|
|||
#define PCR_ENTRY 0
|
||||
#define PDR_ENTRY 2
|
||||
|
||||
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_ARM
|
||||
|
||||
//
|
||||
// BKPT is 4 bytes long
|
||||
//
|
||||
|
|
|
@ -10,8 +10,6 @@
|
|||
#define DR_MASK(x) (1 << (x))
|
||||
#define DR_REG_MASK 0x4F
|
||||
|
||||
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_I386
|
||||
|
||||
//
|
||||
// INT3 is 1 byte long
|
||||
//
|
||||
|
|
|
@ -35,8 +35,6 @@ typedef struct _KIRQ_TRAPFRAME
|
|||
|
||||
extern ULONG KePPCCacheAlignment;
|
||||
|
||||
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_POWERPC
|
||||
|
||||
//#define KD_BREAKPOINT_TYPE
|
||||
//#define KD_BREAKPOINT_SIZE
|
||||
//#define KD_BREAKPOINT_VALUE
|
||||
|
|
|
@ -378,7 +378,7 @@ DBGKD_GET_VERSION64 KdVersionBlock =
|
|||
#else
|
||||
DBGKD_VERS_FLAG_DATA,
|
||||
#endif
|
||||
IMAGE_FILE_MACHINE_ARCHITECTURE,
|
||||
IMAGE_FILE_MACHINE_NATIVE,
|
||||
PACKET_TYPE_MAX,
|
||||
0,
|
||||
0,
|
||||
|
|
|
@ -85,16 +85,6 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE);
|
|||
#define PTE_COUNT PTE_PER_PAGE
|
||||
#endif
|
||||
|
||||
#ifdef _M_IX86
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_I386
|
||||
#elif _M_ARM
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_ARM
|
||||
#elif _M_AMD64
|
||||
#define IMAGE_FILE_MACHINE_NATIVE IMAGE_FILE_MACHINE_AMD64
|
||||
#else
|
||||
#error Define these please!
|
||||
#endif
|
||||
|
||||
//
|
||||
// Protection Bits part of the internal memory manager Protection Mask
|
||||
// Taken from http://www.reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_kernel
|
||||
|
|
Loading…
Reference in a new issue