libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: Allow setting bp action directly on creation

Browse Source
This commit is contained in:
Willem Jan Palenstijn 2017-05-26 22:51:18 +02:00
parent b3866aa3d5
commit 4d34d586a6
1 changed files with 97 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
engines/sci/console.cpp
View File

@ -3813,6 +3813,22 @@ bool Console::cmdBreakpointDelete(int argc, const char **argv) {
return true;
}
static bool stringToBreakpointAction(Common::String str, BreakpointAction &action) {
if (str == "break")
action = BREAK_BREAK;
else if (str == "log")
action = BREAK_LOG;
else if (str == "bt")
action = BREAK_BACKTRACE;
else if (str == "inspect")
action = BREAK_INSPECT;
else if (str == "none")
action = BREAK_NONE;
else
return false;
return true;
}
bool Console::cmdBreakpointAction(int argc, const char **argv) {
bool usage = false;
@ -3825,17 +3841,7 @@ bool Console::cmdBreakpointAction(int argc, const char **argv) {
arg = argv[2];
BreakpointAction bpaction;
if (arg == "break")
bpaction = BREAK_BREAK;
else if (arg == "log")
bpaction = BREAK_LOG;
else if (arg == "bt")
bpaction = BREAK_BACKTRACE;
else if (arg == "inspect")
bpaction = BREAK_INSPECT;
else if (arg == "none")
bpaction = BREAK_NONE;
else
if (!stringToBreakpointAction(arg, bpaction))
usage = true;
if (usage) {
@ -3880,61 +3886,103 @@ bool Console::cmdBreakpointAction(int argc, const char **argv) {
bool Console::cmdBreakpointMethod(int argc, const char **argv) {
if (argc != 2) {
if (argc < 2 || argc > 3) {
debugPrintf("Sets a breakpoint on execution of a specified method/selector.\n");
debugPrintf("Usage: %s <name>\n", argv[0]);
debugPrintf("Usage: %s <name> [<action>]\n", argv[0]);
debugPrintf("Example: %s ego::doit\n", argv[0]);
debugPrintf(" %s ego::doit log\n", argv[0]);
debugPrintf("May also be used to set a breakpoint that applies whenever an object\n");
debugPrintf("of a specific type is touched: %s foo::\n", argv[0]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
BreakpointAction action = BREAK_BREAK;
if (argc == 3) {
if (!stringToBreakpointAction(argv[2], action)) {
debugPrintf("Invalid breakpoint action %s.\n", argv[2]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
}
/* Note: We can set a breakpoint on a method that has not been loaded yet.
Thus, we can't check whether the command argument is a valid method name.
A breakpoint set on an invalid method name will just never trigger. */
Breakpoint bp;
bp._type = BREAK_SELECTOREXEC;
bp._name = argv[1];
bp._action = BREAK_BREAK;
bp._action = action;
_debugState._breakpoints.push_back(bp);
_debugState._activeBreakpointTypes |= BREAK_SELECTOREXEC;
if (action != BREAK_NONE)
_debugState._activeBreakpointTypes |= BREAK_SELECTOREXEC;
return true;
}
bool Console::cmdBreakpointRead(int argc, const char **argv) {
if (argc != 2) {
if (argc < 2 || argc > 3) {
debugPrintf("Sets a breakpoint on reading of a specified selector.\n");
debugPrintf("Usage: %s <name>\n", argv[0]);
debugPrintf("Usage: %s <name> [<action>]\n", argv[0]);
debugPrintf("Example: %s ego::view\n", argv[0]);
debugPrintf(" %s ego::view log\n", argv[0]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
BreakpointAction action = BREAK_BREAK;
if (argc == 3) {
if (!stringToBreakpointAction(argv[2], action)) {
debugPrintf("Invalid breakpoint action %s.\n", argv[2]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
}
Breakpoint bp;
bp._type = BREAK_SELECTORREAD;
bp._name = argv[1];
bp._action = BREAK_BREAK;
bp._action = action;
_debugState._breakpoints.push_back(bp);
_debugState._activeBreakpointTypes |= BREAK_SELECTORREAD;
if (action != BREAK_NONE)
_debugState._activeBreakpointTypes |= BREAK_SELECTORREAD;
return true;
}
bool Console::cmdBreakpointWrite(int argc, const char **argv) {
if (argc != 2) {
if (argc < 2 || argc > 3) {
debugPrintf("Sets a breakpoint on writing of a specified selector.\n");
debugPrintf("Usage: %s <name>\n", argv[0]);
debugPrintf("Usage: %s <name> [<action>]\n", argv[0]);
debugPrintf("Example: %s ego::view\n", argv[0]);
debugPrintf(" %s ego::view log\n", argv[0]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
BreakpointAction action = BREAK_BREAK;
if (argc == 3) {
if (!stringToBreakpointAction(argv[2], action)) {
debugPrintf("Invalid breakpoint action %s.\n", argv[2]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
}
Breakpoint bp;
bp._type = BREAK_SELECTORWRITE;
bp._name = argv[1];
bp._action = BREAK_BREAK;
bp._action = action;
_debugState._breakpoints.push_back(bp);
_debugState._activeBreakpointTypes |= BREAK_SELECTORWRITE;
if (action != BREAK_NONE)
_debugState._activeBreakpointTypes |= BREAK_SELECTORWRITE;
return true;
}
@ -3965,12 +4013,22 @@ bool Console::cmdBreakpointKernel(int argc, const char **argv) {
}
bool Console::cmdBreakpointFunction(int argc, const char **argv) {
if (argc != 3) {
if (argc < 3 || argc > 4) {
debugPrintf("Sets a breakpoint on the execution of the specified exported function.\n");
debugPrintf("Usage: %s <script number> <export number>\n", argv[0]);
debugPrintf("Usage: %s <script number> <export number> [<action>]\n", argv[0]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
BreakpointAction action = BREAK_BREAK;
if (argc == 4) {
if (!stringToBreakpointAction(argv[3], action)) {
debugPrintf("Invalid breakpoint action %s.\n", argv[3]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
}
/* Note: We can set a breakpoint on a method that has not been loaded yet.
Thus, we can't check whether the command argument is a valid method name.
A breakpoint set on an invalid method name will just never trigger. */
@ -3978,7 +4036,7 @@ bool Console::cmdBreakpointFunction(int argc, const char **argv) {
bp._type = BREAK_EXPORT;
// script number, export number
bp._address = (atoi(argv[1]) << 16 | atoi(argv[2]));
bp._action = BREAK_BREAK;
bp._action = action;
_debugState._breakpoints.push_back(bp);
_debugState._activeBreakpointTypes |= BREAK_EXPORT;
@ -3987,9 +4045,10 @@ bool Console::cmdBreakpointFunction(int argc, const char **argv) {
}
bool Console::cmdBreakpointAddress(int argc, const char **argv) {
if (argc != 2) {
if (argc < 2 || argc > 3) {
debugPrintf("Sets a breakpoint on the execution of the specified code address.\n");
debugPrintf("Usage: %s <address>\n", argv[0]);
debugPrintf("Usage: %s <address> [<action>]\n", argv[0]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
@ -4001,10 +4060,19 @@ bool Console::cmdBreakpointAddress(int argc, const char **argv) {
return true;
}
BreakpointAction action = BREAK_BREAK;
if (argc == 3) {
if (!stringToBreakpointAction(argv[2], action)) {
debugPrintf("Invalid breakpoint action %s.\n", argv[2]);
debugPrintf("See bp_action usage for possible actions.\n");
return true;
}
}
Breakpoint bp;
bp._type = BREAK_ADDRESS;
bp._regAddress = make_reg32(addr.getSegment(), addr.getOffset());
bp._action = BREAK_BREAK;
bp._action = action;
_debugState._breakpoints.push_back(bp);
_debugState._activeBreakpointTypes |= BREAK_ADDRESS;