[Scummvm-cvs-logs] SF.net SVN: scummvm:[42599] scummvm/trunk/engines/sci/engine
wjpalenstijn at users.sourceforge.net
wjpalenstijn at users.sourceforge.net
Sun Jul 19 00:46:07 CEST 2009
Revision: 42599
http://scummvm.svn.sourceforge.net/scummvm/?rev=42599&view=rev
Author: wjpalenstijn
Date: 2009-07-18 22:46:07 +0000 (Sat, 18 Jul 2009)
Log Message:
-----------
SCI: Fix breakpoints
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/sci/engine/vm.h
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-07-18 22:19:07 UTC (rev 42598)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-07-18 22:46:07 UTC (rev 42599)
@@ -258,6 +258,7 @@
if (bp->type == BREAK_EXPORT && bp->data.address == bpaddress) {
Console *con = ((SciEngine *)g_engine)->getSciDebugger();
con->DebugPrintf("Break on script %d, export %d\n", script, pubfunct);
+ scriptState.debugging = true;
breakpointFlag = true;
break;
}
@@ -325,6 +326,7 @@
con->DebugPrintf("Break on %s (in [%04x:%04x])\n", method_name, PRINT_REG(send_obj));
print_send_action = 1;
breakpointFlag = true;
+ scriptState.debugging = true;
break;
}
bp = bp->next;
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-07-18 22:19:07 UTC (rev 42598)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-07-18 22:46:07 UTC (rev 42599)
@@ -266,18 +266,19 @@
};
+// These types are used both as identifiers and as elements of bitfields
enum BreakpointType {
/**
* Break when selector is executed. data contains (char *) selector name
* (in the format Object::Method)
*/
- BREAK_SELECTOR,
+ BREAK_SELECTOR = 1,
/**
* Break when an exported function is called. data contains
* script_no << 16 | export_no.
*/
- BREAK_EXPORT
+ BREAK_EXPORT = 2
};
struct Breakpoint {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list