ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reformatted the ARM fatal error popup a little bit

This commit is contained in:
Thomas Jentzsch 2021-08-25 23:15:52 +02:00
parent 66233326b6
commit 8bd023f1a1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emucore/Thumbulator.cxx
View File

@ -247,7 +247,7 @@ inline int Thumbulator::fatalError(const char* opcode, uInt32 v1, uInt32 v2,
statusMsg << "Thumb ARM emulation fatal error: " << endl statusMsg << "Thumb ARM emulation fatal error: " << endl
<< opcode << "(" << Base::HEX8 << v1 << "," << v2 << "), " << msg << endl; << opcode << "(" << Base::HEX8 << v1 << "," << v2 << "), " << msg << endl;
dump_regs(); dump_regs();
if(trapOnFatal) if(trapOnFatal)
throw runtime_error(statusMsg.str()); throw runtime_error(statusMsg.str());
return 0; return 0;
} }
@ -269,15 +269,17 @@ void Thumbulator::dump_regs()
{ {
for (int cnt = 0; cnt <= 12; cnt++) for (int cnt = 0; cnt <= 12; cnt++)
{ {
statusMsg << "R" << cnt << " = " << Base::HEX8 << reg_norm[cnt] << " "; statusMsg << "R" << std::dec << std::setfill(' ') << std::setw(2) << std::left << cnt
<< "= " << Base::HEX8 << reg_norm[cnt];
if((cnt + 1) % 4 == 0) if((cnt + 1) % 4 == 0)
statusMsg << endl; statusMsg << endl;
else
statusMsg << " ";
} }
statusMsg << endl statusMsg << endl
<< "SP = " << Base::HEX8 << reg_norm[13] << " " << "SP = " << Base::HEX8 << reg_norm[13] << " "
<< "LR = " << Base::HEX8 << reg_norm[14] << " " << "LR = " << Base::HEX8 << reg_norm[14] << " "
<< "PC = " << Base::HEX8 << reg_norm[15] << " " << "PC = " << Base::HEX8 << reg_norm[15] << endl;
<< endl;
} }
#endif #endif