From 195b7496f420cec8d5ef98dad5f0d519256e0a57 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 18 Mar 2022 23:33:42 -0400
Subject: [PATCH] HELLO: Include EfiLoaderCode and EfiLoaderData memory regions
 in memory map

---
 src/hello/hello.d | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/hello/hello.d b/src/hello/hello.d
index 9948770..4c2f47e 100644
--- a/src/hello/hello.d
+++ b/src/hello/hello.d
@@ -112,9 +112,11 @@ private bool get_memory_map()
     for (size_t i = 0u; i < n_entries; i++)
     {
         EFI_MEMORY_DESCRIPTOR * descriptor = cast(EFI_MEMORY_DESCRIPTOR *)&scratch_base[i * descriptor_size];
-        if ((descriptor.Type == EfiConventionalMemory) ||
+        if ((descriptor.Type == EfiLoaderCode) ||
+            (descriptor.Type == EfiLoaderData) ||
             (descriptor.Type == EfiBootServicesCode) ||
-            (descriptor.Type == EfiBootServicesData))
+            (descriptor.Type == EfiBootServicesCode) ||
+            (descriptor.Type == EfiConventionalMemory))
         {
             bootinfo.memory_map[di].base = descriptor.PhysicalStart;
             bootinfo.memory_map[di].size = descriptor.NumberOfPages * 4096u;