diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-08-11 23:32:39 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-08-11 23:38:44 +0200 |
| commit | 5115d0177ed9f77b091adbbbfd22f2f0a568a4bb (patch) | |
| tree | 3a243eee2146980bcbd708a552ca082d172eeda7 /src/citra_qt/debugger/callstack.cpp | |
| parent | Merge pull request #1028 from aroulin/arm-disas-media-instr (diff) | |
| download | yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.gz yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.bz2 yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.lz yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.xz yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.zst yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.zip | |
Diffstat (limited to 'src/citra_qt/debugger/callstack.cpp')
| -rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 6799ce844..e97e81b65 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -4,12 +4,14 @@ #include <QStandardItemModel> +#include "common/common_types.h" +#include "common/symbols.h" + #include "callstack.h" #include "core/core.h" #include "core/arm/arm_interface.h" #include "core/memory.h" -#include "common/symbols.h" #include "core/arm/disassembler/arm_disasm.h" CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent) @@ -49,8 +51,8 @@ void CallstackWidget::OnDebugModeEntered() { std::string name; // ripped from disasm - uint8_t cond = (insn >> 28) & 0xf; - uint32_t i_offset = insn & 0xffffff; + u8 cond = (insn >> 28) & 0xf; + u32 i_offset = insn & 0xffffff; // Sign-extend the 24-bit offset if ((i_offset >> 23) & 1) i_offset |= 0xff000000; |