ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9537 from AdmiralCurtiss/fastmem-error-messages 

Core/Memmap: Give more detailed error messages if memory mapping fails.
This commit is contained in:
Léo Lam 2021-03-02 02:47:12 +01:00 committed by GitHub
parent 010279f4e6 918f3d92e0
commit 0c9f11af47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/HW/Memmap.cpp
View File

@ -18,6 +18,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MemArena.h" #include "Common/MemArena.h"
#include "Common/MsgHandler.h"
#include "Common/Swap.h" #include "Common/Swap.h"
#include "Core/Config/MainSettings.h" #include "Core/Config/MainSettings.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
@ -299,7 +300,9 @@ void Init()
if (!*region.out_pointer) if (!*region.out_pointer)
{ {
PanicAlertFmt("MemoryMap_Setup: Failed finding a memory base."); PanicAlertFmt(
"Memory::Init(): Failed to create view for physical region at 0x{:08X} (size 0x{:08X}).",
region.physical_address, region.size);
exit(0); exit(0);
} }
} }
@ -321,7 +324,10 @@ bool InitFastmemArena()
physical_base = Common::MemArena::FindMemoryBase(); physical_base = Common::MemArena::FindMemoryBase();
if (!physical_base) if (!physical_base)
{
PanicAlertFmt("Memory::InitFastmemArena(): Failed finding a memory base.");
return false; return false;
}
for (PhysicalMemoryRegion& region : physical_regions) for (PhysicalMemoryRegion& region : physical_regions)
{ {
@ -333,6 +339,9 @@ bool InitFastmemArena()
if (base != view) if (base != view)
{ {
PanicAlertFmt("Memory::InitFastmemArena(): Failed to map memory region at 0x{:08X} "
"(size 0x{:08X}) into physical fastmem region.",
region.physical_address, region.size);
return false; return false;
} }
} }
@ -379,7 +388,9 @@ void UpdateLogicalMemory(const PowerPC::BatTable& dbat_table)
void* mapped_pointer = g_arena.CreateView(position, mapped_size, base); void* mapped_pointer = g_arena.CreateView(position, mapped_size, base);
if (!mapped_pointer) if (!mapped_pointer)
{ {
PanicAlertFmt("MemoryMap_Setup: Failed finding a memory base."); PanicAlertFmt("Memory::UpdateLogicalMemory(): Failed to map memory region at 0x{:08X} "
"(size 0x{:08X}) into logical fastmem region at 0x{:08X}.",
intersection_start, mapped_size, logical_address);
exit(0); exit(0);
} }
logical_mapped_entries.push_back({mapped_pointer, mapped_size}); logical_mapped_entries.push_back({mapped_pointer, mapped_size});