eersoy93/exectos
1
0
Fork 0
forked from xt-sys/exectos
Code Pull Requests Activity

Loop over halt; add missing calling convention

Browse Source
This commit is contained in:
Rafal Kupiec 2022-12-27 20:12:59 +01:00
parent 5b75d005a7
commit 6d77ff42c5
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
18 changed files with 137 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xtldr/amd64/memory.c
View File

@ -25,6 +25,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlCreateStack(IN PVOID *StackPtr, BlCreateStack(IN PVOID *StackPtr,
IN ULONG StackSize, IN ULONG StackSize,
@ -71,6 +72,7 @@ BlCreateStack(IN PVOID *StackPtr,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEnablePaging(IN PLIST_ENTRY MemoryMappings, BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
@ -199,6 +201,7 @@ BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings, BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
IN UINT_PTR VirtualAddress, IN UINT_PTR VirtualAddress,

2
xtldr/blproto.c
View File

@ -20,6 +20,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlGetXtLoaderProtocol(OUT PXT_BOOT_LOADER_PROTOCOL *LdrProtocol) BlGetXtLoaderProtocol(OUT PXT_BOOT_LOADER_PROTOCOL *LdrProtocol)
{ {
@ -42,6 +43,7 @@ BlGetXtLoaderProtocol(OUT PXT_BOOT_LOADER_PROTOCOL *LdrProtocol)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadXtProtocol(OUT PVOID *ProtocolHandler, BlLoadXtProtocol(OUT PVOID *ProtocolHandler,
IN PEFI_GUID ProtocolGuid) IN PEFI_GUID ProtocolGuid)

3
xtldr/console.c
View File

@ -16,6 +16,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlConsoleClearScreen() BlConsoleClearScreen()
{ {
@ -29,6 +30,7 @@ BlConsoleClearScreen()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlConsoleInitialize() BlConsoleInitialize()
{ {
@ -54,6 +56,7 @@ BlConsoleInitialize()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlConsolePutChar(IN USHORT Character) BlConsolePutChar(IN USHORT Character)
{ {

4
xtldr/efiutil.c
View File

@ -16,6 +16,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlComPortInitialize() BlComPortInitialize()
{ {
@ -117,6 +118,7 @@ BlComPortInitialize()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlComPortPutChar(IN USHORT Character) BlComPortPutChar(IN USHORT Character)
{ {
@ -142,6 +144,7 @@ BlComPortPutChar(IN USHORT Character)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlDbgPrint(IN PUINT16 Format, BlDbgPrint(IN PUINT16 Format,
IN ...) IN ...)
@ -177,6 +180,7 @@ BlDbgPrint(IN PUINT16 Format,
* *
* @todo Check if GOP is active and use it instead of default conout protocol * @todo Check if GOP is active and use it instead of default conout protocol
*/ */
XTCDECL
VOID VOID
BlEfiPrint(IN PUINT16 Format, BlEfiPrint(IN PUINT16 Format,
IN ...) IN ...)

3
xtldr/i686/memory.c
View File

@ -25,6 +25,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlCreateStack(IN PVOID *StackPtr, BlCreateStack(IN PVOID *StackPtr,
IN ULONG StackSize, IN ULONG StackSize,
@ -71,6 +72,7 @@ BlCreateStack(IN PVOID *StackPtr,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEnablePaging(IN PLIST_ENTRY MemoryMappings, BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
@ -316,6 +318,7 @@ BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings, BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
IN UINT_PTR VirtualAddress, IN UINT_PTR VirtualAddress,

2
xtldr/includes/blproto.h
View File

@ -51,9 +51,11 @@ typedef struct _XT_BOOT_LOADER_PROTOCOL
} XT_BOOT_LOADER_PROTOCOL, *PXT_BOOT_LOADER_PROTOCOL; } XT_BOOT_LOADER_PROTOCOL, *PXT_BOOT_LOADER_PROTOCOL;
/* Loader protocol related routines forward references */ /* Loader protocol related routines forward references */
XTCDECL
EFI_STATUS EFI_STATUS
BlGetXtLoaderProtocol(OUT PXT_BOOT_LOADER_PROTOCOL *LdrProtocol); BlGetXtLoaderProtocol(OUT PXT_BOOT_LOADER_PROTOCOL *LdrProtocol);
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadXtProtocol(OUT PVOID *ProtocolHandler, BlLoadXtProtocol(OUT PVOID *ProtocolHandler,
IN PEFI_GUID ProtocolGuid); IN PEFI_GUID ProtocolGuid);

45
xtldr/includes/xtbl.h
View File

@ -32,6 +32,7 @@ EXTERN PVOID EfiLoaderStack;
/* Serial port configuration */ /* Serial port configuration */
EXTERN CPPORT EfiSerialPort; EXTERN CPPORT EfiSerialPort;
XTCDECL
EFI_STATUS EFI_STATUS
BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings, BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
@ -39,103 +40,130 @@ BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings,
IN UINT NumberOfPages, IN UINT NumberOfPages,
IN LOADER_MEMORY_TYPE MemoryType); IN LOADER_MEMORY_TYPE MemoryType);
XTCDECL
EFI_STATUS EFI_STATUS
BlCloseVolume(IN PEFI_HANDLE VolumeHandle); BlCloseVolume(IN PEFI_HANDLE VolumeHandle);
XTCDECL
EFI_STATUS EFI_STATUS
BlComPortInitialize(); BlComPortInitialize();
XTCDECL
VOID VOID
BlComPortPutChar(IN USHORT Character); BlComPortPutChar(IN USHORT Character);
XTCDECL
VOID VOID
BlConsoleClearScreen(); BlConsoleClearScreen();
XTCDECL
VOID VOID
BlConsoleInitialize(); BlConsoleInitialize();
XTCDECL
VOID VOID
BlConsolePutChar(IN USHORT Character); BlConsolePutChar(IN USHORT Character);
XTCDECL
LOADER_MEMORY_TYPE LOADER_MEMORY_TYPE
BlConvertEfiMemoryType(IN EFI_MEMORY_TYPE EfiMemoryType); BlConvertEfiMemoryType(IN EFI_MEMORY_TYPE EfiMemoryType);
XTCDECL
VOID VOID
BlCreateStack(IN PVOID *StackPtr, BlCreateStack(IN PVOID *StackPtr,
IN ULONG StackSize, IN ULONG StackSize,
IN PVOID Callback); IN PVOID Callback);
XTCDECL
VOID VOID
BlDbgPrint(IN PUINT16 Format, BlDbgPrint(IN PUINT16 Format,
IN ...); IN ...);
XTCDECL
INT_PTR INT_PTR
BlEfiGetSecureBootStatus(); BlEfiGetSecureBootStatus();
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiGetSystemConfigurationTable(IN PEFI_GUID TableGuid, BlEfiGetSystemConfigurationTable(IN PEFI_GUID TableGuid,
OUT PVOID *Table); OUT PVOID *Table);
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryAllocatePages(IN UINT64 Size, BlEfiMemoryAllocatePages(IN UINT64 Size,
OUT PEFI_PHYSICAL_ADDRESS Memory); OUT PEFI_PHYSICAL_ADDRESS Memory);
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryAllocatePool(IN UINT_PTR Size, BlEfiMemoryAllocatePool(IN UINT_PTR Size,
OUT PVOID *Memory); OUT PVOID *Memory);
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryFreePages(IN UINT64 Size, BlEfiMemoryFreePages(IN UINT64 Size,
IN EFI_PHYSICAL_ADDRESS Memory); IN EFI_PHYSICAL_ADDRESS Memory);
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryFreePool(IN PVOID Memory); BlEfiMemoryFreePool(IN PVOID Memory);
XTCDECL
VOID VOID
BlEfiPrint(IN PUINT16 Format, BlEfiPrint(IN PUINT16 Format,
IN ...); IN ...);
XTCDECL
EFI_STATUS EFI_STATUS
BlEnablePaging(IN PLIST_ENTRY MemoryMappings, BlEnablePaging(IN PLIST_ENTRY MemoryMappings,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
IN PEFI_LOADED_IMAGE_PROTOCOL ImageProtocol, IN PEFI_LOADED_IMAGE_PROTOCOL ImageProtocol,
IN PVOID *PtePointer); IN PVOID *PtePointer);
XTCDECL
EFI_STATUS EFI_STATUS
BlEnumerateEfiBlockDevices(); BlEnumerateEfiBlockDevices();
XTCDECL
EFI_STATUS EFI_STATUS
BlFindVolumeDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL FsHandle, BlFindVolumeDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL FsHandle,
IN CONST PWCHAR FileSystemPath, IN CONST PWCHAR FileSystemPath,
OUT PEFI_DEVICE_PATH_PROTOCOL* DevicePath); OUT PEFI_DEVICE_PATH_PROTOCOL* DevicePath);
XTCDECL
EFI_STATUS EFI_STATUS
BlGetMemoryMap(OUT PEFI_MEMORY_MAP MemoryMap); BlGetMemoryMap(OUT PEFI_MEMORY_MAP MemoryMap);
XTCDECL
VOID VOID
BlGetStackPointer(OUT PVOID *Stack); BlGetStackPointer(OUT PVOID *Stack);
XTCDECL
EFI_STATUS EFI_STATUS
BlGetVirtualAddress(IN PLIST_ENTRY MemoryMappings, BlGetVirtualAddress(IN PLIST_ENTRY MemoryMappings,
IN PVOID PhysicalAddress, IN PVOID PhysicalAddress,
OUT PVOID *VirtualAddress); OUT PVOID *VirtualAddress);
XTCDECL
EFI_STATUS EFI_STATUS
BlGetVolumeDevicePath(IN PUCHAR SystemPath, BlGetVolumeDevicePath(IN PUCHAR SystemPath,
OUT PEFI_DEVICE_PATH_PROTOCOL *DevicePath, OUT PEFI_DEVICE_PATH_PROTOCOL *DevicePath,
OUT PUCHAR *ArcName, OUT PUCHAR *ArcName,
OUT PUCHAR *Path); OUT PUCHAR *Path);
XTCDECL
EFI_STATUS EFI_STATUS
BlInitializeVirtualMemory(IN OUT PLIST_ENTRY MemoryMappings, BlInitializeVirtualMemory(IN OUT PLIST_ENTRY MemoryMappings,
IN OUT PVOID *MemoryMapAddress); IN OUT PVOID *MemoryMapAddress);
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadEfiModules(); BlLoadEfiModules();
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadXtSystem(); BlLoadXtSystem();
XTCDECL
EFI_STATUS EFI_STATUS
BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings, BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
IN UINT_PTR VirtualAddress, IN UINT_PTR VirtualAddress,
@ -144,33 +172,41 @@ BlMapVirtualMemory(IN PLIST_ENTRY MemoryMappings,
IN BOOLEAN PaeExtension, IN BOOLEAN PaeExtension,
IN OUT PVOID *PtePointer); IN OUT PVOID *PtePointer);
XTCDECL
EFI_STATUS EFI_STATUS
BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath, BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
OUT PEFI_HANDLE DiskHandle, OUT PEFI_HANDLE DiskHandle,
OUT PEFI_FILE_HANDLE *FsHandle); OUT PEFI_FILE_HANDLE *FsHandle);
XTCDECL
EFI_STATUS EFI_STATUS
BlRegisterXtLoaderProtocol(); BlRegisterXtLoaderProtocol();
XTCDECL
EFI_STATUS EFI_STATUS
BlStartNewStack(); BlStartNewStack();
XTCDECL
EFI_STATUS EFI_STATUS
BlStartXtLoader(IN EFI_HANDLE ImageHandle, BlStartXtLoader(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable); IN PEFI_SYSTEM_TABLE SystemTable);
XTCDECL
INT INT
BlStringCompareInsensitive(IN PUCHAR String1, BlStringCompareInsensitive(IN PUCHAR String1,
IN PUCHAR String2); IN PUCHAR String2);
XTCDECL
VOID VOID
BlStringPrint(IN VOID PutChar(IN USHORT Character), BlStringPrint(IN VOID PutChar(IN USHORT Character),
IN PUINT16 Format, IN PUINT16 Format,
IN VA_LIST Arguments); IN VA_LIST Arguments);
XTCDECL
EFI_STATUS EFI_STATUS
BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices); BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices);
XTCDECL
EFI_STATUS EFI_STATUS
BlpDissectVolumeArcPath(IN PUCHAR SystemPath, BlpDissectVolumeArcPath(IN PUCHAR SystemPath,
OUT PUCHAR *ArcName, OUT PUCHAR *ArcName,
@ -179,45 +215,54 @@ BlpDissectVolumeArcPath(IN PUCHAR SystemPath,
OUT PULONG DriveNumber, OUT PULONG DriveNumber,
OUT PULONG PartNumber); OUT PULONG PartNumber);
XTCDECL
PEFI_DEVICE_PATH_PROTOCOL PEFI_DEVICE_PATH_PROTOCOL
BlpDuplicateDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath); BlpDuplicateDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath);
XTCDECL
EFI_STATUS EFI_STATUS
BlpFindLastEfiBlockDeviceNode(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath, BlpFindLastEfiBlockDeviceNode(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
OUT PEFI_DEVICE_PATH_PROTOCOL *LastNode); OUT PEFI_DEVICE_PATH_PROTOCOL *LastNode);
XTCDECL
BOOLEAN BOOLEAN
BlpFindParentEfiBlockDevice(IN PLIST_ENTRY BlockDevices, BlpFindParentEfiBlockDevice(IN PLIST_ENTRY BlockDevices,
IN PEFI_BLOCK_DEVICE_DATA ChildNode, IN PEFI_BLOCK_DEVICE_DATA ChildNode,
OUT PEFI_BLOCK_DEVICE_DATA ParentNode); OUT PEFI_BLOCK_DEVICE_DATA ParentNode);
XTCDECL
VOID VOID
BlpStringFormat(IN VOID PutChar(IN USHORT Character), BlpStringFormat(IN VOID PutChar(IN USHORT Character),
IN PUINT16 Format, IN PUINT16 Format,
IN ...); IN ...);
XTCDECL
VOID VOID
BlpStringPrintSigned32(IN VOID PutChar(IN USHORT Character), BlpStringPrintSigned32(IN VOID PutChar(IN USHORT Character),
IN INT32 Number, IN INT32 Number,
IN UINT32 Base); IN UINT32 Base);
XTCDECL
VOID VOID
BlpStringPrintSigned64(IN VOID PutChar(IN USHORT Character), BlpStringPrintSigned64(IN VOID PutChar(IN USHORT Character),
IN INT_PTR Number, IN INT_PTR Number,
IN UINT_PTR Base); IN UINT_PTR Base);
XTCDECL
VOID VOID
BlpStringPrintUnsigned32(IN VOID PutChar(IN USHORT Character), BlpStringPrintUnsigned32(IN VOID PutChar(IN USHORT Character),
IN UINT32 Number, IN UINT32 Number,
IN UINT32 Base, IN UINT32 Base,
IN UINT32 Padding); IN UINT32 Padding);
XTCDECL
VOID VOID
BlpStringPrintUnsigned64(IN VOID PutChar(IN USHORT Character), BlpStringPrintUnsigned64(IN VOID PutChar(IN USHORT Character),
IN UINT_PTR Number, IN UINT_PTR Number,
IN UINT_PTR Base, IN UINT_PTR Base,
IN UINT_PTR Padding); IN UINT_PTR Padding);
XTCDECL
UINT64 UINT64
BlpStringReadPadding(IN PUINT16 *Format); BlpStringReadPadding(IN PUINT16 *Format);

9
xtldr/memory.c
View File

@ -31,6 +31,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings, BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
@ -191,6 +192,7 @@ BlAddVirtualMemoryMapping(IN PLIST_ENTRY MemoryMappings,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
LOADER_MEMORY_TYPE LOADER_MEMORY_TYPE
BlConvertEfiMemoryType(IN EFI_MEMORY_TYPE EfiMemoryType) BlConvertEfiMemoryType(IN EFI_MEMORY_TYPE EfiMemoryType)
{ {
@ -239,6 +241,7 @@ BlConvertEfiMemoryType(IN EFI_MEMORY_TYPE EfiMemoryType)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryAllocatePages(IN UINT64 Pages, BlEfiMemoryAllocatePages(IN UINT64 Pages,
OUT PEFI_PHYSICAL_ADDRESS Memory) OUT PEFI_PHYSICAL_ADDRESS Memory)
@ -259,6 +262,7 @@ BlEfiMemoryAllocatePages(IN UINT64 Pages,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryAllocatePool(IN UINT_PTR Size, BlEfiMemoryAllocatePool(IN UINT_PTR Size,
OUT PVOID *Memory) OUT PVOID *Memory)
@ -280,6 +284,7 @@ BlEfiMemoryAllocatePool(IN UINT_PTR Size,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryFreePages(IN UINT64 Pages, BlEfiMemoryFreePages(IN UINT64 Pages,
IN EFI_PHYSICAL_ADDRESS Memory) IN EFI_PHYSICAL_ADDRESS Memory)
@ -297,6 +302,7 @@ BlEfiMemoryFreePages(IN UINT64 Pages,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiMemoryFreePool(IN PVOID Memory) BlEfiMemoryFreePool(IN PVOID Memory)
{ {
@ -314,6 +320,7 @@ BlEfiMemoryFreePool(IN PVOID Memory)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlGetMemoryMap(OUT PEFI_MEMORY_MAP MemoryMap) BlGetMemoryMap(OUT PEFI_MEMORY_MAP MemoryMap)
{ {
@ -382,6 +389,7 @@ BlGetMemoryMap(OUT PEFI_MEMORY_MAP MemoryMap)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlGetVirtualAddress(IN PLIST_ENTRY MemoryMappings, BlGetVirtualAddress(IN PLIST_ENTRY MemoryMappings,
IN PVOID PhysicalAddress, IN PVOID PhysicalAddress,
@ -440,6 +448,7 @@ BlGetVirtualAddress(IN PLIST_ENTRY MemoryMappings,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlInitializeVirtualMemory(IN OUT PLIST_ENTRY MemoryMappings, BlInitializeVirtualMemory(IN OUT PLIST_ENTRY MemoryMappings,
IN OUT PVOID *MemoryMapAddress) IN OUT PVOID *MemoryMapAddress)

1
xtldr/modules/dummy/dummy.c
View File

@ -31,6 +31,7 @@ PXT_BOOT_LOADER_PROTOCOL XtLdrProtocol;
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable) IN PEFI_SYSTEM_TABLE SystemTable)

1
xtldr/modules/dummy/includes/dummy.h
View File

@ -13,6 +13,7 @@
/* Dummy module related routines forward references */ /* Dummy module related routines forward references */
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable); IN PEFI_SYSTEM_TABLE SystemTable);

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

@ -13,36 +13,44 @@
/* PE/COFF image protocol related routines forward references */ /* PE/COFF image protocol related routines forward references */
XTCDECL
EFI_STATUS EFI_STATUS
PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image, PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PVOID *EntryPoint); OUT PVOID *EntryPoint);
XTCDECL
EFI_STATUS EFI_STATUS
PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image, PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT MachineType); OUT PUSHORT MachineType);
XTCDECL
EFI_STATUS EFI_STATUS
PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image, PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT SubSystem); OUT PUSHORT SubSystem);
XTCDECL
EFI_STATUS EFI_STATUS
PeLoadImage(IN PEFI_FILE_HANDLE FileHandle, PeLoadImage(IN PEFI_FILE_HANDLE FileHandle,
IN LOADER_MEMORY_TYPE MemoryType, IN LOADER_MEMORY_TYPE MemoryType,
IN PVOID VirtualAddress, IN PVOID VirtualAddress,
OUT PPECOFF_IMAGE_CONTEXT *Image); OUT PPECOFF_IMAGE_CONTEXT *Image);
XTCDECL
EFI_STATUS EFI_STATUS
PeRelocateImage(IN PPECOFF_IMAGE_CONTEXT Image, PeRelocateImage(IN PPECOFF_IMAGE_CONTEXT Image,
IN EFI_VIRTUAL_ADDRESS Address); IN EFI_VIRTUAL_ADDRESS Address);
XTCDECL
EFI_STATUS EFI_STATUS
PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image); PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image);
XTCDECL
EFI_STATUS EFI_STATUS
PepValidateImageHeaders(IN PPECOFF_IMAGE_DOS_HEADER DosHeader, PepValidateImageHeaders(IN PPECOFF_IMAGE_DOS_HEADER DosHeader,
IN PPECOFF_IMAGE_PE_HEADER PeHeader, IN PPECOFF_IMAGE_PE_HEADER PeHeader,
IN SIZE_T FileSize); IN SIZE_T FileSize);
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable); IN PEFI_SYSTEM_TABLE SystemTable);

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

@ -34,6 +34,7 @@ XT_PECOFF_IMAGE_PROTOCOL XtPeCoffProtocol;
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image, PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PVOID *EntryPoint) OUT PVOID *EntryPoint)
@ -63,6 +64,7 @@ PeGetEntryPoint(IN PPECOFF_IMAGE_CONTEXT Image,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image, PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT MachineType) OUT PUSHORT MachineType)
@ -92,6 +94,7 @@ PeGetMachineType(IN PPECOFF_IMAGE_CONTEXT Image,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image, PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image,
OUT PUSHORT SubSystem) OUT PUSHORT SubSystem)
@ -127,6 +130,7 @@ PeGetSubSystem(IN PPECOFF_IMAGE_CONTEXT Image,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PeLoadImage(IN PEFI_FILE_HANDLE FileHandle, PeLoadImage(IN PEFI_FILE_HANDLE FileHandle,
IN LOADER_MEMORY_TYPE MemoryType, IN LOADER_MEMORY_TYPE MemoryType,
@ -346,6 +350,7 @@ PeLoadImage(IN PEFI_FILE_HANDLE FileHandle,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PeRelocateImage(IN PPECOFF_IMAGE_CONTEXT Image, PeRelocateImage(IN PPECOFF_IMAGE_CONTEXT Image,
IN EFI_VIRTUAL_ADDRESS Address) IN EFI_VIRTUAL_ADDRESS Address)
@ -394,6 +399,7 @@ PeRelocateImage(IN PPECOFF_IMAGE_CONTEXT Image,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image) PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image)
{ {
@ -514,6 +520,7 @@ PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
PepValidateImageHeaders(IN PPECOFF_IMAGE_DOS_HEADER DosHeader, PepValidateImageHeaders(IN PPECOFF_IMAGE_DOS_HEADER DosHeader,
IN PPECOFF_IMAGE_PE_HEADER PeHeader, IN PPECOFF_IMAGE_PE_HEADER PeHeader,
@ -565,6 +572,7 @@ PepValidateImageHeaders(IN PPECOFF_IMAGE_DOS_HEADER DosHeader,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable) IN PEFI_SYSTEM_TABLE SystemTable)

5
xtldr/modules/xtos/includes/xtos.h
View File

@ -16,17 +16,21 @@
typedef VOID (XTAPI *PXT_ENTRY_POINT)(IN PKERNEL_INITIALIZATION_BLOCK BootParameters); typedef VOID (XTAPI *PXT_ENTRY_POINT)(IN PKERNEL_INITIALIZATION_BLOCK BootParameters);
/* XTOS boot protocol related routines forward references */ /* XTOS boot protocol related routines forward references */
XTCDECL
EFI_STATUS EFI_STATUS
XtBootSystem(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters); XtBootSystem(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters);
XTCDECL
EFI_STATUS EFI_STATUS
XtpBootSequence(IN PEFI_FILE_HANDLE BootDir, XtpBootSequence(IN PEFI_FILE_HANDLE BootDir,
IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters); IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters);
XTCDECL
EFI_STATUS EFI_STATUS
XtpInitializeLoaderBlock(IN PLIST_ENTRY MemoryMappings, XtpInitializeLoaderBlock(IN PLIST_ENTRY MemoryMappings,
IN PVOID *VirtualAddress); IN PVOID *VirtualAddress);
XTCDECL
EFI_STATUS EFI_STATUS
XtpLoadModule(IN PEFI_FILE_HANDLE BootDir, XtpLoadModule(IN PEFI_FILE_HANDLE BootDir,
IN PWCHAR FileName, IN PWCHAR FileName,
@ -34,6 +38,7 @@ XtpLoadModule(IN PEFI_FILE_HANDLE BootDir,
IN LOADER_MEMORY_TYPE MemoryType, IN LOADER_MEMORY_TYPE MemoryType,
OUT PPECOFF_IMAGE_CONTEXT *ImageContext); OUT PPECOFF_IMAGE_CONTEXT *ImageContext);
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable); IN PEFI_SYSTEM_TABLE SystemTable);

5
xtldr/modules/xtos/xtos.c
View File

@ -37,6 +37,7 @@ PVOID XtPageMap;
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
XtBootSystem(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters) XtBootSystem(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters)
{ {
@ -164,6 +165,7 @@ XtBootSystem(IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
XtpBootSequence(IN PEFI_FILE_HANDLE BootDir, XtpBootSequence(IN PEFI_FILE_HANDLE BootDir,
IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters) IN PXT_BOOT_PROTOCOL_PARAMETERS Parameters)
@ -251,6 +253,7 @@ XtpBootSequence(IN PEFI_FILE_HANDLE BootDir,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
XtpInitializeLoaderBlock(IN PLIST_ENTRY MemoryMappings, XtpInitializeLoaderBlock(IN PLIST_ENTRY MemoryMappings,
IN PVOID *VirtualAddress) IN PVOID *VirtualAddress)
@ -334,6 +337,7 @@ XtpInitializeLoaderBlock(IN PLIST_ENTRY MemoryMappings,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
XtpLoadModule(IN PEFI_FILE_HANDLE SystemDir, XtpLoadModule(IN PEFI_FILE_HANDLE SystemDir,
IN PWCHAR FileName, IN PWCHAR FileName,
@ -407,6 +411,7 @@ XtpLoadModule(IN PEFI_FILE_HANDLE SystemDir,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle, BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable) IN PEFI_SYSTEM_TABLE SystemTable)

8
xtldr/string.c
View File

@ -11,6 +11,7 @@
STATIC PUINT16 HexTable = L"0123456789abcdef"; STATIC PUINT16 HexTable = L"0123456789abcdef";
XTCDECL
INT INT
BlStringCompareInsensitive(IN PUCHAR String1, BlStringCompareInsensitive(IN PUCHAR String1,
IN PUCHAR String2) IN PUCHAR String2)
@ -69,6 +70,7 @@ BlStringCompareInsensitive(IN PUCHAR String1,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlStringPrint(IN VOID PutChar(IN USHORT Character), BlStringPrint(IN VOID PutChar(IN USHORT Character),
IN PUINT16 Format, IN PUINT16 Format,
@ -243,6 +245,7 @@ BlStringPrint(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlpStringFormat(IN VOID PutChar(IN USHORT Character), BlpStringFormat(IN VOID PutChar(IN USHORT Character),
IN PUINT16 Format, IN PUINT16 Format,
@ -276,6 +279,7 @@ BlpStringFormat(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlpStringPrintSigned32(IN VOID PutChar(IN USHORT Character), BlpStringPrintSigned32(IN VOID PutChar(IN USHORT Character),
IN INT32 Number, IN INT32 Number,
@ -308,6 +312,7 @@ BlpStringPrintSigned32(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlpStringPrintSigned64(IN VOID PutChar(IN USHORT Character), BlpStringPrintSigned64(IN VOID PutChar(IN USHORT Character),
IN INT_PTR Number, IN INT_PTR Number,
@ -343,6 +348,7 @@ BlpStringPrintSigned64(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlpStringPrintUnsigned32(IN VOID PutChar(IN USHORT Character), BlpStringPrintUnsigned32(IN VOID PutChar(IN USHORT Character),
IN UINT32 Number, IN UINT32 Number,
@ -399,6 +405,7 @@ BlpStringPrintUnsigned32(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
VOID VOID
BlpStringPrintUnsigned64(IN VOID PutChar(IN USHORT Character), BlpStringPrintUnsigned64(IN VOID PutChar(IN USHORT Character),
IN UINT_PTR Number, IN UINT_PTR Number,
@ -446,6 +453,7 @@ BlpStringPrintUnsigned64(IN VOID PutChar(IN USHORT Character),
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
UINT64 UINT64
BlpStringReadPadding(IN PUINT16 *Format) BlpStringReadPadding(IN PUINT16 *Format)
{ {

2
xtldr/system.c
View File

@ -16,6 +16,7 @@
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
INT_PTR INT_PTR
BlEfiGetSecureBootStatus() BlEfiGetSecureBootStatus()
{ {
@ -54,6 +55,7 @@ BlEfiGetSecureBootStatus()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEfiGetSystemConfigurationTable(IN PEFI_GUID TableGuid, BlEfiGetSystemConfigurationTable(IN PEFI_GUID TableGuid,
OUT PVOID *Table) OUT PVOID *Table)

10
xtldr/volume.c
View File

@ -22,6 +22,7 @@ LIST_ENTRY BlBlockDevices;
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlCloseVolume(IN PEFI_HANDLE VolumeHandle) BlCloseVolume(IN PEFI_HANDLE VolumeHandle)
{ {
@ -45,6 +46,7 @@ BlCloseVolume(IN PEFI_HANDLE VolumeHandle)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlEnumerateEfiBlockDevices() BlEnumerateEfiBlockDevices()
{ {
@ -209,6 +211,7 @@ BlEnumerateEfiBlockDevices()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlFindVolumeDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL FsHandle, BlFindVolumeDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL FsHandle,
IN CONST PWCHAR FileSystemPath, IN CONST PWCHAR FileSystemPath,
@ -292,6 +295,7 @@ BlFindVolumeDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL FsHandle,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlGetVolumeDevicePath(IN PUCHAR SystemPath, BlGetVolumeDevicePath(IN PUCHAR SystemPath,
OUT PEFI_DEVICE_PATH_PROTOCOL *DevicePath, OUT PEFI_DEVICE_PATH_PROTOCOL *DevicePath,
@ -406,6 +410,7 @@ BlGetVolumeDevicePath(IN PUCHAR SystemPath,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath, BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
OUT PEFI_HANDLE DiskHandle, OUT PEFI_HANDLE DiskHandle,
@ -478,6 +483,7 @@ BlOpenVolume(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices) BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices)
{ {
@ -581,6 +587,7 @@ BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlpDissectVolumeArcPath(IN PUCHAR SystemPath, BlpDissectVolumeArcPath(IN PUCHAR SystemPath,
OUT PUCHAR *ArcName, OUT PUCHAR *ArcName,
@ -736,6 +743,7 @@ BlpDissectVolumeArcPath(IN PUCHAR SystemPath,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
PEFI_DEVICE_PATH_PROTOCOL PEFI_DEVICE_PATH_PROTOCOL
BlpDuplicateDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath) BlpDuplicateDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath)
{ {
@ -793,6 +801,7 @@ BlpDuplicateDevicePath(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlpFindLastEfiBlockDeviceNode(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath, BlpFindLastEfiBlockDeviceNode(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
OUT PEFI_DEVICE_PATH_PROTOCOL *LastNode) OUT PEFI_DEVICE_PATH_PROTOCOL *LastNode)
@ -838,6 +847,7 @@ BlpFindLastEfiBlockDeviceNode(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath,
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
BOOLEAN BOOLEAN
BlpFindParentEfiBlockDevice(IN PLIST_ENTRY BlockDevices, BlpFindParentEfiBlockDevice(IN PLIST_ENTRY BlockDevices,
IN PEFI_BLOCK_DEVICE_DATA ChildNode, IN PEFI_BLOCK_DEVICE_DATA ChildNode,

23
xtldr/xtldr.c
View File

@ -38,7 +38,9 @@ CPPORT EfiSerialPort;
* *
* @since XT 1.0 * @since XT 1.0
*/ */
VOID BlGetStackPointer(OUT PVOID *Stack) XTCDECL
VOID
BlGetStackPointer(OUT PVOID *Stack)
{ {
*Stack = EfiLoaderStack; *Stack = EfiLoaderStack;
} }
@ -50,6 +52,7 @@ VOID BlGetStackPointer(OUT PVOID *Stack)
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadEfiModules() BlLoadEfiModules()
{ {
@ -273,6 +276,7 @@ BlLoadEfiModules()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlLoadXtSystem() BlLoadXtSystem()
{ {
@ -329,6 +333,7 @@ BlLoadXtSystem()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlRegisterXtLoaderProtocol() BlRegisterXtLoaderProtocol()
{ {
@ -365,6 +370,7 @@ BlRegisterXtLoaderProtocol()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlStartNewStack() BlStartNewStack()
{ {
@ -380,8 +386,11 @@ BlStartNewStack()
/* Infinite bootloader loop */ /* Infinite bootloader loop */
BlEfiPrint(L"System halted!"); BlEfiPrint(L"System halted!");
HlClearInterruptFlag(); for(;;)
HlHalt(); {
HlClearInterruptFlag();
HlHalt();
}
/* Return success */ /* Return success */
return STATUS_EFI_SUCCESS; return STATUS_EFI_SUCCESS;
@ -400,6 +409,7 @@ BlStartNewStack()
* *
* @since XT 1.0 * @since XT 1.0
*/ */
XTCDECL
EFI_STATUS EFI_STATUS
BlStartXtLoader(IN EFI_HANDLE ImageHandle, BlStartXtLoader(IN EFI_HANDLE ImageHandle,
IN PEFI_SYSTEM_TABLE SystemTable) IN PEFI_SYSTEM_TABLE SystemTable)
@ -462,8 +472,11 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
/* Infinite bootloader loop */ /* Infinite bootloader loop */
BlDbgPrint(L"ERROR: Unexpected exception occurred, probably did not create a new stack\n"); BlDbgPrint(L"ERROR: Unexpected exception occurred, probably did not create a new stack\n");
BlEfiPrint(L"System halted!"); BlEfiPrint(L"System halted!");
HlClearInterruptFlag(); for(;;)
HlHalt(); {
HlClearInterruptFlag();
HlHalt();
}
/* Return success */ /* Return success */
return STATUS_EFI_SUCCESS; return STATUS_EFI_SUCCESS;