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

fix last commit

This commit is contained in:
thrust26 2020-03-31 18:35:51 +02:00
parent cae2266df0
commit 2de1e70941
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/debugger/CartDebug.cxx
View File

@ -385,7 +385,7 @@ int CartDebug::addressToLine(uInt16 address) const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string CartDebug::disassemble(uInt16 start, uInt16 lines) const string CartDebug::disassembleLines(uInt16 start, uInt16 lines) const
{ {
// Fill the string with disassembled data // Fill the string with disassembled data
start &= 0xFFF; start &= 0xFFF;
@ -1096,8 +1096,6 @@ string CartDebug::saveDisassembly()
BankInfo& info = myBankInfo[bank]; BankInfo& info = myBankInfo[bank];
// TODO: make PageAccess ready for multi-bank ROMs
// TODO: define offset if still undefined
disassembleBank(bank); disassembleBank(bank);
// An empty address list means that DiStella can't do a disassembly // An empty address list means that DiStella can't do a disassembly
@ -1126,7 +1124,7 @@ string CartDebug::saveDisassembly()
else else
buf << " ORG $" << Base::HEX4 << origin << "\n" buf << " ORG $" << Base::HEX4 << origin << "\n"
<< " RORG $" << Base::HEX4 << info.offset << "\n\n"; << " RORG $" << Base::HEX4 << info.offset << "\n\n";
origin += info.size; origin += uInt32(info.size);
// Format in 'distella' style // Format in 'distella' style
for(uInt32 i = 0; i < disasm.list.size(); ++i) for(uInt32 i = 0; i < disasm.list.size(); ++i)

2
src/debugger/CartDebug.hxx
View File

@ -127,7 +127,7 @@ class CartDebug : public DebuggerSystem
@return The disassembly represented as a string @return The disassembly represented as a string
*/ */
string disassemble(uInt16 start, uInt16 lines) const; string disassembleLines(uInt16 start, uInt16 lines) const;
/** /**
Add a directive to the disassembler. Directives are basically overrides Add a directive to the disassembler. Directives are basically overrides

2
src/debugger/DebuggerParser.cxx
View File

@ -1082,7 +1082,7 @@ void DebuggerParser::executeDisasm()
return; return;
} }
commandResult << debugger.cartDebug().disassemble(start, lines); commandResult << debugger.cartDebug().disassembleLines(start, lines);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -