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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2017-11-24 20:38:47 +01:00
parent 08f29ca808 9ada07a733
commit 8fd33ed103
4 changed files with 373 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

358
src/debugger/DebuggerParser.cxx
View File

@ -58,7 +58,9 @@ using std::right;
DebuggerParser::DebuggerParser(Debugger& d, Settings& s)
: debugger(d),
settings(s),
argCount(0)
argCount(0),
execDepth(0),
execPrefix("")
{
}
@ -1020,23 +1022,28 @@ void DebuggerParser::executeDisasm()
// "dump"
void DebuggerParser::executeDump()
{
auto dump = [&](int start, int end)
auto dump = [&](ostream& os, int start, int end)
{
for(int i = start; i <= end; i += 16)
{
// Print label every 16 bytes
commandResult << Base::toString(i) << ": ";
os << Base::toString(i) << ": ";
for(int j = i; j < i+16 && j <= end; ++j)
{
commandResult << Base::toString(debugger.peek(j)) << " ";
if(j == i+7 && j != end) commandResult << "- ";
os << Base::toString(debugger.peek(j)) << " ";
if(j == i+7 && j != end) os << "- ";
}
commandResult << endl;
os << endl;
}
};
// Error checking
if( argCount == 0 || argCount > 3)
{
outputCommandError("wrong number of arguments", myCommand);
return;
}
if(argCount > 1 && args[1] < args[0])
{
commandResult << red("start address must be <= end address");
@ -1044,14 +1051,75 @@ void DebuggerParser::executeDump()
}
if(argCount == 1)
dump(args[0], args[0] + 127);
else if(argCount == 2)
dump(args[0], args[1]);
else
dump(commandResult, args[0], args[0] + 127);
else if(argCount == 2 || args[2] == 0)
dump(commandResult, args[0], args[1]);
else {
ostringstream file;
file << debugger.myOSystem.snapshotSaveDir() << debugger.myOSystem.console().properties().get(Cartridge_Name) << "_dbg_";
if (execDepth > 0) {
file << execPrefix;
}
else {
file << std::hex << std::setw(8) << std::setfill('0') << uInt32(debugger.myOSystem.getTicks()/1000);
}
file << ".dump";
FilesystemNode node(file.str());
// cout << "dump " << args[0] << "-" << args[1] << " to " << file.str() << endl;
ofstream ofs(node.getPath(), ofstream::out | ofstream::app);
if(!ofs.is_open())
{
outputCommandError("wrong number of arguments", myCommand);
outputCommandError("Unable to append dump to file " + node.getShortPath(), myCommand);
return;
}
if ((args[2] & 0x01) != 0) {
// dump memory
dump(ofs, args[0], args[1]);
}
if ((args[2] & 0x02) != 0) {
// dump CPU state
CpuDebug& cpu = debugger.cpuDebug();
ofs << "XC: "
<< Base::toString(cpu.pc()&0xff) << " " // PC lsb
<< Base::toString(cpu.pc()>>8) << " " // PC msb
<< Base::toString(cpu.sp()) << " " // SP
<< Base::toString(cpu.a()) << " " // A
<< Base::toString(cpu.x()) << " " // X
<< Base::toString(cpu.y()) << " " // Y
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " - " // unused
<< Base::toString(cpu.n()) << " " // N (flag)
<< Base::toString(cpu.v()) << " " // V (flag)
<< Base::toString(cpu.b()) << " " // B (flag)
<< Base::toString(cpu.d()) << " " // D (flag)
<< Base::toString(cpu.i()) << " " // I (flag)
<< Base::toString(cpu.z()) << " " // Z (flag)
<< Base::toString(cpu.c()) << " " // C (flag)
<< Base::toString(0) << " " // unused
<< endl;
}
if ((args[2] & 0x04) != 0) {
// dump SWCHx/INPTx state
ofs << "XS: "
<< Base::toString(debugger.peek(0x280)) << " " // SWCHA
<< Base::toString(0) << " " // unused
<< Base::toString(debugger.peek(0x282)) << " " // SWCHB
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " - " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< Base::toString(debugger.peek(TIARegister::INPT4)) << " "
<< Base::toString(debugger.peek(TIARegister::INPT5)) << " "
<< Base::toString(0) << " " // unused
<< Base::toString(0) << " " // unused
<< endl;
}
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1062,9 +1130,22 @@ void DebuggerParser::executeExec()
string file = argStrings[0];
if(file.find_last_of('.') == string::npos)
file += ".script";
FilesystemNode node(file);
if (!node.exists()) {
node = FilesystemNode(debugger.myOSystem.defaultSaveDir() + file);
}
FilesystemNode node(debugger.myOSystem.defaultSaveDir() + file);
if (argCount == 2) {
execPrefix = argStrings[1];
}
else {
ostringstream prefix;
prefix << std::hex << std::setw(8) << std::setfill('0') << uInt32(debugger.myOSystem.getTicks()/1000);
execPrefix = prefix.str();
}
execDepth++;
commandResult << exec(node);
execDepth--;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1161,6 +1242,116 @@ void DebuggerParser::executeHelp()
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy0up"
void DebuggerParser::executeJoy0Up()
{
Controller& controller = debugger.riotDebug().controller(Controller::Left);
if(argCount == 0)
controller.set(Controller::One, !controller.read(Controller::One));
else if(argCount == 1)
controller.set(Controller::One, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy0down"
void DebuggerParser::executeJoy0Down()
{
Controller& controller = debugger.riotDebug().controller(Controller::Left);
if(argCount == 0)
controller.set(Controller::Two, !controller.read(Controller::Two));
else if(argCount == 1)
controller.set(Controller::Two, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy0left"
void DebuggerParser::executeJoy0Left()
{
Controller& controller = debugger.riotDebug().controller(Controller::Left);
if(argCount == 0)
controller.set(Controller::Three, !controller.read(Controller::Three));
else if(argCount == 1)
controller.set(Controller::Three, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy0right"
void DebuggerParser::executeJoy0Right()
{
Controller& controller = debugger.riotDebug().controller(Controller::Left);
if(argCount == 0)
controller.set(Controller::Four, !controller.read(Controller::Four));
else if(argCount == 1)
controller.set(Controller::Four, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy0fire"
void DebuggerParser::executeJoy0Fire()
{
Controller& controller = debugger.riotDebug().controller(Controller::Left);
if(argCount == 0)
controller.set(Controller::Six, !controller.read(Controller::Six));
else if(argCount == 1)
controller.set(Controller::Six, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy1up"
void DebuggerParser::executeJoy1Up()
{
Controller& controller = debugger.riotDebug().controller(Controller::Right);
if(argCount == 0)
controller.set(Controller::One, !controller.read(Controller::One));
else if(argCount == 1)
controller.set(Controller::One, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy1down"
void DebuggerParser::executeJoy1Down()
{
Controller& controller = debugger.riotDebug().controller(Controller::Right);
if(argCount == 0)
controller.set(Controller::Two, !controller.read(Controller::Two));
else if(argCount == 1)
controller.set(Controller::Two, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy1left"
void DebuggerParser::executeJoy1Left()
{
Controller& controller = debugger.riotDebug().controller(Controller::Right);
if(argCount == 0)
controller.set(Controller::Three, !controller.read(Controller::Three));
else if(argCount == 1)
controller.set(Controller::Three, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy1right"
void DebuggerParser::executeJoy1Right()
{
Controller& controller = debugger.riotDebug().controller(Controller::Right);
if(argCount == 0)
controller.set(Controller::Four, !controller.read(Controller::Four));
else if(argCount == 1)
controller.set(Controller::Four, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "joy1fire"
void DebuggerParser::executeJoy1Fire()
{
Controller& controller = debugger.riotDebug().controller(Controller::Right);
if(argCount == 0)
controller.set(Controller::Six, !controller.read(Controller::Six));
else if(argCount == 1)
controller.set(Controller::Six, args[0] != 0);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "jump"
void DebuggerParser::executeJump()
@ -1384,6 +1575,16 @@ void DebuggerParser::executeReset()
{
debugger.reset();
debugger.rom().invalidate();
debugger.riotDebug().controller(Controller::Left).set(Controller::One, true);
debugger.riotDebug().controller(Controller::Left).set(Controller::Two, true);
debugger.riotDebug().controller(Controller::Left).set(Controller::Three, true);
debugger.riotDebug().controller(Controller::Left).set(Controller::Four, true);
debugger.riotDebug().controller(Controller::Left).set(Controller::Six, true);
debugger.riotDebug().controller(Controller::Right).set(Controller::One, true);
debugger.riotDebug().controller(Controller::Right).set(Controller::Two, true);
debugger.riotDebug().controller(Controller::Right).set(Controller::Three, true);
debugger.riotDebug().controller(Controller::Right).set(Controller::Four, true);
debugger.riotDebug().controller(Controller::Right).set(Controller::Six, true);
commandResult << "reset system";
}
@ -1585,7 +1786,7 @@ void DebuggerParser::executeSaveses()
// "savesnap"
void DebuggerParser::executeSavesnap()
{
debugger.tiaOutput().saveSnapshot();
debugger.tiaOutput().saveSnapshot(execDepth, execPrefix);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -1640,6 +1841,23 @@ void DebuggerParser::executeStep()
<< "executed " << dec << debugger.step() << " cycles";
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "stepwhile"
void DebuggerParser::executeStepwhile()
{
int res = YaccParser::parse(argStrings[0].c_str());
if(res != 0) {
commandResult << red("invalid expression");
return;
}
Expression* expr = YaccParser::getResult();
int ncycles = 0;
do {
ncycles += debugger.step();
} while (expr->evaluate());
commandResult << "executed " << ncycles << " cycles";
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// "tia"
void DebuggerParser::executeTia()
@ -2246,11 +2464,11 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = {
{
"exec",
"Execute script file <xx>",
"Execute script file <xx> [prefix]",
"Example: exec script.dat, exec auto.txt",
true,
true,
{ kARG_FILE, kARG_END_ARGS },
{ kARG_FILE, kARG_LABEL, kARG_MULTI_BYTE },
std::mem_fn(&DebuggerParser::executeExec)
},
@ -2305,6 +2523,106 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = {
std::mem_fn(&DebuggerParser::executeHelp)
},
{
"joy0up",
"Set joystick 0 up direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy0up 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy0Up)
},
{
"joy0down",
"Set joystick 0 down direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy0down 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy0Down)
},
{
"joy0left",
"Set joystick 0 left direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy0left 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy0Left)
},
{
"joy0right",
"Set joystick 0 right direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy0left 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy0Right)
},
{
"joy0fire",
"Set joystick 0 fire button to value <x> (0 or 1), or toggle (no arg)",
"Example: joy0fire 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy0Fire)
},
{
"joy1up",
"Set joystick 1 up direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy1up 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy1Up)
},
{
"joy1down",
"Set joystick 1 down direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy1down 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy1Down)
},
{
"joy1left",
"Set joystick 1 left direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy1left 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy1Left)
},
{
"joy1right",
"Set joystick 1 right direction to value <x> (0 or 1), or toggle (no arg)",
"Example: joy1left 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy1Right)
},
{
"joy1fire",
"Set joystick 1 fire button to value <x> (0 or 1), or toggle (no arg)",
"Example: joy1fire 0",
false,
true,
{ kARG_BOOL, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeJoy1Fire)
},
{
"jump",
"Scroll disassembly to address xx",
@ -2642,6 +2960,16 @@ DebuggerParser::Command DebuggerParser::commands[kNumCommands] = {
std::mem_fn(&DebuggerParser::executeStep)
},
{
"stepwhile",
"Single step CPU while <condition> is true",
"Example: stepwhile pc!=$f2a9",
true,
true,
{ kARG_WORD, kARG_END_ARGS },
std::mem_fn(&DebuggerParser::executeStepwhile)
},
{
"tia",
"Show TIA state",

16
src/debugger/DebuggerParser.hxx
View File

@ -66,7 +66,7 @@ class DebuggerParser
string saveScriptFile(string file);
private:
enum { kNumCommands = 81 };
enum { kNumCommands = 92 };
// Constants for argument processing
enum {
@ -123,6 +123,9 @@ class DebuggerParser
StringList argStrings;
uInt32 argCount;
uInt32 execDepth;
string execPrefix;
StringList myWatches;
// Keep track of traps (read and/or write)
@ -165,6 +168,16 @@ class DebuggerParser
void executeFunction();
void executeGfx();
void executeHelp();
void executeJoy0Up();
void executeJoy0Down();
void executeJoy0Left();
void executeJoy0Right();
void executeJoy0Fire();
void executeJoy1Up();
void executeJoy1Down();
void executeJoy1Left();
void executeJoy1Right();
void executeJoy1Fire();
void executeJump();
void executeListbreaks();
void executeListconfig();
@ -198,6 +211,7 @@ class DebuggerParser
void executeSavestateif();
void executeScanline();
void executeStep();
void executeStepwhile();
void executeTia();
void executeTrace();
void executeTrap();

20
src/debugger/gui/TiaOutputWidget.cxx
View File

@ -58,20 +58,26 @@ void TiaOutputWidget::loadConfig()
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TiaOutputWidget::saveSnapshot()
void TiaOutputWidget::saveSnapshot(int execDepth, const string& execPrefix)
{
int number = int(instance().getTicks() / 1000);
if (execDepth > 0) {
drawWidget(false);
}
ostringstream sspath;
sspath << instance().snapshotSaveDir()
<< instance().console().properties().get(Cartridge_Name)
<< "_dbg_" << std::hex << std::setw(8) << std::setfill('0') << number << ".png";
<< instance().console().properties().get(Cartridge_Name);
sspath << "_dbg_";
if (execDepth > 0 && !execPrefix.empty()) {
sspath << execPrefix << "_";
}
sspath << std::hex << std::setw(8) << std::setfill('0') << uInt32(instance().getTicks()/1000) << ".png";
const uInt32 width = instance().console().tia().width(),
height = instance().console().tia().height();
FBSurface& s = dialog().surface();
GUI::Rect rect(_x, _y, _x + width*2, _y + height);
string message = "snapshot saved";
string message = "Snapshot saved";
try
{
instance().png().saveImage(sspath.str(), s, rect);
@ -80,7 +86,9 @@ void TiaOutputWidget::saveSnapshot()
{
message = e.what();
}
instance().frameBuffer().showMessage(message);
if (execDepth == 0) {
instance().frameBuffer().showMessage(message);
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/debugger/gui/TiaOutputWidget.hxx
View File

@ -36,7 +36,7 @@ class TiaOutputWidget : public Widget, public CommandSender
void loadConfig() override;
void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
void saveSnapshot();
void saveSnapshot(int execDepth = 0, const string& execPrefix = "");
// Eventually, these methods will enable access to the onscreen TIA image
// For example, clicking an area may cause an action