Skip to content
Prev Previous commit
Next Next commit
32X GDB stub commit
  • Loading branch information
Genos3 committed May 18, 2025
commit 5cd2ec79a69b3ea55be658a304498f5e8e6dd5a6
20 changes: 10 additions & 10 deletions ares/md/m32x/m32x.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,23 @@ auto M32X::initDebugHooks() -> void {
}
case 17: return hex(m32x.shm.regs.PR, 16, '0');
case 18: return hex(m32x.shm.regs.GBR, 16, '0');
case 19: return hex(m32x.shm.regs.VBR, 16, '0');
case 20: return hex(m32x.shm.regs.MACL, 16, '0');
case 21: return hex(m32x.shm.regs.MACH, 16, '0');
case 22: return hex(m32x.shm.regs.CCR, 16, '0');
case 23: return hex((u32)m32x.shm.regs.SR, 16, '0');
case 24: return hex(m32x.shm.regs.PPC, 16, '0');
case 25: return hex(m32x.shm.regs.PPM, 16, '0');
case 26: return hex(m32x.shm.regs.ET, 16, '0');
case 27: return hex(m32x.shm.regs.ID, 16, '0');
// case 19: return hex(m32x.shm.regs.VBR, 16, '0');
case 19: return hex(m32x.shm.regs.MACL, 16, '0');
case 20: return hex(m32x.shm.regs.MACH, 16, '0');
// case 22: return hex(m32x.shm.regs.CCR, 16, '0');
// case 23: return hex((u32)m32x.shm.regs.SR, 16, '0');
// case 24: return hex(m32x.shm.regs.PPC, 16, '0');
// case 25: return hex(m32x.shm.regs.PPM, 16, '0');
// case 26: return hex(m32x.shm.regs.ET, 16, '0');
// case 27: return hex(m32x.shm.regs.ID, 16, '0');
}

return string{"0000000000000000"};
};

GDB::server.hooks.regReadGeneral = []() {
string res{};
for(auto i : range(28)) {
for(auto i : range(21)) {
res.append(GDB::server.hooks.regRead(i));
}
return res;
Expand Down
2 changes: 1 addition & 1 deletion ares/md/m32x/sh7604.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ auto M32X::SH7604::main() -> void {
}

// if (!GDB::server.reportPC(regs.PC - 4)) return;
GDB::server.reportPC(regs.PC);
GDB::server.reportPC(regs.PC - 4);
}

if(!m32x.io.adapterReset) return step(1000);
Expand Down