diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-08-19 04:52:44 -0300 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-09-07 16:46:27 -0300 |
| commit | 8540e021768c8c148334b757cffdfc6db73ba54e (patch) | |
| tree | 47d05c46d0cc17c32373dbc1ccfce3bc814d22ec | |
| parent | 3194f40e96fcef87a2aeab95e52596d1bf3d973c (diff) | |
Shader Disassembly: Fix printing of jump offsets
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 131b13952..59b63cd54 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp @@ -104,7 +104,7 @@ QVariant GraphicsVertexShaderModel::data(const QModelIndex& index, int role) con case 2: { std::ostringstream output; - output.flags(std::ios::hex | std::ios::uppercase); + output.flags(std::ios::uppercase); // To make the code aligning columns of assembly easier to keep track of, this function // keeps track of the start of the start of the previous column, allowing alignment @@ -264,16 +264,16 @@ QVariant GraphicsVertexShaderModel::data(const QModelIndex& index, int role) con u32 target_addr_else = instr.flow_control.dest_offset; if (opcode_info.subtype & OpCode::Info::HasAlternative) { - output << "else jump to 0x" << std::setw(4) << std::right << std::setfill('0') << (4 * instr.flow_control.dest_offset); + output << "else jump to 0x" << std::setw(4) << std::right << std::setfill('0') << std::hex << (4 * instr.flow_control.dest_offset); } else if (opcode_info.subtype & OpCode::Info::HasExplicitDest) { - output << "jump to 0x" << std::setw(4) << std::right << std::setfill('0') << (4 * instr.flow_control.dest_offset); + output << "jump to 0x" << std::setw(4) << std::right << std::setfill('0') << std::hex << (4 * instr.flow_control.dest_offset); } else { // TODO: Handle other cases output << "(unknown destination)"; } if (opcode_info.subtype & OpCode::Info::HasFinishPoint) { - output << " (return on " << std::setw(4) << std::right << std::setfill('0') + output << " (return on 0x" << std::setw(4) << std::right << std::setfill('0') << std::hex << (4 * instr.flow_control.dest_offset + 4 * instr.flow_control.num_instructions) << ')'; } |