From 9bcabc3bc5b39fa96bd244ee57559547a4e4f816 Mon Sep 17 00:00:00 2001
From: Stephen Miller <millerste004@gmail.com>
Date: Tue, 10 Jun 2025 18:10:46 -0500
Subject: [PATCH] Fix DirectMemoryArea::CanMergeWith

Don't merge dmem areas if the memory types are different.
---
 src/core/memory.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/memory.h b/src/core/memory.h
index 68f9c26c4..6a9b29382 100644
--- a/src/core/memory.h
+++ b/src/core/memory.h
@@ -75,6 +75,9 @@ struct DirectMemoryArea {
         if (base + size != next.base) {
             return false;
         }
+        if (memory_type != next.memory_type) {
+            return false;
+        }
         if (is_free != next.is_free) {
             return false;
         }