Clean Up

Signed-off-by: Jiaxun Yang <[email protected]>

Author: FlyGoat

GNUmakefile

@@ -35,6 +35,9 @@ NASMFLAGS := -F dwarf -g
 # User controllable linker flags. We set none by default.
 LDFLAGS :=
 
+# User controllable version string.
+BUILD_VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo "Unknown")
+
 # Check if CC is Clang.
 override CC_IS_CLANG := $(shell ! $(CC) --version 2>/dev/null | grep 'clang' >/dev/null 2>&1; echo $$?)
 
@@ -65,6 +68,7 @@ endif
 override CPPFLAGS := \
     -I src \
     -I nyu-efi/inc \
+    -DBUILD_VERSION=\"$(BUILD_VERSION)\" \
     -isystem freestnd-c-hdrs \
     $(CPPFLAGS) \
     -MMD \

src/acpi.c

@@ -27,9 +27,9 @@ int copy_rsdt(struct csmwrap_priv *priv)
     void *table_target = priv->csm_bin + (priv->csm_efi_table->AcpiRsdPtrPointer - priv->csm_bin_base);
 
 
-    for (i = 0; i < ST->NumberOfTableEntries; i++) {
+    for (i = 0; i < gST->NumberOfTableEntries; i++) {
         EFI_CONFIGURATION_TABLE *table;
-        table = ST->ConfigurationTable + i;
+        table = gST->ConfigurationTable + i;
 
         if (!efi_guidcmp(table->VendorGuid, acpi2Guid)) {
             printf("Found ACPI 2.0 RSDT at %x, copied to %x\n", (uintptr_t)table->VendorTable, (uintptr_t)table_target);

src/csmwrap.c

@@ -10,14 +10,16 @@
 // Generated by: xxd -i vgabios.bin >> vgabios.h
 #include "bins/vgabios.h"
 
-const char *banner = "CSMWrap\n"
+#ifndef BUILD_VERSION
+#define BUILD_VERSION "Unknown"
+#endif
+
+const char *banner = "CSMWrap Version " BUILD_VERSION "\n"
                      "https://github.com/flygoat/csmwrap\n"
                      "By: Jiaxun Yang <[email protected]>\n";
 
-EFI_SYSTEM_TABLE *ST;
-EFI_BOOT_SERVICES *BS;
-
-#define BIOS_ROM_BASE  0xc0000
+EFI_SYSTEM_TABLE *gST;
+EFI_BOOT_SERVICES *gBS;
 
 struct csmwrap_priv priv = {
     .csm_bin = Csm16_bin,
@@ -72,9 +74,9 @@ int set_smbios_table()
     bool found = FALSE;
     uintptr_t table_addr = 0;
 
-    for (i = 0; i < ST->NumberOfTableEntries; i++) {
+    for (i = 0; i < gST->NumberOfTableEntries; i++) {
         EFI_CONFIGURATION_TABLE *table;
-        table = ST->ConfigurationTable + i;
+        table = gST->ConfigurationTable + i;
 
         if (!efi_guidcmp(table->VendorGuid, smbiosGuid)) {
             printf("Found SMBIOS Table at %x\n", (uintptr_t)table->VendorTable);
@@ -107,18 +109,18 @@ int set_smbios_table()
 
 EFI_STATUS efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
 {
-    ST = SystemTable;
-    BS = SystemTable->BootServices;
-
     EFI_PHYSICAL_ADDRESS HiPmm;
     uintptr_t csm_bin_base;
     EFI_STATUS Status;
     EFI_IA32_REGISTER_SET Regs;
 
+    gST = SystemTable;
+    gBS = SystemTable->BootServices;
+
     printf("%s", banner);
 
-    BS->RaiseTPL(TPL_NOTIFY);
-    BS->SetWatchdogTimer(0, 0, 0, NULL);
+    gBS->RaiseTPL(TPL_NOTIFY);
+    gBS->SetWatchdogTimer(0, 0, 0, NULL);
 
     if (unlock_bios_region()) {
         printf("Unable to unlock BIOS region\n");
@@ -153,7 +155,7 @@ EFI_STATUS efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     }
 
     HiPmm = 0xffffffff;
-    if (BS->AllocatePages(AllocateMaxAddress, EfiRuntimeServicesData, HIPMM_SIZE / EFI_PAGE_SIZE, &HiPmm) != EFI_SUCCESS) {
+    if (gBS->AllocatePages(AllocateMaxAddress, EfiRuntimeServicesData, HIPMM_SIZE / EFI_PAGE_SIZE, &HiPmm) != EFI_SUCCESS) {
         printf("Unable to alloc HiPmm!!!\n");
         return -1;
     }
@@ -197,15 +199,15 @@ EFI_STATUS efi_main(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
     EFI_MEMORY_DESCRIPTOR *efi_mmap;
     EFI_MEMORY_DESCRIPTOR tmp_mmap[1];
     efi_mmap_size = sizeof(tmp_mmap);
-    BS->GetMemoryMap(&efi_mmap_size, tmp_mmap, &efi_mmap_key, &efi_desc_size, &efi_desc_ver);
+    gBS->GetMemoryMap(&efi_mmap_size, tmp_mmap, &efi_mmap_key, &efi_desc_size, &efi_desc_ver);
     efi_mmap_size += 4096;
-    BS->AllocatePool(EfiLoaderData, efi_mmap_size, (void **)&efi_mmap);
-    BS->GetMemoryMap(&efi_mmap_size, efi_mmap, &efi_mmap_key, &efi_desc_size, &efi_desc_ver);
+    gBS->AllocatePool(EfiLoaderData, efi_mmap_size, (void **)&efi_mmap);
+    gBS->GetMemoryMap(&efi_mmap_size, efi_mmap, &efi_mmap_key, &efi_desc_size, &efi_desc_ver);
 
     // It may take N amounts of ExitBootServices() calls to complete...
     // Cap at 128.
     for (size_t i = 0; i < 128; i++) {
-        Status = BS->ExitBootServices(ImageHandle, efi_mmap_key);
+        Status = gBS->ExitBootServices(ImageHandle, efi_mmap_key);
         if (Status == EFI_SUCCESS) {
             break;
         }

src/csmwrap.h

@@ -8,8 +8,8 @@
 #include <libc.h>
 #include "x86thunk.h"
 
-extern EFI_SYSTEM_TABLE *ST;
-extern EFI_BOOT_SERVICES *BS;
+extern EFI_SYSTEM_TABLE *gST;
+extern EFI_BOOT_SERVICES *gBS;
 
 struct csmwrap_priv {
     uint8_t *csm_bin;
@@ -87,4 +87,14 @@ struct low_stub {
 #define ALIGN_DOWN(x, a)        ((x) & ~((__typeof__(x))(a)-1UL))
 #define IS_ALIGNED(x, a)        (((x) & ((__typeof__(x))(a)-1UL)) == 0)
 
+#ifdef ACCESS_PAGE0_CODE
+#  undef ACCESS_PAGE0_CODE
+#endif
+
+#define ACCESS_PAGE0_CODE(statements)                           \
+  do {                                                          \
+    statements;                                                 \
+                                                                \
+  } while (FALSE)
+
 #endif

src/e820.c

@@ -54,7 +54,7 @@ int build_e820_map(struct csmwrap_priv *priv)
     uint32_t e820_entries = 0;
 
     /* First call to get the buffer size */
-    status = BS->GetMemoryMap(&memory_map_size, NULL, &map_key, &descriptor_size, &descriptor_version);
+    status = gBS->GetMemoryMap(&memory_map_size, NULL, &map_key, &descriptor_size, &descriptor_version);
     if (status != EFI_BUFFER_TOO_SMALL) {
         printf("Unexpected GetMemoryMap status: %lx\n", status);
         return -1;
@@ -64,17 +64,17 @@ int build_e820_map(struct csmwrap_priv *priv)
     memory_map_size += descriptor_size * 10;
 
     /* Allocate memory for the UEFI memory map */
-    status = BS->AllocatePool(EfiLoaderData, memory_map_size, (void **)&memory_map);
+    status = gBS->AllocatePool(EfiLoaderData, memory_map_size, (void **)&memory_map);
     if (EFI_ERROR(status)) {
         printf("Failed to allocate memory for memory map: %lx\n", status);
         return -1;
     }
 
     /* Get the actual memory map */
-    status = BS->GetMemoryMap(&memory_map_size, memory_map, &map_key, &descriptor_size, &descriptor_version);
+    status = gBS->GetMemoryMap(&memory_map_size, memory_map, &map_key, &descriptor_size, &descriptor_version);
     if (EFI_ERROR(status)) {
         printf("Failed to get memory map: %lx\n", status);
-        BS->FreePool(memory_map);
+        gBS->FreePool(memory_map);
         return -1;
     }
 
@@ -115,7 +115,7 @@ int build_e820_map(struct csmwrap_priv *priv)
     }
 
     /* Free the UEFI memory map */
-    BS->FreePool(memory_map);
+    gBS->FreePool(memory_map);
 
     /* Save the number of entries in the low_stub */
     priv->low_stub->e820_entries = e820_entries;

src/printf.c

@@ -23,7 +23,7 @@ static void _putchar(int character, void *extra_arg) {
     CHAR16 string[2];
     string[0] = character;
     string[1] = 0;
-    ST->ConOut->OutputString(ST->ConOut, string);
+    gST->ConOut->OutputString(gST->ConOut, string);
 }
 
 int printf(const char *restrict fmt, ...) {

src/unlock_region.c

@@ -40,7 +40,7 @@
      uint32_t granularity;
 
      /* Look for the Legacy Region 2 Protocol */
-     status = BS->LocateProtocol(
+     status = gBS->LocateProtocol(
          &gEfiLegacyRegion2ProtocolGuid,
          NULL,
          (void **)&legacy_region
@@ -233,7 +233,7 @@
      EFI_STATUS status;
 
      /* First, try to use the Legacy Region 2 Protocol */
-     status = BS->LocateProtocol(
+     status = gBS->LocateProtocol(
          &gEfiLegacyRegion2ProtocolGuid,
          NULL,
          (void **)&legacy_region

src/video.c

@@ -17,7 +17,7 @@ EFI_STATUS FindGopPciDevice(struct csmwrap_priv *priv)
     EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop;
 
     // Get all handles that support GOP
-    Status = BS->LocateHandleBuffer(
+    Status = gBS->LocateHandleBuffer(
                     ByProtocol,
                     &gopGuid,
                     NULL,
@@ -32,7 +32,7 @@ EFI_STATUS FindGopPciDevice(struct csmwrap_priv *priv)
     // Iterate through each GOP handle
     for (HandleIndex = 0; HandleIndex < HandleCount; HandleIndex++) {
         // Get the GOP protocol
-        Status = BS->HandleProtocol(
+        Status = gBS->HandleProtocol(
                         HandleBuffer[HandleIndex],
                         &gopGuid,
                         (VOID**)&Gop
@@ -48,23 +48,23 @@ EFI_STATUS FindGopPciDevice(struct csmwrap_priv *priv)
     if (priv->gop == NULL) {
         printf("No GOP handle found\n");
         // Free the handle buffer
-        BS->FreePool(HandleBuffer);
+        gBS->FreePool(HandleBuffer);
         goto Out;
     }
 
-    Status = BS->HandleProtocol(
+    Status = gBS->HandleProtocol(
                     HandleBuffer[HandleIndex],
                     &DevicePathGuid,
                     (VOID**)&DevicePath
                     );
     // We are done with previous handle buffer atm
-    BS->FreePool(HandleBuffer);
+    gBS->FreePool(HandleBuffer);
     if (EFI_ERROR(Status)) {
         printf("Failed to get Device Path protocol: %d\n", Status);
         goto Out;
     }
 
-    Status = BS->LocateDevicePath(
+    Status = gBS->LocateDevicePath(
         &PciIoGuid,
         &DevicePath,
         &Handle
@@ -75,7 +75,7 @@ EFI_STATUS FindGopPciDevice(struct csmwrap_priv *priv)
         goto Out;
     }
 
-    Status = BS->HandleProtocol(
+    Status = gBS->HandleProtocol(
                     Handle,
                     &PciIoGuid,
                     (VOID**)&PciIo

src/x86thunk.c

@@ -10,7 +10,7 @@
 
 #include <libc.h>
 #include <printf.h>
-#include "x86thunk.h"
+#include "csmwrap.h"
 
 // FIXME: Are we going to implement it?
 #define ASSERT(x)
@@ -252,7 +252,7 @@ THUNK_CONTEXT  mThunkContext;
 
 bool InternalLegacyBiosFarCall (uint16_t Segment, uint16_t Offset, EFI_IA32_REGISTER_SET *Regs, void *Stack, uintptr_t StackSize)
 {
-  uintptr_t                 Status;
+//  uintptr_t                 Status;
   uint16_t                *Stack16;
 //  EFI_TPL               OriginalTpl;
   IA32_REGISTER_SET     ThunkRegSet;
@@ -300,7 +300,7 @@ bool InternalLegacyBiosFarCall (uint16_t Segment, uint16_t Offset, EFI_IA32_REGI
   //
   // The call to Legacy16 is a critical section to EFI
   //
-  // OriginalTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
+  // OriginalTpl = ggBS->RaiseTPL (TPL_HIGH_LEVEL);
 
   //
   // Check to see if there is more than one HW interrupt registers with the CPU AP.
@@ -389,7 +389,7 @@ bool InternalLegacyBiosFarCall (uint16_t Segment, uint16_t Offset, EFI_IA32_REGI
   //
   // End critical section
   //
-  // gBS->RestoreTPL (OriginalTpl);
+  // ggBS->RestoreTPL (OriginalTpl);
 
   //
   // OPROM may allocate EBDA range by itself and change EBDA base and EBDA size.
@@ -469,7 +469,7 @@ bool LegacyBiosInt86(uint8_t BiosInt, EFI_IA32_REGISTER_SET *Regs)
   Regs->X.Flags.TF        = 0;
   Regs->X.Flags.CF        = 0;
 
-#if 0
+
   //
   // The base address of legacy interrupt vector table is 0.
   // We use this base address to get the legacy interrupt handler.
@@ -478,7 +478,6 @@ bool LegacyBiosInt86(uint8_t BiosInt, EFI_IA32_REGISTER_SET *Regs)
     Segment = (UINT16)(((UINT32 *)0)[BiosInt] >> 16);
     Offset  = (UINT16)((UINT32 *)0)[BiosInt];
     );
-#endif
 
   return InternalLegacyBiosFarCall (
            Segment,