summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-09-06 20:37:19 +0200
committerLioncash <mathew1800@gmail.com>2014-09-06 20:45:56 +0200
commit403c84cdabe0eab9b2ec1a1effdb9beac5d09853 (patch)
tree1f9c5fdc2f9b217ab881d8d822e66f482cd41b73 /src/citra_qt
parentMerge pull request #88 from archshift/remove-atomic (diff)
downloadyuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar.gz
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar.bz2
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar.lz
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar.xz
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.tar.zst
yuzu-403c84cdabe0eab9b2ec1a1effdb9beac5d09853.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/debugger/callstack.cpp2
-rw-r--r--src/citra_qt/debugger/disassembler.cpp8
2 files changed, 4 insertions, 6 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()
/* TODO (mattvail) clean me, move to debugger interface */
u32 insn = Memory::Read32(call_addr);
- if (disasm->decode(insn) == OP_BL)
+ if (disasm->Decode(insn) == OP_BL)
{
std::string name;
// ripped from disasm
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index 507a35718..856baf63d 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -36,22 +36,20 @@ QVariant DisassemblerModel::data(const QModelIndex& index, int role) const {
switch (role) {
case Qt::DisplayRole:
{
- static char result[255];
-
u32 address = base_address + index.row() * 4;
u32 instr = Memory::Read32(address);
- ARM_Disasm::disasm(address, instr, result);
+ std::string disassembly = ARM_Disasm::Disassemble(address, instr);
if (index.column() == 0) {
return QString("0x%1").arg((uint)(address), 8, 16, QLatin1Char('0'));
} else if (index.column() == 1) {
- return QString::fromLatin1(result);
+ return QString::fromStdString(disassembly);
} else if (index.column() == 2) {
if(Symbols::HasSymbol(address)) {
TSymbol symbol = Symbols::GetSymbol(address);
return QString("%1 - Size:%2").arg(QString::fromStdString(symbol.name))
.arg(symbol.size / 4); // divide by 4 to get instruction count
- } else if (ARM_Disasm::decode(instr) == OP_BL) {
+ } else if (ARM_Disasm::Decode(instr) == OP_BL) {
u32 offset = instr & 0xFFFFFF;
// Sign-extend the 24-bit offset