[Scummvm-cvs-logs] SF.net SVN: scummvm:[48036] scummvm/trunk/engines/sci/engine
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Fri Feb 12 03:23:31 CET 2010
Revision: 48036
http://scummvm.svn.sourceforge.net/scummvm/?rev=48036&view=rev
Author: waltervn
Date: 2010-02-12 02:23:28 +0000 (Fri, 12 Feb 2010)
Log Message:
-----------
SCI: Revert r47929 (bad idea, as we may run out of offsets). Instead, adapt SCI32 list iteration code to store node successor before invoking.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/klists.cpp
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp 2010-02-10 17:46:22 UTC (rev 48035)
+++ scummvm/trunk/engines/sci/engine/klists.cpp 2010-02-12 02:23:28 UTC (rev 48036)
@@ -521,14 +521,15 @@
reg_t kListEachElementDo(EngineState *s, int argc, reg_t *argv) {
List *list = s->_segMan->lookupList(argv[0]);
- reg_t curAddress = list->first;
- Node *curNode = s->_segMan->lookupNode(curAddress);
+ Node *curNode = s->_segMan->lookupNode(list->first);
reg_t curObject;
Selector slc = argv[1].toUint16();
ObjVarRef address;
while (curNode) {
+ // We get the next node here as the current node might be gone after the invoke
+ reg_t nextNode = curNode->succ;
curObject = curNode->value;
// First, check if the target selector is a variable
@@ -543,11 +544,7 @@
invoke_selector_argv(s, curObject, slc, kContinueOnInvalidSelector, argc, argv, argc - 2, argv + 2);
}
- // Lookup node again, since the nodetable it was in may have been reallocated
- curNode = s->_segMan->lookupNode(curAddress);
-
- curAddress = curNode->succ;
- curNode = s->_segMan->lookupNode(curAddress);
+ curNode = s->_segMan->lookupNode(nextNode);
}
return s->r_acc;
@@ -556,8 +553,7 @@
reg_t kListFirstTrue(EngineState *s, int argc, reg_t *argv) {
List *list = s->_segMan->lookupList(argv[0]);
- reg_t curAddress = list->first;
- Node *curNode = s->_segMan->lookupNode(curAddress);
+ Node *curNode = s->_segMan->lookupNode(list->first);
reg_t curObject;
Selector slc = argv[1].toUint16();
@@ -566,6 +562,7 @@
s->r_acc = NULL_REG; // reset the accumulator
while (curNode) {
+ reg_t nextNode = curNode->succ;
curObject = curNode->value;
// First, check if the target selector is a variable
@@ -580,11 +577,7 @@
return curObject;
}
- // Lookup node again, since the nodetable it was in may have been reallocated
- curNode = s->_segMan->lookupNode(curAddress);
-
- curAddress = curNode->succ;
- curNode = s->_segMan->lookupNode(curAddress);
+ curNode = s->_segMan->lookupNode(nextNode);
}
// No selector returned true
@@ -594,8 +587,7 @@
reg_t kListAllTrue(EngineState *s, int argc, reg_t *argv) {
List *list = s->_segMan->lookupList(argv[0]);
- reg_t curAddress = list->first;
- Node *curNode = s->_segMan->lookupNode(curAddress);
+ Node *curNode = s->_segMan->lookupNode(list->first);
reg_t curObject;
Selector slc = argv[1].toUint16();
@@ -604,6 +596,7 @@
s->r_acc = make_reg(0, 1); // reset the accumulator
while (curNode) {
+ reg_t nextNode = curNode->succ;
curObject = curNode->value;
// First, check if the target selector is a variable
@@ -618,11 +611,7 @@
break;
}
- // Lookup node again, since the nodetable it was in may have been reallocated
- curNode = s->_segMan->lookupNode(curAddress);
-
- curAddress = curNode->succ;
- curNode = s->_segMan->lookupNode(curAddress);
+ curNode = s->_segMan->lookupNode(nextNode);
}
return s->r_acc;
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2010-02-10 17:46:22 UTC (rev 48035)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2010-02-12 02:23:28 UTC (rev 48036)
@@ -621,16 +621,8 @@
static void gc_countdown(EngineState *s) {
if (s->gc_countdown-- <= 0) {
- // Only run garbage collection when execution stack base
- // is zero, as it cannot count references inside kernel
- // functions
- if (s->execution_stack_base == 0) {
- s->gc_countdown = script_gc_interval;
- run_gc(s);
- } else {
- // Try again later
- s->gc_countdown = 1;
- }
+ s->gc_countdown = script_gc_interval;
+ run_gc(s);
}
}
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