Disable EFI64 runtime APIs when -legacy is used on 32-bit kernels

acidanthera · Jul 27, 2022 · 329ade4 · 329ade4
1 parent 2ff83c6
commit 329ade4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,7 @@ Lilu Changelog
 ==============
 #### v1.6.2
 - Fixed KC segment name, which also fixed kernel panic on macOS 13 b3
+- Disable EFI64 runtime APIs when `-legacy` is used on 32-bit kernels
 
 #### v1.6.1
 - Allow loading on macOS 13 without `-lilubetaall`

diff --git a/Lilu/Sources/kern_efi.cpp b/Lilu/Sources/kern_efi.cpp
@@ -139,11 +139,18 @@ void EfiRuntimeServices::activate() {
 	if (efi) {
 		auto abi = OSDynamicCast(OSData, efi->getProperty("firmware-abi"));
 		if (abi && abi->isEqualTo("EFI64", sizeof("EFI64"))) {
-			services = new EfiRuntimeServices;
-			services->is32BitEFI = false;
-			services->setRuntimeServices();
-
 #if defined(__i386__)
+			// If kernel is forced to pure 32-bit mode, do not load EFI64 services.
+			if (!checkKernelArgument("-legacy")) {
+#endif
+				services = new EfiRuntimeServices;
+				services->is32BitEFI = false;
+				services->setRuntimeServices();
+#if defined(__i386__)
+			} else {
+				SYSLOG("efi", "EFI64 not supported due to -legacy");
+			}
+
 		} else if (abi && abi->isEqualTo("EFI32", sizeof("EFI32"))) {
 			services = new EfiRuntimeServices;
 			services->is32BitEFI = true;