Migrate XTLDR modules to C++

2025-09-17 22:30:48 +02:00
parent 57fbbf820c
commit dcae0cbb91
56 changed files with 1259 additions and 1297 deletions
--- a/xtldr/modules/pecoff/includes/globals.h
+++ b/xtldr/modules/pecoff/includes/globals.h
@@ -1,21 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/modules/pecoff/includes/globals.h
- * DESCRIPTION:     Basic PE/COFF executable file format support global variables
- * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
- */
-
-#ifndef __XTLDR_PECOFF_GLOBALS_H
-#define __XTLDR_PECOFF_GLOBALS_H
-
-#include <xtblapi.h>
-
-
-/* XTOS PE/COFF Image Protocol */
-EXTERN XTBL_EXECUTABLE_IMAGE_PROTOCOL PeCoffProtocol;
-
-/* EFI XT Loader Protocol */
-EXTERN PXTBL_LOADER_PROTOCOL XtLdrProtocol;
-
-#endif /* __XTLDR_PECOFF_GLOBALS_H */
--- a/xtldr/modules/pecoff/includes/pecoff.h
+++ b/xtldr/modules/pecoff/includes/pecoff.h
@@ -1,82 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/modules/pecoff/includes/pecoff.h
- * DESCRIPTION:     Basic PE/COFF executable file format support header
- * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
- */
-
-#ifndef __XTLDR_PECOFF_H
-#define __XTLDR_PECOFF_H
-
-#include <xtblapi.h>
-#include <globals.h>
-
-
-/* PE/COFF image protocol related routines forward references */
-XTCDECL
-EFI_STATUS
-PeGetEntryPoint(IN PVOID ImagePointer,
-                OUT PVOID *EntryPoint);
-
-XTCDECL
-EFI_STATUS
-PeGetFileSize(IN PVOID ImagePointer,
-              OUT PULONGLONG FileSize);
-
-XTCDECL
-EFI_STATUS
-PeGetImageSize(IN PVOID ImagePointer,
-               OUT PUINT ImageSize);
-
-XTCDECL
-EFI_STATUS
-PeGetMachineType(IN PVOID ImagePointer,
-                 OUT PUSHORT MachineType);
-
-XTCDECL
-EFI_STATUS
-PeGetSection(IN PVOID ImagePointer,
-             IN PCHAR SectionName,
-             OUT PULONG *RawData);
-
-XTCDECL
-EFI_STATUS
-PeGetSubSystem(IN PVOID ImagePointer,
-               OUT PUSHORT SubSystem);
-
-XTCDECL
-EFI_STATUS
-PeGetVersion(IN PVOID ImagePointer,
-             OUT PUSHORT Version);
-
-XTCDECL
-EFI_STATUS
-PeLoadImage(IN PEFI_FILE_HANDLE FileHandle,
-            IN LOADER_MEMORY_TYPE MemoryType,
-            IN PVOID VirtualAddress,
-            OUT PVOID *ImagePointer);
-
-XTCDECL
-EFI_STATUS
-PeRelocateImage(IN PVOID ImagePointer,
-                IN EFI_VIRTUAL_ADDRESS Address);
-
-XTCDECL
-EFI_STATUS
-PeUnloadImage(IN PVOID ImagePointer);
-
-XTCDECL
-EFI_STATUS
-PeVerifyImage(IN PVOID ImagePointer);
-
-XTCDECL
-EFI_STATUS
-PepRelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image);
-
-XTCDECL
-EFI_STATUS
-BlXtLdrModuleMain(IN EFI_HANDLE ImageHandle,
-                  IN PEFI_SYSTEM_TABLE SystemTable);
-
-#endif /* __XTLDR_PECOFF_H */
--- a/xtldr/modules/pecoff/includes/pecoff.hh
+++ b/xtldr/modules/pecoff/includes/pecoff.hh
@@ -0,0 +1,53 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtldr/modules/pecoff/includes/pecoff.hh
+ * DESCRIPTION:     Basic PE/COFF executable file format support header
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#ifndef __XTLDR_PECOFF_HH
+#define __XTLDR_PECOFF_HH
+
+#include <xtblapi.h>
+
+
+/* PE/COFF module for XTLDR */
+class PeCoff
+{
+    private:
+        STATIC XTBL_EXECUTABLE_IMAGE_PROTOCOL PeProtocol;
+        STATIC PXTBL_LOADER_PROTOCOL XtLdrProtocol;
+
+    public:
+        STATIC XTCDECL EFI_STATUS GetEntryPoint(IN PVOID ImagePointer,
+                                                OUT PVOID *EntryPoint);
+        STATIC XTCDECL EFI_STATUS GetFileSize(IN PVOID ImagePointer,
+                                              OUT PULONGLONG FileSize);
+        STATIC XTCDECL EFI_STATUS GetImageSize(IN PVOID ImagePointer,
+                                               OUT PUINT ImageSize);
+        STATIC XTCDECL EFI_STATUS GetMachineType(IN PVOID ImagePointer,
+                                                 OUT PUSHORT MachineType);
+        STATIC XTCDECL EFI_STATUS GetSection(IN PVOID ImagePointer,
+                                             IN PCHAR SectionName,
+                                             OUT PULONG *RawData);
+        STATIC XTCDECL EFI_STATUS GetSubSystem(IN PVOID ImagePointer,
+                                               OUT PUSHORT SubSystem);
+        STATIC XTCDECL EFI_STATUS GetVersion(IN PVOID ImagePointer,
+                                             OUT PUSHORT Version);
+        STATIC XTCDECL EFI_STATUS InitializeModule(IN EFI_HANDLE ImageHandle,
+                                                   IN PEFI_SYSTEM_TABLE SystemTable);
+        STATIC XTCDECL EFI_STATUS LoadImage(IN PEFI_FILE_HANDLE FileHandle,
+                                            IN LOADER_MEMORY_TYPE MemoryType,
+                                            IN PVOID VirtualAddress,
+                                            OUT PVOID *ImagePointer);
+        STATIC XTCDECL EFI_STATUS RelocateImage(IN PVOID ImagePointer,
+                                                IN EFI_VIRTUAL_ADDRESS Address);
+        STATIC XTCDECL EFI_STATUS UnloadImage(IN PVOID ImagePointer);
+        STATIC XTCDECL EFI_STATUS VerifyImage(IN PVOID ImagePointer);
+
+    private:
+        STATIC XTCDECL EFI_STATUS RelocateLoadedImage(IN PPECOFF_IMAGE_CONTEXT Image);
+};
+
+#endif /* __XTLDR_PECOFF_HH */