summaryrefslogtreecommitdiffstats
path: root/src/common/mem_arena.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-20 17:41:30 +0100
committerbunnei <bunneidev@gmail.com>2015-02-20 17:41:30 +0100
commit5f9939070e81691e04facca9ff431070988e5b05 (patch)
tree9bd54cdde2c34dd2f63e0396260335f267a46ce1 /src/common/mem_arena.cpp
parentMerge pull request #587 from archshift/assert (diff)
parentMisc cleanup of common and related functions (diff)
downloadyuzu-5f9939070e81691e04facca9ff431070988e5b05.tar
yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.gz
yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.bz2
yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.lz
yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.xz
yuzu-5f9939070e81691e04facca9ff431070988e5b05.tar.zst
yuzu-5f9939070e81691e04facca9ff431070988e5b05.zip
Diffstat (limited to '')
-rw-r--r--src/common/mem_arena.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/mem_arena.cpp b/src/common/mem_arena.cpp
index a20361d6f..cc31a88cc 100644
--- a/src/common/mem_arena.cpp
+++ b/src/common/mem_arena.cpp
@@ -218,7 +218,7 @@ u8* MemArena::Find4GBBase()
void* base = mmap(0, 0x10000000, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_SHARED, -1, 0);
if (base == MAP_FAILED) {
- PanicAlert("Failed to map 256 MB of memory space: %s", strerror(errno));
+ LOG_ERROR(Common_Memory, "Failed to map 256 MB of memory space: %s", strerror(errno));
return 0;
}
munmap(base, 0x10000000);
@@ -338,7 +338,7 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
// address space.
if (!Memory_TryBase(base, views, num_views, flags, arena))
{
- PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
+ LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base.");
return 0;
}
#elif defined(_WIN32)
@@ -363,12 +363,11 @@ u8 *MemoryMap_Setup(const MemoryView *views, int num_views, u32 flags, MemArena
if (!Memory_TryBase(base, views, num_views, flags, arena))
{
LOG_ERROR(Common_Memory, "MemoryMap_Setup: Failed finding a memory base.");
- PanicAlert("MemoryMap_Setup: Failed finding a memory base.");
return 0;
}
#endif
if (base_attempts)
- PanicAlert("No possible memory base pointer found!");
+ LOG_ERROR(Common_Memory, "No possible memory base pointer found!");
return base;
}