aboutsummaryrefslogtreecommitdiff
path: root/src/common/host_memory.cpp
diff options
context:
space:
mode:
authorMrPurple666 <mrpurple666@noreply.localhost>2025-05-18 17:45:32 +0000
committerCamilleLaVey <camillelavey@noreply.localhost>2025-05-18 17:45:32 +0000
commitce5d5d2aff50f9ce8159d609824eb2391bed9ef2 (patch)
tree9d61c37db089ef8fed4fb9feda62f665aeebecd4 /src/common/host_memory.cpp
parent049cc54f4c3c1c4c38f4b308fca37e507a32f35f (diff)
THIS NEEDS TO BE CHECKED BEFORE MERGE: RAII fix, initial MSAA, some fixes for memory misallocation (#116)
• MSAA Fixes: Fixes upload/download for MSAA textures using temporary non-MSAA images. Ensures compatibility with color formats and adds fallbacks for depth/stencil. • Memory fix misallocation: Adds checks for null/zero-length operations in memory management and improves cleanup to avoid crashes (Related to crash issues due to misallocation, RP5 and 865) • Vulkan Initialization (RAII): this almost rewrites the way vulkan initializes to avoid crashes, using a correct order now (thanks @crueter for the initial fix) •Please check before merging: - Test MSAA workflows (especially color/depth transitions and low memory cases). - Verify memory operations (e.g., unmapping zero-length regions). - Check Vulkan object lifetimes and platform-specific behavior. - Check others plataforms beyond android Why is everything in one PR? Otherwise, this is all a big fix, by checking the points above we can create a branch for each one and check them by themselves. I'm not standing still while I'm away, I'm just out of time for now. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/116 Co-authored-by: MrPurple666 <mrpurple666@noreply.localhost> Co-committed-by: MrPurple666 <mrpurple666@noreply.localhost>
Diffstat (limited to 'src/common/host_memory.cpp')
-rw-r--r--src/common/host_memory.cpp31
1 files changed, 28 insertions, 3 deletions
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp
index e0b5a6a67c..d06522ec2c 100644
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -491,6 +491,12 @@ public:
// Intersect the range with our address space.
AdjustMap(&virtual_offset, &length);
+ // Skip if length is zero after adjustment
+ if (length == 0) {
+ LOG_DEBUG(HW_Memory, "Skipping zero-length mapping at virtual_offset={}", virtual_offset);
+ return;
+ }
+
// We are removing a placeholder.
free_manager.AllocateBlock(virtual_base + virtual_offset, length);
@@ -520,13 +526,21 @@ public:
// Intersect the range with our address space.
AdjustMap(&virtual_offset, &length);
+ // Skip if length is zero after adjustment
+ if (length == 0) {
+ return;
+ }
+
// Merge with any adjacent placeholder mappings.
auto [merged_pointer, merged_size] =
free_manager.FreeBlock(virtual_base + virtual_offset, length);
- void* ret = mmap(merged_pointer, merged_size, PROT_NONE,
- MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
- ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno));
+ // Only attempt to mmap if we have a valid pointer and size
+ if (merged_pointer != nullptr && merged_size > 0) {
+ void* ret = mmap(merged_pointer, merged_size, PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
+ ASSERT_MSG(ret != MAP_FAILED, "mmap failed: {}", strerror(errno));
+ }
}
void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) {
@@ -576,19 +590,26 @@ public:
private:
/// Release all resources in the object
void Release() {
+ // Make sure we release resources in the correct order
+ // First clear the free region manager to avoid any dangling references
+ free_manager.Clear();
+
if (virtual_map_base != MAP_FAILED) {
int ret = munmap(virtual_map_base, virtual_size);
ASSERT_MSG(ret == 0, "munmap failed: {}", strerror(errno));
+ virtual_map_base = reinterpret_cast<u8*>(MAP_FAILED);
}
if (backing_base != MAP_FAILED) {
int ret = munmap(backing_base, backing_size);
ASSERT_MSG(ret == 0, "munmap failed: {}", strerror(errno));
+ backing_base = reinterpret_cast<u8*>(MAP_FAILED);
}
if (fd != -1) {
int ret = close(fd);
ASSERT_MSG(ret == 0, "close failed: {}", strerror(errno));
+ fd = -1;
}
}
@@ -686,8 +707,10 @@ void HostMemory::Map(size_t virtual_offset, size_t host_offset, size_t length,
ASSERT(virtual_offset + length <= virtual_size);
ASSERT(host_offset + length <= backing_size);
if (length == 0 || !virtual_base || !impl) {
+ LOG_ERROR(HW_Memory, "Invalid mapping operation: virtual_base or impl is null");
return;
}
+ LOG_INFO(HW_Memory, "Mapping memory: virtual_offset={}, host_offset={}, length={}", virtual_offset, host_offset, length);
impl->Map(virtual_offset + virtual_base_offset, host_offset, length, perms);
}
@@ -696,8 +719,10 @@ void HostMemory::Unmap(size_t virtual_offset, size_t length, bool separate_heap)
ASSERT(length % PageAlignment == 0);
ASSERT(virtual_offset + length <= virtual_size);
if (length == 0 || !virtual_base || !impl) {
+ LOG_ERROR(HW_Memory, "Invalid unmapping operation: virtual_base or impl is null");
return;
}
+ LOG_INFO(HW_Memory, "Unmapping memory: virtual_offset={}, length={}", virtual_offset, length);
impl->Unmap(virtual_offset + virtual_base_offset, length);
}