diff options
| author | Léo Lam <leo@leolam.fr> | 2020-04-28 22:11:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 22:11:12 +0200 |
| commit | 4b00ddf9aaeda9b8781ede7ddb2ccccc055aa76b (patch) | |
| tree | 5dedb95c2d9a53d6b807f97e0516aab14c0b8c15 /Source/Core/DolphinQt/MenuBar.cpp | |
| parent | 54b85f6034d3f5a8b16a918f5cba34e9c6cad1a9 (diff) | |
| parent | cc858c63b8d04c5ce407c7efd0ae8abc654e73a0 (diff) | |
Merge pull request #8722 from Minty-Meeo/master
Configurable MEM1 and MEM2 sizes at runtime via Dolphin.ini
Diffstat (limited to 'Source/Core/DolphinQt/MenuBar.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MenuBar.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 3f4564c27f..25a7a1dd5b 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -26,6 +26,7 @@ #include "Core/Debugger/RSO.h" #include "Core/HLE/HLE.h" #include "Core/HW/AddressSpace.h" +#include "Core/HW/Memmap.h" #include "Core/HW/WiiSave.h" #include "Core/HW/Wiimote.h" #include "Core/IOS/ES/ES.h" @@ -1178,13 +1179,15 @@ void MenuBar::ClearSymbols() void MenuBar::GenerateSymbolsFromAddress() { - PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB); + PPCAnalyst::FindFunctions(Memory::MEM1_BASE_ADDR, + Memory::MEM1_BASE_ADDR + Memory::GetRamSizeReal(), &g_symbolDB); emit NotifySymbolsUpdated(); } void MenuBar::GenerateSymbolsFromSignatureDB() { - PPCAnalyst::FindFunctions(0x80000000, 0x81800000, &g_symbolDB); + PPCAnalyst::FindFunctions(Memory::MEM1_BASE_ADDR, + Memory::MEM1_BASE_ADDR + Memory::GetRamSizeReal(), &g_symbolDB); SignatureDB db(SignatureDB::HandlerType::DSY); if (db.Load(File::GetSysDirectory() + TOTALDB)) { @@ -1315,7 +1318,8 @@ void MenuBar::LoadSymbolMap() if (!map_exists) { g_symbolDB.Clear(); - PPCAnalyst::FindFunctions(0x81300000, 0x81800000, &g_symbolDB); + PPCAnalyst::FindFunctions(Memory::MEM1_BASE_ADDR + 0x1300000, + Memory::MEM1_BASE_ADDR + Memory::GetRamSizeReal(), &g_symbolDB); SignatureDB db(SignatureDB::HandlerType::DSY); if (db.Load(File::GetSysDirectory() + TOTALDB)) db.Apply(&g_symbolDB); @@ -1554,7 +1558,8 @@ void MenuBar::SearchInstruction() return; bool found = false; - for (u32 addr = 0x80000000; addr < 0x81800000; addr += 4) + for (u32 addr = Memory::MEM1_BASE_ADDR; addr < Memory::MEM1_BASE_ADDR + Memory::GetRamSizeReal(); + addr += 4) { auto ins_name = QString::fromStdString(PPCTables::GetInstructionName(PowerPC::HostRead_U32(addr))); |