xt-sys/exectos
xt-sys/exectos
3
5
Fork 3
Code Issues 3 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Add a way to check PE/COFF image machine type
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2022-12-20 15:37:13 +01:00
parent 7bcdd8562d
commit eb5998c58e
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
4 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/xtdk/xttarget.h
View File

@ -19,11 +19,13 @@
#if defined(__i386__) || defined(__i686__) #if defined(__i386__) || defined(__i686__)
#define _ARCH i686 #define _ARCH i686
#define _ARCH_I686 1 #define _ARCH_I686 1
#define _ARCH_IMAGE_MACHINE_TYPE 0x014C
#define _XT32 1 #define _XT32 1
#define EFI_ERROR_MASK 0x80000000 #define EFI_ERROR_MASK 0x80000000
#elif defined(__amd64__) || defined(__x86_64__) #elif defined(__amd64__) || defined(__x86_64__)
#define _ARCH amd64 #define _ARCH amd64
#define _ARCH_AMD64 1 #define _ARCH_AMD64 1
#define _ARCH_IMAGE_MACHINE_TYPE 0x8664
#define _XT64 1 #define _XT64 1
#define EFI_ERROR_MASK 0x8000000000000000 #define EFI_ERROR_MASK 0x8000000000000000
#else #else

2
xtldr/includes/blmod.h
View File

@ -22,6 +22,7 @@ typedef struct _XT_PECOFFF_IMAGE_PROTOCOL XT_PECOFF_IMAGE_PROTOCOL, *PXT_PECOFF_
/* Pointers to the routines provided by the modules */ /* Pointers to the routines provided by the modules */
typedef EFI_STATUS (*PXT_BOOTPROTO_BOOT_SYSTEM)(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters); typedef EFI_STATUS (*PXT_BOOTPROTO_BOOT_SYSTEM)(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters);
typedef EFI_STATUS (*PXT_PECOFF_GET_ENTRY_POINT)(IN PPECOFF_IMAGE_CONTEXT Image, OUT PVOID *EntryPoint); typedef EFI_STATUS (*PXT_PECOFF_GET_ENTRY_POINT)(IN PPECOFF_IMAGE_CONTEXT Image, OUT PVOID *EntryPoint);
typedef EFI_STATUS (*PXT_PECOFF_GET_MACHINE_TYPE)(IN PPECOFF_IMAGE_CONTEXT Image, OUT PUSHORT MachineType);
typedef EFI_STATUS (*PXT_PECOFF_GET_SUBSYSTEM)(IN PPECOFF_IMAGE_CONTEXT Image, OUT PUSHORT SubSystem); typedef EFI_STATUS (*PXT_PECOFF_GET_SUBSYSTEM)(IN PPECOFF_IMAGE_CONTEXT Image, OUT PUSHORT SubSystem);
typedef EFI_STATUS (*PXT_PECOFF_LOAD_IMAGE)(IN PEFI_FILE_HANDLE FileHandle, IN LOADER_MEMORY_TYPE MemoryType, typedef EFI_STATUS (*PXT_PECOFF_LOAD_IMAGE)(IN PEFI_FILE_HANDLE FileHandle, IN LOADER_MEMORY_TYPE MemoryType,
IN PVOID VirtualAddress, OUT PPECOFF_IMAGE_CONTEXT *Image); IN PVOID VirtualAddress, OUT PPECOFF_IMAGE_CONTEXT *Image);
@ -50,6 +51,7 @@ typedef struct _XT_BOOT_PROTOCOL_PARAMETERS
typedef struct _XT_PECOFFF_IMAGE_PROTOCOL typedef struct _XT_PECOFFF_IMAGE_PROTOCOL
{ {
PXT_PECOFF_GET_ENTRY_POINT GetEntryPoint; PXT_PECOFF_GET_ENTRY_POINT GetEntryPoint;
PXT_PECOFF_GET_MACHINE_TYPE GetMachineType;
PXT_PECOFF_GET_SUBSYSTEM GetSubSystem; PXT_PECOFF_GET_SUBSYSTEM GetSubSystem;
PXT_PECOFF_LOAD_IMAGE Load; PXT_PECOFF_LOAD_IMAGE Load;
PXT_PECOFF_RELOCATE_IMAGE Relocate; PXT_PECOFF_RELOCATE_IMAGE Relocate;

4
xtldr/modules/pecoff/includes/pecoff.h
View File

@ -17,6 +17,10 @@ EFI_STATUS
PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image, PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PVOID *EntryPoint); OUT PVOID *EntryPoint);
EFI_STATUS
PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT MachineType);
EFI_STATUS EFI_STATUS
PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image, PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT SubSystem); OUT PUSHORT SubSystem);

14
xtldr/modules/pecoff/pecoff.c
View File

@ -50,6 +50,19 @@ PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image,
return STATUS_EFI_SUCCESS; return STATUS_EFI_SUCCESS;
} }
EFI_STATUS
PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT MachineType)
{
if(!Image || !Image->PeHeader)
{
return STATUS_EFI_INVALID_PARAMETER;
}
*MachineType = Image->PeHeader->FileHeader.Machine;
return STATUS_EFI_SUCCESS;
}
/** /**
* Returns an information about subsystem that is required to run PE/COFF image. * Returns an information about subsystem that is required to run PE/COFF image.
* *
@ -548,6 +561,7 @@ BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
/* Set routines available via PE/COFF image protocol */ /* Set routines available via PE/COFF image protocol */
XtPeCoffProtocol.GetEntryPoint = PeGetEntryPoint; XtPeCoffProtocol.GetEntryPoint = PeGetEntryPoint;
XtPeCoffProtocol.GetMachineType = PeGetMachineType;
XtPeCoffProtocol.GetSubSystem = PeGetSubSystem; XtPeCoffProtocol.GetSubSystem = PeGetSubSystem;
XtPeCoffProtocol.Load = PeLoadImage; XtPeCoffProtocol.Load = PeLoadImage;
XtPeCoffProtocol.Relocate = PeRelocateImage; XtPeCoffProtocol.Relocate = PeRelocateImage;