From 9a2bef97dafdfc8ee9b8e91f71f1173cdd6cd3d8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 18 Jun 2017 06:58:44 +0100 Subject: [PATCH 1/2] JitCache: use SymbolDB names as JIT block names --- Source/Core/Core/PowerPC/JitCommon/JitCache.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index efad560110..b70e7a103b 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -22,6 +22,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/PowerPC/JitCommon/JitBase.h" +#include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 @@ -131,7 +132,12 @@ void JitBaseBlockCache::FinalizeBlock(JitBlock& block, bool block_link, LinkBlock(block); } - JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_%08x", block.physicalAddress); + if (Symbol* symbol = g_symbolDB.GetSymbolFromAddr(block.effectiveAddress)) + JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_%s_%08x", + symbol->function_name.c_str(), block.physicalAddress); + else + JitRegister::Register(block.checkedEntry, block.codeSize, "JIT_PPC_%08x", + block.physicalAddress); } JitBlock* JitBaseBlockCache::GetBlockFromStartAddress(u32 addr, u32 msr) From 2adaeae87cf5e14b2e4b4f3c23526ae21163df5d Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 18 Jun 2017 06:59:53 +0100 Subject: [PATCH 2/2] Tools: update perf-disassemble.sh The -P command line option doesn't exist anymore. --- Tools/perf-disassemble.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/perf-disassemble.sh b/Tools/perf-disassemble.sh index d338b7141e..323cb8fcd9 100755 --- a/Tools/perf-disassemble.sh +++ b/Tools/perf-disassemble.sh @@ -9,8 +9,8 @@ # kernel.yama.ptrace_scope = 0 # # Example usage: -# $ dolphin-emu -P /tmp -b -e $game -# $ perf top -p $(pidof dolphin-emu) --objdump ./Tools/perf-disassemble.sh +# $ dolphin-emu -C Dolphin.Core.PerfMapDir=/tmp -b -e $game +# $ perf top -p $(pidof dolphin-emu) --objdump ./Tools/perf-disassemble.sh -M intel flavor=att raw=r