diff options
| author | 2014-09-08 00:10:13 -0400 | |
|---|---|---|
| committer | 2014-09-08 00:10:13 -0400 | |
| commit | 335082e74e5f015450f1ad57cb90d1f8fd4afbdb (patch) | |
| tree | 576c57f45d933885d31f7eddfbf85167bc1b88ac /src/citra_qt/debugger/callstack.cpp | |
| parent | Merge pull request #87 from archshift/remove-cruft (diff) | |
| parent | core: Make the ARM disassembler use std::string internally (diff) | |
| download | yuzu-335082e74e5f015450f1ad57cb90d1f8fd4afbdb.tar.gz yuzu-335082e74e5f015450f1ad57cb90d1f8fd4afbdb.tar.xz yuzu-335082e74e5f015450f1ad57cb90d1f8fd4afbdb.zip | |
Merge pull request #95 from lioncash/disassembler
core: Make the ARM disassembler use std::string internally
Diffstat (limited to 'src/citra_qt/debugger/callstack.cpp')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index f59f2d8c8..77fb0c9ed 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp | |||
| @@ -37,7 +37,7 @@ void CallstackWidget::OnCPUStepped() | |||
| 37 | 37 | ||
| 38 | /* TODO (mattvail) clean me, move to debugger interface */ | 38 | /* TODO (mattvail) clean me, move to debugger interface */ |
| 39 | u32 insn = Memory::Read32(call_addr); | 39 | u32 insn = Memory::Read32(call_addr); |
| 40 | if (disasm->decode(insn) == OP_BL) | 40 | if (disasm->Decode(insn) == OP_BL) |
| 41 | { | 41 | { |
| 42 | std::string name; | 42 | std::string name; |
| 43 | // ripped from disasm | 43 | // ripped from disasm |