From 6513dbd77530f18355cd8809af0a5b22ee8026d4 Mon Sep 17 00:00:00 2001
From: Borchev <4501931+Borchev@users.noreply.github.com>
Date: Sat, 27 Jul 2024 14:39:58 -0700
Subject: [PATCH] Fix assertions

---
 src/core/address_space.cpp | 2 +-
 src/core/memory.cpp        | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core/address_space.cpp b/src/core/address_space.cpp
index 83a407617..91c8b7a1f 100644
--- a/src/core/address_space.cpp
+++ b/src/core/address_space.cpp
@@ -463,7 +463,7 @@ void AddressSpace::Unmap(VAddr virtual_addr, size_t size, VAddr start_in_vma, VA
     impl->Unmap(virtual_addr, size, has_backing);
 
     // TODO: Determine if any titles require partial unmapping support for flexible allocations.
-    ASSERT_MSG(!has_backing && (start_in_vma != 0 || end_in_vma != size),
+    ASSERT_MSG(has_backing || (start_in_vma == 0 && end_in_vma == size),
                "Partial unmapping of flexible allocations is not supported");
 
     if (start_in_vma != 0) {
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index a65b1b2ab..6d6df63fe 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -416,8 +416,7 @@ MemoryManager::DMemHandle MemoryManager::CarveDmemArea(PAddr addr, size_t size)
     ASSERT_MSG(dmem_handle != dmem_map.end(), "Physical address not in dmem_map");
 
     const DirectMemoryArea& area = dmem_handle->second;
-    ASSERT_MSG(area.is_free && area.base <= addr,
-               "Adding an allocation to already allocated region");
+    ASSERT_MSG(area.base <= addr, "Adding an allocation to already allocated region");
 
     const PAddr start_in_area = addr - area.base;
     const PAddr end_in_vma = start_in_area + size;