aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2009-09-21 21:39:00 +0000
committerMax Horn2009-09-21 21:39:00 +0000
commit996b9cc74b26764465d3be80527c005bde705029 (patch)
tree8be0321a4354f03df36762cd1830a190856febc5 /engines
parentd2a6713a8e1bead4a959205419373e828f59bfb4 (diff)
downloadscummvm-rg350-996b9cc74b26764465d3be80527c005bde705029.tar.gz
scummvm-rg350-996b9cc74b26764465d3be80527c005bde705029.tar.bz2
scummvm-rg350-996b9cc74b26764465d3be80527c005bde705029.zip
SCI: cleanup
svn-id: r44241
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/vm.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index 626eae93ff..89e95781b0 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -52,13 +52,14 @@ int script_step_counter = 0; // Counts the number of steps executed // FIXME: Av
int script_gc_interval = GC_INTERVAL; // Number of steps in between gcs // FIXME: Avoid non-const global vars
static bool breakpointFlag = false; // FIXME: Avoid non-const global vars
-static reg_t _dummy_register; // FIXME: Avoid non-const global vars
// validation functionality
#ifndef DISABLE_VALIDATIONS
static reg_t &validate_property(Object *obj, int index) {
+ static reg_t _dummy_register;
+
if (!obj) {
debugC(2, kDebugLevelVM, "[VM] Sending to disposed object!\n");
_dummy_register = NULL_REG;
@@ -246,12 +247,13 @@ static void _exec_varselectors(EngineState *s) {
// Executes all varselector read/write ops on the TOS
while (!s->_executionStack.empty() && s->_executionStack.back().type == EXEC_STACK_TYPE_VARSELECTOR) {
ExecStack &xs = s->_executionStack.back();
+ reg_t *var = xs.getVarPointer(s->segMan);
// varselector access?
if (xs.argc) { // write?
- *(xs.getVarPointer(s->segMan)) = xs.variables_argp[1];
+ *var = xs.variables_argp[1];
} else // No, read
- s->r_acc = *(xs.getVarPointer(s->segMan));
+ s->r_acc = *var;
s->_executionStack.pop_back();
}
@@ -699,8 +701,6 @@ void run_vm(EngineState *s, int restoring) {
error("opcode %02x: Invalid", opcode);
}
- // TODO: Replace the following by an opcode table, and several methods for
- // each opcode.
switch (opnumber) {
case 0x00: // bnot
@@ -1009,10 +1009,11 @@ void run_vm(EngineState *s, int restoring) {
if (old_xs->type == EXEC_STACK_TYPE_VARSELECTOR) {
// varselector access?
+ reg_t *var = old_xs->getVarPointer(s->segMan);
if (old_xs->argc) // write?
- *(old_xs->getVarPointer(s->segMan)) = old_xs->variables_argp[1];
+ *var = old_xs->variables_argp[1];
else // No, read
- s->r_acc = *(old_xs->getVarPointer(s->segMan));
+ s->r_acc = *var;
}
// Not reached the base, so let's do a soft return