Emulation/Avocado
1
0
Fork 0
mirror of https://github.com/JaCzekanski/Avocado.git synced 2024-06-02 19:27:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

debugger: print offset as signed hex value

Browse source
This commit is contained in:
Jakub Czekański 2019-09-10 17:09:18 +02:00
parent 7b3994971d
commit 61d21b2fcd
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/debugger/debugger.cpp
View file

@ -135,6 +135,14 @@ std::string cop2reg(unsigned int n) {
Instruction mapSpecialInstruction(mips::Opcode& i); Instruction mapSpecialInstruction(mips::Opcode& i);
std::string hexWithSign(int16_t hex) {
if (hex >= 0) {
return fmt::format("0x{:04x}", static_cast<uint16_t>(hex));
}
return fmt::format("-0x{:04x}", static_cast<uint16_t>(hex * -1));
}
Instruction decodeInstruction(mips::Opcode& i) { Instruction decodeInstruction(mips::Opcode& i) {
Instruction ins; Instruction ins;
ins.opcode = i; ins.opcode = i;
@ -142,7 +150,7 @@ Instruction decodeInstruction(mips::Opcode& i) {
#define U16(x) static_cast<unsigned short>(x) #define U16(x) static_cast<unsigned short>(x)
#define R(x) reg(x).c_str() #define R(x) reg(x).c_str()
#define LOADTYPE fmt::format("{}, 0x{:04x}({})", R(i.rt), U16(i.offset), R(i.rs)); #define LOADTYPE fmt::format("{}, {}({})", R(i.rt), hexWithSign(i.offset), R(i.rs));
#define ITYPE fmt::format("{}, {}, 0x{:04x}", R(i.rt), R(i.rs), U16(i.offset)) #define ITYPE fmt::format("{}, {}, 0x{:04x}", R(i.rt), R(i.rs), U16(i.offset))
#define JTYPE fmt::format("0x{:x}", i.target * 4) #define JTYPE fmt::format("0x{:x}", i.target * 4)
#define O(n, m, d) \ #define O(n, m, d) \