[libc][uefi] move uefi system table & image to app config

Author: RossComputerGuy

libc/config/app.h

@@ -15,6 +15,8 @@
 #include "gpu/app.h"
 #elif defined(__linux__)
 #include "linux/app.h"
+#elif defined(__UEFI__)
+#include "uefi/app.h"
 #endif
 
 #endif // LLVM_LIBC_CONFIG_APP_H

libc/config/uefi/app.h

@@ -0,0 +1,34 @@
+//===-- Classes to capture properites of UEFI applications ------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_CONFIG_UEFI_APP_H
+#define LLVM_LIBC_CONFIG_UEFI_APP_H
+
+#include "include/llvm-libc-types/EFI_HANDLE.h"
+#include "include/llvm-libc-types/EFI_SYSTEM_TABLE.h"
+#include "src/__support/macros/config.h"
+#include "src/__support/macros/properties/architectures.h"
+
+#include <stdint.h>
+
+namespace LIBC_NAMESPACE_DECL {
+
+// Data structure which captures properties of a UEFI application.
+struct AppProperties {
+  // UEFI system table
+  EFI_SYSTEM_TABLE *system_table;
+
+  // UEFI image handle
+  EFI_HANDLE image_handle;
+};
+
+[[gnu::weak]] extern AppProperties app;
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_CONFIG_UEFI_APP_H

libc/include/Uefi.yaml

@@ -9,8 +9,4 @@ types:
   - type_name: EFI_SYSTEM_TABLE
 enums: []
 functions: []
-objects:
-  - object_name: __llvm_libc_efi_system_table
-    object_type: EFI_SYSTEM_TABLE *
-  - object_name: __llvm_libc_efi_image_handle
-    object_type: EFI_HANDLE
+objects: []

libc/src/__support/OSUtil/uefi/CMakeLists.txt

@@ -6,6 +6,7 @@ add_object_library(
   HDRS
     io.h
   DEPENDS
+    libc.config.app_h
     libc.include.llvm-libc-types.EFI_SYSTEM_TABLE
     libc.src.__support.common
     libc.src.__support.CPP.string_view

libc/src/__support/OSUtil/uefi/exit.cpp

@@ -7,15 +7,16 @@
 //===-----------------------------------------------------------------===//
 
 #include "src/__support/OSUtil/exit.h"
+#include "config/uefi/app.h"
 #include "include/llvm-libc-types/EFI_SYSTEM_TABLE.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 
 [[noreturn]] void exit(int status) {
-  __llvm_libc_efi_system_table->BootServices->Exit(__llvm_libc_efi_image_handle,
-                                                   status, 0, nullptr);
+  app.system_table->BootServices->Exit(__llvm_libc_efi_image_handle, status, 0,
+                                       nullptr);
   __builtin_unreachable();
 }
 

libc/src/__support/OSUtil/uefi/io.cpp

@@ -9,6 +9,7 @@
 #include "io.h"
 
 #include "Uefi.h"
+#include "config/uefi/app.h"
 #include "src/__support/CPP/string_view.h"
 #include "src/__support/macros/config.h"
 
@@ -23,19 +24,17 @@ void write_to_stdout(cpp::string_view msg) {
   // TODO: use mbstowcs once implemented
   for (size_t i = 0; i < msg.size(); i++) {
     char16_t e[2] = {msg[i], 0};
-    __llvm_libc_efi_system_table->ConOut->OutputString(
-        __llvm_libc_efi_system_table->ConOut,
-        reinterpret_cast<const char16_t *>(&e));
+    app.system_table->ConOut->OutputString(
+        app.system_table->ConOut, reinterpret_cast<const char16_t *>(&e));
   }
 }
 
 void write_to_stderr(cpp::string_view msg) {
   // TODO: use mbstowcs once implemented
   for (size_t i = 0; i < msg.size(); i++) {
     char16_t e[2] = {msg[i], 0};
-    __llvm_libc_efi_system_table->StdErr->OutputString(
-        __llvm_libc_efi_system_table->StdErr,
-        reinterpret_cast<const char16_t *>(&e));
+    app.system_table->StdErr->OutputString(
+        app.system_table->StdErr, reinterpret_cast<const char16_t *>(&e));
   }
 }
 

libc/startup/uefi/CMakeLists.txt

@@ -34,6 +34,7 @@ add_startup_object(
   SRCS
     crt1.cpp
   DEPENDS
+    libc.config.app_h
     libc.src.__support.OSUtil.uefi.uefi_util
 )
 

libc/startup/uefi/crt1.cpp

@@ -6,25 +6,28 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "include/llvm-libc-macros/stdlib-macros.h"
-#include "include/llvm-libc-types/EFI_HANDLE.h"
 #include "include/llvm-libc-types/EFI_STATUS.h"
-#include "include/llvm-libc-types/EFI_SYSTEM_TABLE.h"
+#include "config/uefi/app.h"
 #include "src/__support/OSUtil/uefi/error.h"
 #include "src/__support/macros/config.h"
 
+namespace LIBC_NAMESPACE_DECL {
+AppProperties app;
+}
+
 extern "C" {
 EFI_HANDLE __llvm_libc_efi_image_handle;
 EFI_SYSTEM_TABLE *__llvm_libc_efi_system_table;
 
 int main(int argc, char **argv, char **envp);
 
 EFI_STATUS EfiMain(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) {
-  __llvm_libc_efi_image_handle = ImageHandle;
-  __llvm_libc_efi_system_table = SystemTable;
+  LIBC_NAMESPACE::app.image_handle = ImageHandle;
+  LIBC_NAMESPACE::app.system_table = SystemTable;
 
   // TODO: we need the EFI_SHELL_PROTOCOL, malloc, free, and UTF16 -> UTF8
   // conversion.
   return LIBC_NAMESPACE::errno_to_uefi_status(main(0, nullptr, nullptr));
 }
+
 }