From da0908d5e2a13fc5e72926324f1c867da5614a92 Mon Sep 17 00:00:00 2001
From: Nicholas Bishop <nbishop@nbishop.net>
Date: Sun, 25 Aug 2024 15:47:31 -0400
Subject: [PATCH] uefi: Update panic handler to use the global system table

---
 uefi/src/helpers/panic_handler.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/uefi/src/helpers/panic_handler.rs b/uefi/src/helpers/panic_handler.rs
index 5918395b8..79359b726 100644
--- a/uefi/src/helpers/panic_handler.rs
+++ b/uefi/src/helpers/panic_handler.rs
@@ -1,5 +1,4 @@
-use crate::println;
-use crate::table::system_table_boot;
+use crate::{boot, println};
 use cfg_if::cfg_if;
 
 #[panic_handler]
@@ -7,8 +6,8 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! {
     println!("[PANIC]: {}", info);
 
     // Give the user some time to read the message
-    if let Some(st) = system_table_boot() {
-        st.boot_services().stall(10_000_000);
+    if boot::are_boot_services_active() {
+        boot::stall(10_000_000);
     } else {
         let mut dummy = 0u64;
         // FIXME: May need different counter values in debug & release builds
@@ -28,10 +27,10 @@ fn panic_handler(info: &core::panic::PanicInfo) -> ! {
             qemu_exit_handle.exit_failure();
         } else {
             // If the system table is available, use UEFI's standard shutdown mechanism
-            if let Some(st) = system_table_boot() {
-                use crate::table::runtime::ResetType;
-                st.runtime_services()
-                    .reset(ResetType::SHUTDOWN, crate::Status::ABORTED, None);
+            if let Some(st) = crate::table::system_table_raw() {
+                if !unsafe { st.as_ref().runtime_services }.is_null() {
+                    crate::runtime::reset(crate::runtime::ResetType::SHUTDOWN, crate::Status::ABORTED, None);
+                }
             }
 
             // If we don't have any shutdown mechanism handy, the best we can do is loop