diff options
| author | Willem Jan Palenstijn | 2017-05-26 12:52:55 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2017-06-10 21:32:35 +0200 |
| commit | e9867356f5ccedf5d9a8a087852230b416d8d458 (patch) | |
| tree | 5dd7c4f76e52264f26f070ca3232be21ff439d3d /engines/sci/engine/vm.cpp | |
| parent | 1e5c965a2bf038193af93663bfe99d65a4b0f7cc (diff) | |
| download | scummvm-rg350-e9867356f5ccedf5d9a8a087852230b416d8d458.tar.gz scummvm-rg350-e9867356f5ccedf5d9a8a087852230b416d8d458.tar.bz2 scummvm-rg350-e9867356f5ccedf5d9a8a087852230b416d8d458.zip | |
SCI: Handle selector read/write breakpoints from opcodes
Diffstat (limited to 'engines/sci/engine/vm.cpp')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 52 |
1 files changed, 49 insertions, 3 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index edffa60b09..1e088d6d7c 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1129,29 +1129,60 @@ void run_vm(EngineState *s) { case op_pToa: // 0x31 (49) // Property To Accumulator + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORREAD) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + validate_property(s, obj, opparams[0]), NULL_REG, + s->_segMan, BREAK_SELECTORREAD); + } s->r_acc = validate_property(s, obj, opparams[0]); break; case op_aTop: // 0x32 (50) + { // Accumulator To Property - validate_property(s, obj, opparams[0]) = s->r_acc; + reg_t &opProperty = validate_property(s, obj, opparams[0]); + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORWRITE) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + opProperty, s->r_acc, + s->_segMan, BREAK_SELECTORWRITE); + } + + opProperty = s->r_acc; #ifdef ENABLE_SCI32 updateInfoFlagViewVisible(obj, opparams[0], true); #endif break; + } case op_pTos: // 0x33 (51) + { // Property To Stack - PUSH32(validate_property(s, obj, opparams[0])); + reg_t value = validate_property(s, obj, opparams[0]); + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORREAD) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + value, NULL_REG, + s->_segMan, BREAK_SELECTORREAD); + } + PUSH32(value); break; + } case op_sTop: // 0x34 (52) + { // Stack To Property - validate_property(s, obj, opparams[0]) = POP32(); + reg_t newValue = POP32(); + reg_t &opProperty = validate_property(s, obj, opparams[0]); + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORWRITE) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + opProperty, newValue, + s->_segMan, BREAK_SELECTORWRITE); + } + opProperty = newValue; #ifdef ENABLE_SCI32 updateInfoFlagViewVisible(obj, opparams[0], true); #endif break; + } case op_ipToa: // 0x35 (53) case op_dpToa: // 0x36 (54) @@ -1161,10 +1192,25 @@ void run_vm(EngineState *s) { // Increment/decrement a property and copy to accumulator, // or push to stack reg_t &opProperty = validate_property(s, obj, opparams[0]); + reg_t oldValue = opProperty; + + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORREAD) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + oldValue, NULL_REG, + s->_segMan, BREAK_SELECTORREAD); + } + if (opcode & 1) opProperty += 1; else opProperty -= 1; + + if (g_sci->_debugState._activeBreakpointTypes & BREAK_SELECTORWRITE) { + debugPropertyAccess(obj, s->xs->objp, opparams[0], + oldValue, opProperty, + s->_segMan, BREAK_SELECTORWRITE); + } + #ifdef ENABLE_SCI32 updateInfoFlagViewVisible(obj, opparams[0], true); #endif |