Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NDK] Add IMAGE_FILE_MACHINE_NATIVE

Browse source 
[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:
Timo Kreuzer 2010-12-22 16:14:58 +00:00
parent 76ff797dcb
commit b1730a09db
8 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/include/ndk/rtltypes.h
View file

@ -143,6 +143,19 @@ Author:
C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF);
#endif #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 // Registry Keys
// //

4
reactos/ntoskrnl/ex/init.c
View file

@ -1286,8 +1286,8 @@ ExpInitializeExecutive(IN ULONG Cpu,
SharedUserData->NtMinorVersion = NtMinorVersion; SharedUserData->NtMinorVersion = NtMinorVersion;
/* Set the machine type */ /* Set the machine type */
SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARCHITECTURE; SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE;
SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE;
} }
VOID VOID

2
reactos/ntoskrnl/include/internal/amd64/ke.h
View file

@ -75,8 +75,6 @@ extern ULONG KeI386FxsrPresent;
extern ULONG KeI386CpuType; extern ULONG KeI386CpuType;
extern ULONG KeI386CpuStep; extern ULONG KeI386CpuStep;
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_AMD64
// //
// INT3 is 1 byte long // INT3 is 1 byte long
// //

2
reactos/ntoskrnl/include/internal/arm/ke.h
View file

@ -10,8 +10,6 @@
#define PCR_ENTRY 0 #define PCR_ENTRY 0
#define PDR_ENTRY 2 #define PDR_ENTRY 2
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_ARM
// //
// BKPT is 4 bytes long // BKPT is 4 bytes long
// //

2
reactos/ntoskrnl/include/internal/i386/ke.h
View file

@ -10,8 +10,6 @@
#define DR_MASK(x) (1 << (x)) #define DR_MASK(x) (1 << (x))
#define DR_REG_MASK 0x4F #define DR_REG_MASK 0x4F
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_I386
// //
// INT3 is 1 byte long // INT3 is 1 byte long
// //

2
reactos/ntoskrnl/include/internal/powerpc/ke.h
View file

@ -35,8 +35,6 @@ typedef struct _KIRQ_TRAPFRAME
extern ULONG KePPCCacheAlignment; extern ULONG KePPCCacheAlignment;
#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_POWERPC
//#define KD_BREAKPOINT_TYPE //#define KD_BREAKPOINT_TYPE
//#define KD_BREAKPOINT_SIZE //#define KD_BREAKPOINT_SIZE
//#define KD_BREAKPOINT_VALUE //#define KD_BREAKPOINT_VALUE

2
reactos/ntoskrnl/kd64/kddata.c
View file

@ -378,7 +378,7 @@ DBGKD_GET_VERSION64 KdVersionBlock =
#else #else
DBGKD_VERS_FLAG_DATA, DBGKD_VERS_FLAG_DATA,
#endif #endif
IMAGE_FILE_MACHINE_ARCHITECTURE, IMAGE_FILE_MACHINE_NATIVE,
PACKET_TYPE_MAX, PACKET_TYPE_MAX,
0, 0,
0, 0,

10
reactos/ntoskrnl/mm/ARM3/miarm.h
View file

@ -85,16 +85,6 @@ C_ASSERT(SYSTEM_PD_SIZE == PAGE_SIZE);
#define PTE_COUNT PTE_PER_PAGE #define PTE_COUNT PTE_PER_PAGE
#endif #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 // 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 // Taken from http://www.reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_kernel