[Scummvm-cvs-logs] SF.net SVN: scummvm:[43458] scummvm/trunk/engines/sci
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Aug 17 07:55:22 CEST 2009
Revision: 43458
http://scummvm.svn.sourceforge.net/scummvm/?rev=43458&view=rev
Author: thebluegr
Date: 2009-08-17 05:55:21 +0000 (Mon, 17 Aug 2009)
Log Message:
-----------
- Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState
- Moved the class table in the Segment manager - it's the only class using it directly
- Removed the sci11 flag from save games (we already know this, we don't need to store it)
- Moved script_get_segment() and get_class_address() inside the segment manager class
- Removed the script_locate_by_segment wrapper
- Simplified script_lookup_export() a lot by removing some paranoia checks
- Added some WIP code for automatically determining the game id in the fallback detector (still not working)
- General cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kmovement.cpp
scummvm/trunk/engines/sci/engine/kscripts.cpp
scummvm/trunk/engines/sci/engine/memobj.cpp
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/scriptdebug.cpp
scummvm/trunk/engines/sci/engine/seg_manager.cpp
scummvm/trunk/engines/sci/engine/seg_manager.h
scummvm/trunk/engines/sci/engine/state.h
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/sci/engine/vm.h
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/console.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -889,10 +889,11 @@
bool Console::cmdClassTable(int argc, const char **argv) {
DebugPrintf("Available classes:\n");
- for (uint i = 0; i < _vm->_gamestate->_classtable.size(); i++) {
- if (_vm->_gamestate->_classtable[i].reg.segment) {
+ for (uint i = 0; i < _vm->_gamestate->seg_manager->_classtable.size(); i++) {
+ if (_vm->_gamestate->seg_manager->_classtable[i].reg.segment) {
DebugPrintf(" Class 0x%x at %04x:%04x (script 0x%x)\n", i,
- PRINT_REG(_vm->_gamestate->_classtable[i].reg), _vm->_gamestate->_classtable[i].script);
+ PRINT_REG(_vm->_gamestate->seg_manager->_classtable[i].reg),
+ _vm->_gamestate->seg_manager->_classtable[i].script);
}
}
@@ -1394,10 +1395,11 @@
for (uint i = 0; i < scr->_objects.size(); i++) {
DebugPrintf(" ");
// Object header
- Object *obj = obj_get(_vm->_gamestate, scr->_objects[i].pos);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, scr->_objects[i].pos);
if (obj)
DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(scr->_objects[i].pos),
- obj_get_name(_vm->_gamestate, scr->_objects[i].pos), obj->_variables.size(), obj->methods_nr);
+ obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version,
+ scr->_objects[i].pos), obj->_variables.size(), obj->methods_nr);
}
}
break;
@@ -1438,12 +1440,13 @@
reg_t objpos;
objpos.offset = i;
objpos.segment = nr;
- DebugPrintf(" [%04x] %s; copy of ", i, obj_get_name(_vm->_gamestate, objpos));
+ DebugPrintf(" [%04x] %s; copy of ", i, obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, objpos));
// Object header
- Object *obj = obj_get(_vm->_gamestate, ct->_table[i].pos);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, ct->_table[i].pos);
if (obj)
DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(ct->_table[i].pos),
- obj_get_name(_vm->_gamestate, ct->_table[i].pos), obj->_variables.size(), obj->methods_nr);
+ obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, ct->_table[i].pos),
+ obj->_variables.size(), obj->methods_nr);
}
}
break;
@@ -2045,7 +2048,7 @@
for (iter = _vm->_gamestate->_executionStack.begin();
iter != _vm->_gamestate->_executionStack.end(); ++iter, ++i) {
ExecStack &call = *iter;
- const char *objname = obj_get_name(_vm->_gamestate, call.sendp);
+ const char *objname = obj_get_name(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, call.sendp);
int paramc, totalparamc;
switch (call.type) {
@@ -2187,7 +2190,7 @@
return true;
}
- Object *obj = obj_get(_vm->_gamestate, objAddr);
+ Object *obj = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, objAddr);
int selector_id = _vm->getKernel()->findSelector(argv[2]);
reg_t addr;
@@ -2295,7 +2298,7 @@
return true;
}
- o = obj_get(_vm->_gamestate, object);
+ o = obj_get(_vm->_gamestate->seg_manager, _vm->_gamestate->_version, object);
if (o == NULL) {
DebugPrintf("Address \"%04x:%04x\" is not an object\n", PRINT_REG(object));
return true;
@@ -2900,7 +2903,7 @@
}
if (valid) {
- const char *objname = obj_get_name(s, objpos);
+ const char *objname = obj_get_name(s->seg_manager, s->_version, objpos);
if (!strcmp(objname, str_objname)) {
// Found a match!
if ((index < 0) && (times_found > 0)) {
@@ -3042,9 +3045,10 @@
int Console::printObject(reg_t pos) {
EngineState *s = _vm->_gamestate; // for the several defines in this function
- Object *obj = obj_get(s, pos);
+ Object *obj = obj_get(s->seg_manager, s->_version, pos);
Object *var_container = obj;
int i;
+ SciVersion version = s->_version; // for the selector defines
if (!obj) {
DebugPrintf("[%04x:%04x]: Not an object.", PRINT_REG(pos));
@@ -3052,11 +3056,11 @@
}
// Object header
- DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(pos), obj_get_name(s, pos),
+ DebugPrintf("[%04x:%04x] %s : %3d vars, %3d methods\n", PRINT_REG(pos), obj_get_name(s->seg_manager, s->_version, pos),
obj->_variables.size(), obj->methods_nr);
if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS))
- var_container = obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
+ var_container = obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
DebugPrintf(" -- member variables:\n");
for (i = 0; (uint)i < obj->_variables.size(); i++) {
printf(" ");
@@ -3068,9 +3072,9 @@
reg_t val = obj->_variables[i];
DebugPrintf("%04x:%04x", PRINT_REG(val));
- Object *ref = obj_get(s, val);
+ Object *ref = obj_get(s->seg_manager, s->_version, val);
if (ref)
- DebugPrintf(" (%s)", obj_get_name(s, val));
+ DebugPrintf(" (%s)", obj_get_name(s->seg_manager, s->_version, val));
DebugPrintf("\n");
}
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/detection.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -28,6 +28,7 @@
#include "sci/sci.h"
#include "sci/exereader.h"
+#include "sci/engine/seg_manager.h"
namespace Sci {
@@ -3086,6 +3087,19 @@
s_fallbackDesc.desc.platform = exePlatform;
s_fallbackDesc.desc.flags = ADGF_NO_FLAGS;
+#if 0
+ // Determine the game id
+ // TODO
+ ResourceManager *resMgr = new ResourceManager(256 * 1024);
+ SciVersion version = resMgr->sciVersion();
+ SegManager *segManager = new SegManager(resMgr, version);
+ reg_t game_obj = script_lookup_export(segManager, 0, 0);
+ Common::String gameName = obj_get_name(segManager,version, game_obj);
+ debug(2, " \"%s\" at %04x:%04x", gameName.c_str(), PRINT_REG(game_obj));
+ delete segManager;
+ delete resMgr;
+#endif
+
printf("If this is *NOT* a fan-modified version (in particular, not a fan-made\n");
printf("translation), please, report the data above, including the following\n");
printf("version number, from the game's executable:\n");
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -197,9 +197,9 @@
Resource *vocab996 = s->resmgr->findResource(ResourceId(kResourceTypeVocab, 996), 1);
if (!vocab996)
- s->_classtable.resize(20);
+ s->seg_manager->_classtable.resize(20);
else
- s->_classtable.resize(vocab996->size >> 2);
+ s->seg_manager->_classtable.resize(vocab996->size >> 2);
for (scriptnr = 0; scriptnr < 1000; scriptnr++) {
Resource *heap = s->resmgr->findResource(ResourceId(kResourceTypeHeap, scriptnr), 0);
@@ -213,19 +213,19 @@
while (READ_LE_UINT16((byte*)seeker_ptr) == SCRIPT_OBJECT_MAGIC_NUMBER) {
if (READ_LE_UINT16((byte*)seeker_ptr + 14) & SCRIPT_INFO_CLASS) {
classnr = READ_LE_UINT16((byte*)seeker_ptr + 10);
- if (classnr >= (int)s->_classtable.size()) {
+ if (classnr >= (int)s->seg_manager->_classtable.size()) {
if (classnr >= SCRIPT_MAX_CLASSTABLE_SIZE) {
warning("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
classnr, scriptnr, scriptnr, seeker_offset);
return 1;
}
- s->_classtable.resize(classnr + 1); // Adjust maximum number of entries
+ s->seg_manager->_classtable.resize(classnr + 1); // Adjust maximum number of entries
}
- s->_classtable[classnr].reg.offset = seeker_offset;
- s->_classtable[classnr].reg.segment = 0;
- s->_classtable[classnr].script = scriptnr;
+ s->seg_manager->_classtable[classnr].reg.offset = seeker_offset;
+ s->seg_manager->_classtable[classnr].reg.segment = 0;
+ s->seg_manager->_classtable[classnr].script = scriptnr;
}
seeker_ptr += READ_LE_UINT16((byte*)seeker_ptr + 2) * 2;
@@ -246,11 +246,12 @@
int magic_offset; // For strange scripts in older SCI versions
Resource *vocab996 = s->resmgr->findResource(ResourceId(kResourceTypeVocab, 996), 1);
+ SciVersion version = s->_version; // for the offset defines
if (!vocab996)
- s->_classtable.resize(20);
+ s->seg_manager->_classtable.resize(20);
else
- s->_classtable.resize(vocab996->size >> 2);
+ s->seg_manager->_classtable.resize(vocab996->size >> 2);
for (scriptnr = 0; scriptnr < 1000; scriptnr++) {
int objtype = 0;
@@ -270,7 +271,7 @@
break;
seeker += (int16)READ_LE_UINT16(script->data + seeker + 2);
if (seeker <= lastseeker) {
- s->_classtable.clear();
+ s->seg_manager->_classtable.clear();
error("Script version is invalid");
}
}
@@ -281,7 +282,7 @@
seeker -= SCRIPT_OBJECT_MAGIC_OFFSET; // Adjust position; script home is base +8 bytes
classnr = (int16)READ_LE_UINT16(script->data + seeker + 4 + SCRIPT_SPECIES_OFFSET);
- if (classnr >= (int)s->_classtable.size()) {
+ if (classnr >= (int)s->seg_manager->_classtable.size()) {
if (classnr >= SCRIPT_MAX_CLASSTABLE_SIZE) {
warning("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
@@ -289,7 +290,7 @@
return 1;
}
- s->_classtable.resize(classnr + 1); // Adjust maximum number of entries
+ s->seg_manager->_classtable.resize(classnr + 1); // Adjust maximum number of entries
}
// Map the class ID to the script the corresponding class is contained in
@@ -303,9 +304,9 @@
if (sugg_script == -1 || scriptnr == sugg_script /*|| !s->_classtable[classnr].reg.segment*/) {
// Now set the home script of the class
- s->_classtable[classnr].reg.offset = seeker + 4 - magic_offset;
- s->_classtable[classnr].reg.segment = 0;
- s->_classtable[classnr].script = scriptnr;
+ s->seg_manager->_classtable[classnr].reg.offset = seeker + 4 - magic_offset;
+ s->seg_manager->_classtable[classnr].reg.segment = 0;
+ s->seg_manager->_classtable[classnr].script = scriptnr;
}
seeker += SCRIPT_OBJECT_MAGIC_OFFSET; // Re-adjust position
@@ -326,6 +327,7 @@
int result;
s->kernel_opt_flags = 0;
+ s->seg_manager = new SegManager(s->resmgr, s->_version);
if (s->_version >= SCI_VERSION_1_1)
result = create_class_table_sci11(s);
@@ -337,10 +339,9 @@
return 1;
}
- s->seg_manager = new SegManager(s->_version >= SCI_VERSION_1_1);
s->gc_countdown = GC_INTERVAL - 1;
- SegmentId script_000_segment = script_get_segment(s, 0, SCRIPT_GET_LOCK);
+ SegmentId script_000_segment = s->seg_manager->getSegment(0, SCRIPT_GET_LOCK);
if (script_000_segment <= 0) {
debug(2, "Failed to instantiate script.000");
@@ -398,7 +399,8 @@
void script_free_vm_memory(EngineState *s) {
debug(2, "Freeing VM memory");
- s->_classtable.clear();
+ if (s->seg_manager)
+ s->seg_manager->_classtable.clear();
// Close all opened file handles
s->_fileHandles.clear();
@@ -433,14 +435,13 @@
int game_init(EngineState *s) {
// FIXME Use new VM instantiation code all over the place"
- reg_t game_obj; // Address of the game object
DataStack *stack;
stack = s->seg_manager->allocateStack(VM_STACK_SIZE, &s->stack_segment);
s->stack_base = stack->entries;
s->stack_top = s->stack_base + VM_STACK_SIZE;
- if (!script_instantiate(s, 0)) {
+ if (!script_instantiate(s->resmgr, s->seg_manager, s->_version, 0)) {
warning("game_init(): Could not instantiate script 0");
return 1;
}
@@ -473,21 +474,12 @@
srand(g_system->getMillis()); // Initialize random number generator
// script_dissect(0, s->_selectorNames);
- game_obj = script_lookup_export(s, 0, 0);
// The first entry in the export table of script 0 points to the game object
+ s->game_obj = script_lookup_export(s->seg_manager, 0, 0);
+ s->_gameName = obj_get_name(s->seg_manager, s->_version, s->game_obj);
- const char *tmp = obj_get_name(s, game_obj);
+ debug(2, " \"%s\" at %04x:%04x", s->_gameName.c_str(), PRINT_REG(s->game_obj));
- if (!tmp) {
- warning("Error: script.000, export 0 (%04x:%04x) does not yield an object with a name -> sanity check failed", PRINT_REG(game_obj));
- return 1;
- }
- s->_gameName = tmp;
-
- debug(2, " \"%s\" at %04x:%04x", s->_gameName.c_str(), PRINT_REG(game_obj));
-
- s->game_obj = game_obj;
-
// Mark parse tree as unused
s->parser_nodes[0].type = kParseTreeLeafNode;
s->parser_nodes[0].content.value = 0;
@@ -512,7 +504,9 @@
game_init_sound(s, SFX_STATE_FLAG_NOSOUND);
}
+ s->seg_manager->_classtable.clear();
delete s->seg_manager;
+ s->seg_manager = 0;
s->_synonyms.clear();
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -706,6 +706,8 @@
mobj = s->seg_manager->_heap[reg.segment];
+ SciVersion version = s->_version; // for the offset defines
+
switch (mobj->getType()) {
case MEM_OBJ_SCRIPT:
if (reg.offset <= (*(Script *)mobj).buf_size && reg.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET
Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -257,7 +257,7 @@
reg_t motion_class;
if (!parse_reg_t(s, "?Motion", &motion_class)) {
- Object *obj = obj_get(s, motion_class);
+ Object *obj = obj_get(s->seg_manager, s->_version, motion_class);
reg_t fptr;
byte *buf;
Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -108,7 +108,7 @@
}
bool is_object(EngineState *s, reg_t object) {
- return obj_get(s, object) != NULL;
+ return obj_get(s->seg_manager, s->_version, object) != NULL;
}
// Loads arbitrary resources of type 'restype' with resource numbers 'resnrs'
@@ -184,7 +184,7 @@
reg_t kClone(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t parent_addr = argv[0];
- Object *parent_obj = obj_get(s, parent_addr);
+ Object *parent_obj = obj_get(s->seg_manager, s->_version, parent_addr);
reg_t clone_addr;
Clone *clone_obj; // same as Object*
@@ -205,6 +205,8 @@
*clone_obj = *parent_obj;
clone_obj->flags = 0;
+ SciVersion version = s->_version; // for the selector defines
+
// Mark as clone
clone_obj->_variables[SCRIPT_INFO_SELECTOR].offset = SCRIPT_INFO_CLONE;
clone_obj->_variables[SCRIPT_SPECIES_SELECTOR] = clone_obj->pos;
@@ -220,7 +222,7 @@
reg_t kDisposeClone(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t victim_addr = argv[0];
- Clone *victim_obj = obj_get(s, victim_addr);
+ Clone *victim_obj = obj_get(s->seg_manager, s->_version, victim_addr);
uint16 underBits;
if (!victim_obj) {
@@ -229,6 +231,8 @@
return s->r_acc;
}
+ SciVersion version = s->_version; // for the selector defines
+
if (victim_obj->_variables[SCRIPT_INFO_SELECTOR].offset != SCRIPT_INFO_CLONE) {
//warning("Attempt to dispose something other than a clone at %04x", offset);
// SCI silently ignores this behaviour; some games actually depend on it
@@ -260,7 +264,7 @@
int script = argv[0].toUint16();
int index = (argc > 1) ? argv[1].toUint16() : 0;
- SegmentId scriptid = script_get_segment(s, script, SCRIPT_GET_LOAD);
+ SegmentId scriptid = s->seg_manager->getSegment(script, SCRIPT_GET_LOAD);
Script *scr;
if (argv[0].segment)
@@ -299,13 +303,13 @@
scr->setLockers(1);
}
- script_uninstantiate(s, script);
+ script_uninstantiate(s->seg_manager, s->_version, script);
s->_executionStackPosChanged = true;
return s->r_acc;
}
int is_heap_object(EngineState *s, reg_t pos) {
- Object *obj = obj_get(s, pos);
+ Object *obj = obj_get(s->seg_manager, s->_version, pos);
return (obj != NULL && (!(obj->flags & OBJECT_FLAG_FREED)) && (!s->seg_manager->scriptIsMarkedAsDeleted(pos.segment)));
}
Modified: scummvm/trunk/engines/sci/engine/memobj.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/memobj.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/memobj.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -246,6 +246,7 @@
void Script::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
Script *script = this;
+ SciVersion version = s->_version; // for the offset defines
if (addr.offset <= script->buf_size && addr.offset >= -SCRIPT_OBJECT_MAGIC_OFFSET && RAW_IS_OBJECT(script->buf + addr.offset)) {
int idx = RAW_GET_CLASS_INDEX(script, addr);
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -205,19 +205,21 @@
}
static void sync_SegManagerPtr(Common::Serializer &s, SegManager *&obj) {
- bool sci11 = false;
+ SciVersion version = SCI_VERSION_AUTODETECT;
+ ResourceManager *resMgr = 0;
if (s.isSaving()) {
assert(obj);
- sci11 = obj->isSci1_1;
+ version = obj->_version;
+ resMgr = obj->_resMgr;
}
- s.syncAsByte(sci11);
+ s.skip(1); // obsolete: used to be a flag indicating if we got sci11 or not
if (s.isLoading()) {
// FIXME: Do in-place loading at some point, instead of creating a new EngineState instance from scratch.
delete obj;
- obj = new SegManager(sci11);
+ obj = new SegManager(resMgr, version);
}
obj->saveLoadWithSerializer(s);
@@ -266,7 +268,7 @@
sync_SegManagerPtr(s, seg_manager);
- syncArray<Class>(s, _classtable);
+ syncArray<Class>(s, seg_manager->_classtable);
sync_sfx_state_t(s, _sound);
}
@@ -549,7 +551,7 @@
heap = s->resmgr->findResource(ResourceId(kResourceTypeHeap, scr->nr), 0);
memcpy(scr->buf, script->data, script->size);
- if (s->seg_manager->isSci1_1)
+ if (s->seg_manager->_version == SCI_VERSION_1_1)
memcpy(scr->buf + scr->script_size, heap->data, heap->size);
}
@@ -557,6 +559,8 @@
static void reconstruct_scripts(EngineState *s, SegManager *self) {
uint i, j;
MemObject *mobj;
+ SciVersion version = s->_version; // for the selector defines
+
for (i = 0; i < self->_heap.size(); i++) {
if (self->_heap[i]) {
mobj = self->_heap[i];
@@ -567,7 +571,7 @@
// FIXME: Unify this code with script_instantiate_*
load_script(s, i);
scr->locals_block = (scr->locals_segment == 0) ? NULL : (LocalVariables *)(s->seg_manager->_heap[scr->locals_segment]);
- if (s->seg_manager->isSci1_1) {
+ if (s->seg_manager->_version == SCI_VERSION_1_1) {
scr->export_table = 0;
scr->synonyms = 0;
if (READ_LE_UINT16(scr->buf + 6) > 0) {
@@ -603,7 +607,7 @@
for (j = 0; j < scr->_objects.size(); j++) {
byte *data = scr->buf + scr->_objects[j].pos.offset;
- if (self->isSci1_1) {
+ if (self->_version == SCI_VERSION_1_1) {
uint16 *funct_area = (uint16 *) (scr->buf + READ_LE_UINT16( data + 6 ));
uint16 *prop_area = (uint16 *) (scr->buf + READ_LE_UINT16( data + 4 ));
@@ -613,7 +617,7 @@
int funct_area = READ_LE_UINT16( data + SCRIPT_FUNCTAREAPTR_OFFSET );
Object *base_obj;
- base_obj = obj_get(s, scr->_objects[j]._variables[SCRIPT_SPECIES_SELECTOR]);
+ base_obj = obj_get(s->seg_manager, s->_version, scr->_objects[j]._variables[SCRIPT_SPECIES_SELECTOR]);
if (!base_obj) {
warning("Object without a base class: Script %d, index %d (reg address %04x:%04x",
@@ -638,6 +642,8 @@
// FIXME: The following should likely become a SegManager method
static void reconstruct_clones(EngineState *s, SegManager *self) {
+ SciVersion version = s->_version; // for the selector defines
+
for (uint i = 0; i < self->_heap.size(); i++) {
if (self->_heap[i]) {
MemObject *mobj = self->_heap[i];
@@ -667,7 +673,7 @@
continue;
}
CloneTable::Entry &seeker = ct->_table[j];
- base_obj = obj_get(s, seeker._variables[SCRIPT_SPECIES_SELECTOR]);
+ base_obj = obj_get(s->seg_manager, s->_version, seeker._variables[SCRIPT_SPECIES_SELECTOR]);
if (!base_obj) {
printf("Clone entry without a base class: %d\n", j);
seeker.base = seeker.base_obj = NULL;
@@ -791,7 +797,7 @@
reconstruct_scripts(retval, retval->seg_manager);
reconstruct_clones(retval, retval->seg_manager);
retval->game_obj = s->game_obj;
- retval->script_000 = retval->seg_manager->getScript(script_get_segment(s, 0, SCRIPT_GET_DONT_LOAD));
+ retval->script_000 = retval->seg_manager->getScript(retval->seg_manager->getSegment(0, SCRIPT_GET_DONT_LOAD));
retval->gc_countdown = GC_INTERVAL - 1;
retval->sys_strings_segment = find_unique_seg_by_type(retval->seg_manager, MEM_OBJ_SYS_STRINGS);
retval->sys_strings = (SystemStrings *)GET_SEGMENT(*retval->seg_manager, retval->sys_strings_segment, MEM_OBJ_SYS_STRINGS);
@@ -831,7 +837,7 @@
retval->successor = NULL;
retval->pic_priority_table = (int *)gfxop_get_pic_metainfo(retval->gfx_state);
- retval->_gameName = obj_get_name(retval, retval->game_obj);
+ retval->_gameName = obj_get_name(retval->seg_manager, retval->_version, retval->game_obj);
retval->_sound._it = NULL;
retval->_sound._flags = s->_sound._flags;
Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -37,9 +37,10 @@
ScriptState scriptState;
int propertyOffsetToId(EngineState *s, int prop_ofs, reg_t objp) {
- Object *obj = obj_get(s, objp);
+ Object *obj = obj_get(s->seg_manager, s->_version, objp);
byte *selectoroffset;
int selectors;
+ SciVersion version = s->_version; // for the selector defines
if (!obj) {
warning("Applied propertyOffsetToId on non-object at %04x:%04x", PRINT_REG(objp));
@@ -52,7 +53,7 @@
selectoroffset = ((byte *)(obj->base_obj)) + SCRIPT_SELECTOR_OFFSET + selectors * 2;
else {
if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS)) {
- obj = obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
+ obj = obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
selectoroffset = (byte *)obj->base_vars;
} else
selectoroffset = (byte *)obj->base_vars;
@@ -268,7 +269,7 @@
selector = sb[- stackframe].offset;
- name = obj_get_name(s, called_obj_addr);
+ name = obj_get_name(s->seg_manager, s->_version, called_obj_addr);
if (!name)
name = "<invalid>";
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -52,7 +52,7 @@
#define INVALID_SCRIPT_ID -1
-SegManager::SegManager(bool sci1_1) {
+SegManager::SegManager(ResourceManager *resMgr, SciVersion version) {
id_seg_map = new IntMapper();
reserved_id = INVALID_SCRIPT_ID;
id_seg_map->checkKey(reserved_id, true); // reserve entry 0 for INVALID_SCRIPT_ID
@@ -66,7 +66,8 @@
Hunks_seg_id = 0;
exports_wide = 0;
- isSci1_1 = sci1_1;
+ _version = version;
+ _resMgr = resMgr;
}
// Destroy the object, free the memorys if allocated before
@@ -109,7 +110,7 @@
// Returns : 0 - allocation failure
// 1 - allocated successfully
// seg_id - allocated segment id
-Script *SegManager::allocateScript(EngineState *s, int script_nr, SegmentId *seg_id) {
+Script *SegManager::allocateScript(int script_nr, SegmentId *seg_id) {
bool was_added;
MemObject *mem;
@@ -128,20 +129,20 @@
return (Script *)mem;
}
-void SegManager::setScriptSize(Script &scr, EngineState *s, int script_nr) {
- Resource *script = s->resmgr->findResource(ResourceId(kResourceTypeScript, script_nr), 0);
- Resource *heap = s->resmgr->findResource(ResourceId(kResourceTypeHeap, script_nr), 0);
+void SegManager::setScriptSize(Script &scr, int script_nr) {
+ Resource *script = _resMgr->findResource(ResourceId(kResourceTypeScript, script_nr), 0);
+ Resource *heap = _resMgr->findResource(ResourceId(kResourceTypeHeap, script_nr), 0);
scr.script_size = script->size;
scr.heap_size = 0; // Set later
- if (!script || (s->_version >= SCI_VERSION_1_1 && !heap)) {
+ if (!script || (_version >= SCI_VERSION_1_1 && !heap)) {
error("SegManager::setScriptSize: failed to load %s", !script ? "script" : "heap");
}
if (((SciEngine*)g_engine)->getKernel()->hasOldScriptHeader()) {
scr.buf_size = script->size + READ_LE_UINT16(script->data) * 2;
//locals_size = READ_LE_UINT16(script->data) * 2;
- } else if (s->_version < SCI_VERSION_1_1) {
+ } else if (_version < SCI_VERSION_1_1) {
scr.buf_size = script->size;
} else {
scr.buf_size = script->size + heap->size;
@@ -163,10 +164,10 @@
}
}
-int SegManager::initialiseScript(Script &scr, EngineState *s, int script_nr) {
+int SegManager::initialiseScript(Script &scr, int script_nr) {
// allocate the script.buf
- setScriptSize(scr, s, script_nr);
+ setScriptSize(scr, script_nr);
scr.buf = (byte *)malloc(scr.buf_size);
#ifdef DEBUG_SEG_MANAGER
@@ -191,7 +192,7 @@
scr.obj_indices = new IntMapper();
- if (s->_version >= SCI_VERSION_1_1)
+ if (_version >= SCI_VERSION_1_1)
scr.heap_start = scr.buf + scr.script_size;
else
scr.heap_start = scr.buf;
@@ -319,7 +320,7 @@
return 0;
}
block[idx].segment = segment; // Perform relocation
- if (isSci1_1)
+ if (_version == SCI_VERSION_1_1)
block[idx].offset += getScript(segment)->script_size;
return 1;
@@ -429,13 +430,51 @@
}
}
-#define INST_LOOKUP_CLASS(id) ((id == 0xffff) ? NULL_REG : get_class_address(s, id, SCRIPT_GET_LOCK, NULL_REG))
+SegmentId SegManager::getSegment(int script_nr, SCRIPT_GET load) {
+ SegmentId segment;
-reg_t get_class_address(EngineState *s, int classnr, SCRIPT_GET lock, reg_t caller);
+ if ((load & SCRIPT_GET_LOAD) == SCRIPT_GET_LOAD)
+ script_instantiate(_resMgr, this, _version, script_nr);
-Object *SegManager::scriptObjInit0(EngineState *s, reg_t obj_pos) {
+ segment = segGet(script_nr);
+
+ if (segment > 0) {
+ if ((load & SCRIPT_GET_LOCK) == SCRIPT_GET_LOCK)
+ getScript(segment)->incrementLockers();
+
+ return segment;
+ } else
+ return 0;
+}
+
+#define INST_LOOKUP_CLASS(id) ((id == 0xffff) ? NULL_REG : get_class_address(id, SCRIPT_GET_LOCK, NULL_REG))
+
+reg_t SegManager::get_class_address(int classnr, SCRIPT_GET lock, reg_t caller) {
+ if (classnr < 0 || (int)_classtable.size() <= classnr || _classtable[classnr].script < 0) {
+ error("[VM] Attempt to dereference class %x, which doesn't exist (max %x)", classnr, _classtable.size());
+ return NULL_REG;
+ } else {
+ Class *the_class = &_classtable[classnr];
+ if (!the_class->reg.segment) {
+ getSegment(the_class->script, lock);
+
+ if (!the_class->reg.segment) {
+ error("[VM] Trying to instantiate class %x by instantiating script 0x%x (%03d) failed;"
+ " Entering debugger.", classnr, the_class->script, the_class->script);
+ return NULL_REG;
+ }
+ } else
+ if (caller.segment != the_class->reg.segment)
+ getScript(the_class->reg.segment)->incrementLockers();
+
+ return the_class->reg;
+ }
+}
+
+Object *SegManager::scriptObjInit0(reg_t obj_pos) {
Object *obj;
int id;
+ SciVersion version = _version; // for the offset defines
unsigned int base = obj_pos.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
reg_t temp;
@@ -489,7 +528,7 @@
return obj;
}
-Object *SegManager::scriptObjInit11(EngineState *s, reg_t obj_pos) {
+Object *SegManager::scriptObjInit11(reg_t obj_pos) {
Object *obj;
int id;
int base = obj_pos.offset;
@@ -543,11 +582,11 @@
return obj;
}
-Object *SegManager::scriptObjInit(EngineState *s, reg_t obj_pos) {
- if (!isSci1_1)
- return scriptObjInit0(s, obj_pos);
+Object *SegManager::scriptObjInit(reg_t obj_pos) {
+ if (_version != SCI_VERSION_1_1)
+ return scriptObjInit0(obj_pos);
else
- return scriptObjInit11(s, obj_pos);
+ return scriptObjInit11(obj_pos);
}
LocalVariables *SegManager::allocLocalsSegment(Script *scr, int count) {
@@ -588,7 +627,7 @@
VERIFY(location.offset + 1 < (uint16)scr->buf_size, "Locals beyond end of script\n");
- if (isSci1_1)
+ if (_version == SCI_VERSION_1_1)
count = READ_LE_UINT16(scr->buf + location.offset - 2);
else
count = (READ_LE_UINT16(scr->buf + location.offset - 2) - 4) >> 1;
@@ -627,24 +666,25 @@
}
}
-void SegManager::scriptInitialiseObjectsSci11(EngineState *s, SegmentId seg) {
+void SegManager::scriptInitialiseObjectsSci11(SegmentId seg) {
Script *scr = getScript(seg);
byte *seeker = scr->heap_start + 4 + READ_LE_UINT16(scr->heap_start + 2) * 2;
+ SciVersion version = _version; // for the selector defines
while (READ_LE_UINT16(seeker) == SCRIPT_OBJECT_MAGIC_NUMBER) {
if (READ_LE_UINT16(seeker + 14) & SCRIPT_INFO_CLASS) {
int classpos = seeker - scr->buf;
int species = READ_LE_UINT16(seeker + 10);
- if (species < 0 || species >= (int)s->_classtable.size()) {
+ if (species < 0 || species >= (int)_classtable.size()) {
error("Invalid species %d(0x%x) not in interval [0,%d) while instantiating script %d\n",
- species, species, s->_classtable.size(), scr->nr);
+ species, species, _classtable.size(), scr->nr);
return;
}
- s->_classtable[species].script = scr->nr;
- s->_classtable[species].reg.segment = seg;
- s->_classtable[species].reg.offset = classpos;
+ _classtable[species].script = scr->nr;
+ _classtable[species].reg.segment = seg;
+ _classtable[species].reg.offset = classpos;
}
seeker += READ_LE_UINT16(seeker + 2) * 2;
}
@@ -656,12 +696,12 @@
reg.segment = seg;
reg.offset = seeker - scr->buf;
- obj = scriptObjInit(s, reg);
+ obj = scriptObjInit(reg);
#if 0
if (obj->_variables[5].offset != 0xffff) {
obj->_variables[5] = INST_LOOKUP_CLASS(obj->_variables[5].offset);
- base_obj = obj_get(s, obj->_variables[5]);
+ base_obj = obj_get(s->seg_manager, s->_version, obj->_variables[5]);
obj->variable_names_nr = base_obj->variables_nr;
obj->base_obj = base_obj->base_obj;
}
Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h 2009-08-17 05:55:21 UTC (rev 43458)
@@ -43,12 +43,22 @@
(((mgr)._heap[index] && ((mgr)._heap[index]->getType() == MEM_OBJ_SCRIPT || (mgr)._heap[index]->getType() == MEM_OBJ_CLONES))? (mgr)._heap[index] \
: NULL): NULL)
+/**
+ * Parameters for getSegment()
+ */
+typedef enum {
+ SCRIPT_GET_DONT_LOAD = 0, /**< Fail if not loaded */
+ SCRIPT_GET_LOAD = 1, /**< Load, if neccessary */
+ SCRIPT_GET_LOCK = 3 /**< Load, if neccessary, and lock */
+} SCRIPT_GET;
+
+
class SegManager : public Common::Serializable {
public:
/**
* Initialize the segment manager
*/
- SegManager(bool sci1_1);
+ SegManager(ResourceManager *resMgr, SciVersion version);
/**
* Deallocate all memory associated with the segment manager
@@ -61,14 +71,12 @@
/**
* Allocate a script into the segment manager
- * @param s The state containing resource manager
- * handlers to load the script data
* @param script_nr The number of the script to load
* @param seg_id The segment ID of the newly allocated segment,
* on success
* @return 0 on failure, 1 on success
*/
- Script *allocateScript(EngineState *s, int script_nr, SegmentId *seg_id);
+ Script *allocateScript(int script_nr, SegmentId *seg_id);
// The script must then be initialised; see section (1b.), below.
@@ -154,7 +162,7 @@
* @returns A newly created Object describing the object,
* stored within the relevant script
*/
- Object *scriptObjInit(EngineState *s, reg_t obj_pos);
+ Object *scriptObjInit(reg_t obj_pos);
/**
* Informs the segment manager that a code block must be relocated
@@ -317,13 +325,20 @@
*/
byte *dereference(reg_t reg, int *size);
+ /**
+ * Determines the segment occupied by a certain script
+ * @param[in] script_id The script in question
+ * @param[in] load One of SCRIPT_GET_*
+ * @return The script's segment, or 0 on failure
+ */
+ SegmentId getSegment(int script_nr, SCRIPT_GET load);
+ reg_t get_class_address(int classnr, SCRIPT_GET lock, reg_t caller);
-
void heapRelocate(reg_t block);
void scriptRelocateExportsSci11(SegmentId seg);
- void scriptInitialiseObjectsSci11(EngineState *s, SegmentId seg);
- int initialiseScript(Script &scr, EngineState *s, int script_nr);
+ void scriptInitialiseObjectsSci11(SegmentId seg);
+ int initialiseScript(Script &scr, int script_nr);
private:
IntMapper *id_seg_map; ///< id - script id; seg - index of heap
@@ -331,7 +346,9 @@
Common::Array<MemObject *> _heap;
int reserved_id;
int exports_wide;
- bool isSci1_1;
+ SciVersion _version;
+ ResourceManager *_resMgr;
+ Common::Array<Class> _classtable; /**< Table of all classes */
SegmentId Clones_seg_id; ///< ID of the (a) clones segment
SegmentId Lists_seg_id; ///< ID of the (a) list segment
@@ -351,9 +368,9 @@
int relocateObject(Object *obj, SegmentId segment, int location);
int findFreeId(int *id);
- static void setScriptSize(Script &scr, EngineState *s, int script_nr);
- Object *scriptObjInit0(EngineState *s, reg_t obj_pos);
- Object *scriptObjInit11(EngineState *s, reg_t obj_pos);
+ void setScriptSize(Script &scr, int script_nr);
+ Object *scriptObjInit0(reg_t obj_pos);
+ Object *scriptObjInit11(reg_t obj_pos);
/**
* Check segment validity
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-08-17 05:55:21 UTC (rev 43458)
@@ -291,8 +291,6 @@
reg_t game_obj; /**< Pointer to the game object */
- Common::Array<Class> _classtable; /**< Table of all classes */
-
SegManager *seg_manager;
int gc_countdown; /**< Number of kernel calls until next gc */
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-08-17 05:55:21 UTC (rev 43458)
@@ -187,34 +187,6 @@
#define OBJ_PROPERTY(o, p) (validate_property(o, p))
-reg_t get_class_address(EngineState *s, int classnr, SCRIPT_GET lock, reg_t caller) {
-
- if (NULL == s) {
- warning("vm.c: get_class_address(): NULL passed for \"s\"");
- return NULL_REG;
- }
-
- if (classnr < 0 || (int)s->_classtable.size() <= classnr || s->_classtable[classnr].script < 0) {
- error("[VM] Attempt to dereference class %x, which doesn't exist (max %x)", classnr, s->_classtable.size());
- return NULL_REG;
- } else {
- Class *the_class = &s->_classtable[classnr];
- if (!the_class->reg.segment) {
- script_get_segment(s, the_class->script, lock);
-
- if (!the_class->reg.segment) {
- error("[VM] Trying to instantiate class %x by instantiating script 0x%x (%03d) failed;"
- " Entering debugger.", classnr, the_class->script, the_class->script);
- return NULL_REG;
- }
- } else
- if (caller.segment != the_class->reg.segment)
- s->seg_manager->getScript(the_class->reg.segment)->incrementLockers();
-
- return the_class->reg;
- }
-}
-
// Operating on the stack
// 16 bit:
#define PUSH(v) PUSH32(make_reg(0, v))
@@ -236,7 +208,7 @@
Script *scr = s->seg_manager->getScriptIfLoaded(seg);
if (!scr) // Script not present yet?
- seg = script_instantiate(s, script);
+ seg = script_instantiate(s->resmgr, s->seg_manager, s->_version, script);
else
scr->unmarkDeleted();
@@ -313,7 +285,7 @@
Breakpoint *bp;
char method_name [256];
- sprintf(method_name, "%s::%s", obj_get_name(s, send_obj), ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector).c_str());
+ sprintf(method_name, "%s::%s", obj_get_name(s->seg_manager, s->_version, send_obj), ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector).c_str());
bp = s->bp_list;
while (bp) {
@@ -501,10 +473,6 @@
error("Fatal VM error in %s, L%d; aborting...", file, line);
}
-static Script *script_locate_by_segment(EngineState *s, SegmentId seg) {
- return s->seg_manager->getScriptIfLoaded(seg);
-}
-
static reg_t pointer_add(EngineState *s, reg_t base, int offset) {
MemObject *mobj = GET_SEGMENT_ANY(*s->seg_manager, base.segment);
@@ -559,8 +527,8 @@
// Current execution data:
scriptState.xs = &(s->_executionStack.back());
ExecStack *xs_new = NULL;
- Object *obj = obj_get(s, scriptState.xs->objp);
- Script *local_script = script_locate_by_segment(s, scriptState.xs->local_segment);
+ Object *obj = obj_get(s->seg_manager, s->_version, scriptState.xs->objp);
+ Script *local_script = s->seg_manager->getScriptIfLoaded(scriptState.xs->local_segment);
int old_execution_stack_base = s->execution_stack_base;
// Used to detect the stack bottom, for "physical" returns
const byte *code_buf = NULL; // (Avoid spurious warning)
@@ -606,7 +574,7 @@
scriptState.xs = &(s->_executionStack.back());
s->_executionStackPosChanged = false;
- scr = script_locate_by_segment(s, scriptState.xs->addr.pc.segment);
+ scr = s->seg_manager->getScriptIfLoaded(scriptState.xs->addr.pc.segment);
if (!scr) {
// No script? Implicit return via fake instruction buffer
warning("Running on non-existant script in segment %x", scriptState.xs->addr.pc.segment);
@@ -619,12 +587,12 @@
scr = NULL;
obj = NULL;
} else {
- obj = obj_get(s, scriptState.xs->objp);
+ obj = obj_get(s->seg_manager, s->_version, scriptState.xs->objp);
code_buf = scr->buf;
#ifndef DISABLE_VALIDATIONS
code_buf_size = scr->buf_size;
#endif
- local_script = script_locate_by_segment(s, scriptState.xs->local_segment);
+ local_script = s->seg_manager->getScriptIfLoaded(scriptState.xs->local_segment);
if (!local_script) {
warning("Could not find local script from segment %x", scriptState.xs->local_segment);
local_script = NULL;
@@ -1077,7 +1045,7 @@
break;
case 0x28: // class
- s->r_acc = get_class_address(s, (unsigned)opparams[0], SCRIPT_GET_LOCK,
+ s->r_acc = s->seg_manager->get_class_address((unsigned)opparams[0], SCRIPT_GET_LOCK,
scriptState.xs->addr.pc);
break;
@@ -1097,7 +1065,7 @@
break;
case 0x2b: // super
- r_temp = get_class_address(s, opparams[0], SCRIPT_GET_LOAD, scriptState.xs->addr.pc);
+ r_temp = s->seg_manager->get_class_address(opparams[0], SCRIPT_GET_LOAD, scriptState.xs->addr.pc);
if (!r_temp.segment)
error("[VM]: Invalid superclass in object");
@@ -1432,6 +1400,7 @@
static int _obj_locate_varselector(EngineState *s, Object *obj, Selector slc) {
// Determines if obj explicitly defines slc as a varselector
// Returns -1 if not found
+ SciVersion version = s->_version; // for the selector defines
if (s->_version < SCI_VERSION_1_1) {
int varnum = obj->variable_names_nr;
@@ -1452,7 +1421,7 @@
int varnum = obj->_variables[1].offset;
if (!(obj->_variables[SCRIPT_INFO_SELECTOR].offset & SCRIPT_INFO_CLASS))
- buf = ((byte *) obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR])->base_vars);
+ buf = ((byte *) obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR])->base_vars);
for (i = 0; i < varnum; i++)
if (READ_LE_UINT16(buf + (i << 1)) == slc) // Found it?
@@ -1478,6 +1447,7 @@
static SelectorType _lookup_selector_function(EngineState *s, int seg_id, Object *obj, Selector selector_id, reg_t *fptr) {
int index;
+ SciVersion version = s->_version; // for the selector defines
// "recursive" lookup
@@ -1492,7 +1462,7 @@
return kSelectorMethod;
} else {
seg_id = obj->_variables[SCRIPT_SUPERCLASS_SELECTOR].segment;
- obj = obj_get(s, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
+ obj = obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SUPERCLASS_SELECTOR]);
}
}
@@ -1500,9 +1470,10 @@
}
SelectorType lookup_selector(EngineState *s, reg_t obj_location, Selector selector_id, ObjVarRef *varp, reg_t *fptr) {
- Object *obj = obj_get(s, obj_location);
+ Object *obj = obj_get(s->seg_manager, s->_version, obj_location);
Object *species;
int index;
+ SciVersion version = s->_version; // for the selector defines
// Early SCI versions used the LSB in the selector ID as a read/write
// toggle, meaning that we must remove it for selector lookup.
@@ -1517,7 +1488,7 @@
if (IS_CLASS(obj))
species = obj;
else
- species = obj_get(s, obj->_variables[SCRIPT_SPECIES_SELECTOR]);
+ species = obj_get(s->seg_manager, s->_version, obj->_variables[SCRIPT_SPECIES_SELECTOR]);
if (!obj) {
@@ -1540,65 +1511,27 @@
return _lookup_selector_function(s, obj_location.segment, obj, selector_id, fptr);
}
-SegmentId script_get_segment(EngineState *s, int script_nr, SCRIPT_GET load) {
- SegmentId segment;
-
- if ((load & SCRIPT_GET_LOAD) == SCRIPT_GET_LOAD)
- script_instantiate(s, script_nr);
-
- segment = s->seg_manager->segGet(script_nr);
-
- if (segment > 0) {
- if ((load & SCRIPT_GET_LOCK) == SCRIPT_GET_LOCK)
- s->seg_manager->getScript(segment)->incrementLockers();
-
- return segment;
- } else
- return 0;
+reg_t script_lookup_export(SegManager *segManager, int script_nr, int export_index) {
+ SegmentId seg = segManager->getSegment(script_nr, SCRIPT_GET_DONT_LOAD);
+ Script *script = segManager->getScriptIfLoaded(seg);
+ return make_reg(seg, READ_LE_UINT16((byte *)(script->export_table + export_index)));
}
-reg_t script_lookup_export(EngineState *s, int script_nr, int export_index) {
- SegmentId seg = script_get_segment(s, script_nr, SCRIPT_GET_DONT_LOAD);
- Script *script = NULL;
+#define INST_LOOKUP_CLASS(id) ((id == 0xffff)? NULL_REG : segManager->get_class_address(id, SCRIPT_GET_LOCK, reg))
-#ifndef DISABLE_VALIDATIONS
- if (!seg)
- error("script_lookup_export(): script.%03d (0x%x) is invalid or not loaded",
- script_nr, script_nr);
-#endif
-
- script = script_locate_by_segment(s, seg);
-
-#ifndef DISABLE_VALIDATIONS
- if (script && export_index < script->exports_nr && export_index >= 0)
-#endif
- return make_reg(seg, READ_LE_UINT16((byte *)(script->export_table + export_index)));
-#ifndef DISABLE_VALIDATIONS
- else {
- if (!script)
- error("script_lookup_export(): script.%03d missing", script_nr);
- else
- error("script_lookup_export(): script.%03d: Sought invalid export %d/%d",
- script_nr, export_index, script->exports_nr);
- }
-#endif
-}
-
-#define INST_LOOKUP_CLASS(id) ((id == 0xffff)? NULL_REG : get_class_address(s, id, SCRIPT_GET_LOCK, reg))
-
-int script_instantiate_common(EngineState *s, int script_nr, Resource **script, Resource **heap, int *was_new) {
+int script_instantiate_common(ResourceManager *resMgr, SegManager *segManager, SciVersion version, int script_nr, Resource **script, Resource **heap, int *was_new) {
int seg_id;
reg_t reg;
*was_new = 1;
- *script = s->resmgr->findResource(ResourceId(kResourceTypeScript, script_nr), 0);
- if (s->_version >= SCI_VERSION_1_1)
- *heap = s->resmgr->findResource(ResourceId(kResourceTypeHeap, script_nr), 0);
+ *script = resMgr->findResource(ResourceId(kResourceTypeScript, script_nr), 0);
+ if (version >= SCI_VERSION_1_1)
+ *heap = resMgr->findResource(ResourceId(kResourceTypeHeap, script_nr), 0);
- if (!*script || (s->_version >= SCI_VERSION_1_1 && !heap)) {
+ if (!*script || (version >= SCI_VERSION_1_1 && !heap)) {
warning("Script 0x%x requested but not found", script_nr);
- if (s->_version >= SCI_VERSION_1_1) {
+ if (version >= SCI_VERSION_1_1) {
if (*heap)
warning("Inconsistency: heap resource WAS found");
else if (*script)
@@ -1607,13 +1540,8 @@
return 0;
}
- if (NULL == s) {
- warning("script_instantiate_common(): script_instantiate(): NULL passed for \"s\"");
- return 0;
- }
-
- seg_id = s->seg_manager->segGet(script_nr);
- Script *scr = script_locate_by_segment(s, seg_id);
+ seg_id = segManager->segGet(script_nr);
+ Script *scr = segManager->getScriptIfLoaded(seg_id);
if (scr) {
if (!scr->isMarkedAsDeleted()) {
scr->incrementLockers();
@@ -1622,14 +1550,14 @@
scr->freeScript();
}
} else {
- scr = s->seg_manager->allocateScript(s, script_nr, &seg_id);
+ scr = segManager->allocateScript(script_nr, &seg_id);
if (!scr) { // ALL YOUR SCRIPT BASE ARE BELONG TO US
error("Not enough heap space for script size 0x%x of script 0x%x (Should this happen?)", (*script)->size, script_nr);
return 0;
}
}
- s->seg_manager->initialiseScript(*scr, s, script_nr);
+ segManager->initialiseScript(*scr, script_nr);
reg.segment = seg_id;
reg.offset = 0;
@@ -1645,7 +1573,7 @@
return seg_id;
}
-int script_instantiate_sci0(EngineState *s, int script_nr) {
+int script_instantiate_sci0(ResourceManager *resMgr, SegManager *segManager, SciVersion version, int script_nr) {
int objtype;
unsigned int objlength;
reg_t reg;
@@ -1655,7 +1583,7 @@
Resource *script;
int was_new;
- seg_id = script_instantiate_common(s, script_nr, &script, NULL, &was_new);
+ seg_id = script_instantiate_common(resMgr, segManager, version, script_nr, &script, NULL, &was_new);
if (was_new)
return seg_id;
@@ -1663,7 +1591,7 @@
reg.segment = seg_id;
reg.offset = 0;
- Script *scr = s->seg_manager->getScript(seg_id);
+ Script *scr = segManager->getScript(seg_id);
if (((SciEngine*)g_engine)->getKernel()->hasOldScriptHeader()) {
//
@@ -1678,7 +1606,7 @@
magic_pos_adder = 2; // Step over the funny prefix
if (locals_nr)
- s->seg_manager->scriptInitialiseLocalsZero(reg.segment, locals_nr);
+ segManager->scriptInitialiseLocalsZero(reg.segment, locals_nr);
} else {
scr->mcpyInOut(0, script->data, script->size);
@@ -1717,24 +1645,24 @@
break;
case SCI_OBJ_LOCALVARS:
- s->seg_manager->scriptInitialiseLocals(data_base);
+ segManager->scriptInitialiseLocals(data_base);
break;
case SCI_OBJ_CLASS: {
int classpos = addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
int species;
species = scr->getHeap(addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET + SCRIPT_SPECIES_OFFSET);
- if (species < 0 || species >= (int)s->_classtable.size()) {
+ if (species < 0 || species >= (int)segManager->_classtable.size()) {
error("Invalid species %d(0x%x) not in interval "
"[0,%d) while instantiating script %d\n",
- species, species, s->_classtable.size(),
+ species, species, segManager->_classtable.size(),
script_nr);
return 1;
}
- s->_classtable[species].script = script_nr;
- s->_classtable[species].reg = addr;
- s->_classtable[species].reg.offset = classpos;
+ segManager->_classtable[species].script = script_nr;
+ segManager->_classtable[species].reg = addr;
+ segManager->_classtable[species].reg.offset = classpos;
// Set technical class position-- into the block allocated for it
}
break;
@@ -1760,17 +1688,17 @@
switch (objtype) {
case SCI_OBJ_CODE:
- s->seg_manager->scriptAddCodeBlock(addr);
+ segManager->scriptAddCodeBlock(addr);
break;
case SCI_OBJ_OBJECT:
case SCI_OBJ_CLASS: { // object or class?
- Object *obj = s->seg_manager->scriptObjInit(s, addr);
+ Object *obj = segManager->scriptObjInit(addr);
Object *base_obj;
// Instantiate the superclass, if neccessary
obj->_variables[SCRIPT_SPECIES_SELECTOR] = INST_LOOKUP_CLASS(obj->_variables[SCRIPT_SPECIES_SELECTOR].offset);
- base_obj = obj_get(s, obj->_variables[SCRIPT_SPECIES_SELECTOR]);
+ base_obj = obj_get(segManager, version, obj->_variables[SCRIPT_SPECIES_SELECTOR]);
obj->variable_names_nr = base_obj->_variables.size();
obj->base_obj = base_obj->base_obj;
// Copy base from species class, as we need its selector IDs
@@ -1791,24 +1719,24 @@
} while ((objtype != 0) && (((unsigned)reg.offset) < script->size - 2));
if (relocation >= 0)
- s->seg_manager->scriptRelocate(make_reg(reg.segment, relocation));
+ segManager->scriptRelocate(make_reg(reg.segment, relocation));
return reg.segment; // instantiation successful
}
-int script_instantiate_sci11(EngineState *s, int script_nr) {
+int script_instantiate_sci11(ResourceManager *resMgr, SegManager *segManager, SciVersion version, int script_nr) {
Resource *script, *heap;
int seg_id;
int heap_start;
reg_t reg;
int was_new;
- seg_id = script_instantiate_common(s, script_nr, &script, &heap, &was_new);
+ seg_id = script_instantiate_common(resMgr, segManager, version, script_nr, &script, &heap, &was_new);
if (was_new)
return seg_id;
- Script *scr = s->seg_manager->getScript(seg_id);
+ Script *scr = segManager->getScript(seg_id);
heap_start = script->size;
if (script->size & 2)
@@ -1822,28 +1750,28 @@
reg.segment = seg_id;
reg.offset = heap_start + 4;
- s->seg_manager->scriptInitialiseLocals(reg);
+ segManager->scriptInitialiseLocals(reg);
- s->seg_manager->scriptRelocateExportsSci11(seg_id);
- s->seg_manager->scriptInitialiseObjectsSci11(s, seg_id);
+ segManager->scriptRelocateExportsSci11(seg_id);
+ segManager->scriptInitialiseObjectsSci11(seg_id);
reg.offset = READ_LE_UINT16(heap->data);
- s->seg_manager->heapRelocate(reg);
+ segManager->heapRelocate(reg);
return seg_id;
}
-int script_instantiate(EngineState *s, int script_nr) {
- if (s->_version >= SCI_VERSION_1_1)
- return script_instantiate_sci11(s, script_nr);
+int script_instantiate(ResourceManager *resMgr, SegManager *segManager, SciVersion version, int script_nr) {
+ if (version >= SCI_VERSION_1_1)
+ return script_instantiate_sci11(resMgr, segManager, version, script_nr);
else
- return script_instantiate_sci0(s, script_nr);
+ return script_instantiate_sci0(resMgr, segManager, version, script_nr);
}
-void script_uninstantiate_sci0(EngineState *s, int script_nr, SegmentId seg) {
+void script_uninstantiate_sci0(SegManager *segManager, SciVersion version, int script_nr, SegmentId seg) {
reg_t reg = make_reg(seg, ((SciEngine*)g_engine)->getKernel()->hasOldScriptHeader() ? 2 : 0);
int objtype, objlength;
- Script *scr = s->seg_manager->getScript(seg);
+ Script *scr = segManager->getScript(seg);
// Make a pass over the object in order uninstantiate all superclasses
objlength = 0;
@@ -1866,13 +1794,13 @@
superclass = scr->getHeap(reg.offset + SCRIPT_SUPERCLASS_OFFSET); // Get superclass...
if (superclass >= 0) {
- int superclass_script = s->_classtable[superclass].script;
+ int superclass_script = segManager->_classtable[superclass].script;
if (superclass_script == script_nr) {
if (scr->getLockers())
scr->decrementLockers(); // Decrease lockers if this is us ourselves
} else
- script_uninstantiate(s, superclass_script);
+ script_uninstantiate(segManager, version, superclass_script);
// Recurse to assure that the superclass lockers number gets decreased
}
@@ -1884,12 +1812,10 @@
} while (objtype != 0);
}
-void script_uninstantiate(EngineState *s, int script_nr) {
- reg_t reg = make_reg(0, ((SciEngine*)g_engine)->getKernel()->hasOldScriptHeader() ? 2 : 0);
+void script_uninstantiate(SegManager *segManager, SciVersion version, int script_nr) {
+ SegmentId segment = segManager->segGet(script_nr);
+ Script *scr = segManager->getScriptIfLoaded(segment);
- reg.segment = s->seg_manager->segGet(script_nr);
- Script *scr = script_locate_by_segment(s, reg.segment);
-
if (!scr) { // Is it already loaded?
//warning("unloading script 0x%x requested although not loaded", script_nr);
// This is perfectly valid SCI behaviour
@@ -1902,12 +1828,12 @@
return;
// Free all classtable references to this script
- for (uint i = 0; i < s->_classtable.size(); i++)
- if (s->_classtable[i].reg.segment == reg.segment)
- s->_classtable[i].reg = NULL_REG;
+ for (uint i = 0; i < segManager->_classtable.size(); i++)
+ if (segManager->_classtable[i].reg.segment == segment)
+ segManager->_classtable[i].reg = NULL_REG;
- if (s->_version < SCI_VERSION_1_1)
- script_uninstantiate_sci0(s, script_nr, reg.segment);
+ if (version < SCI_VERSION_1_1)
+ script_uninstantiate_sci0(segManager, version, script_nr, segment);
else
warning("FIXME: Add proper script uninstantiation for SCI 1.1");
@@ -1999,8 +1925,8 @@
return 0;
}
-Object *obj_get(EngineState *s, reg_t offset) {
- MemObject *mobj = GET_OBJECT_SEGMENT(*s->seg_manager, offset.segment);
+Object *obj_get(SegManager *segManager, SciVersion version, reg_t offset) {
+ MemObject *mobj = GET_OBJECT_SEGMENT(*segManager, offset.segment);
Object *obj = NULL;
int idx;
@@ -2023,8 +1949,8 @@
return obj;
}
-const char *obj_get_name(EngineState *s, reg_t pos) {
- Object *obj = obj_get(s, pos);
+const char *obj_get_name(SegManager *segManager, SciVersion version, reg_t pos) {
+ Object *obj = obj_get(segManager, version, pos);
if (!obj)
return "<no such object>";
@@ -2032,7 +1958,7 @@
if (nameReg.isNull())
return "<no name>";
- const char *name = (const char*)s->seg_manager->dereference(obj->_variables[SCRIPT_NAME_SELECTOR], NULL);
+ const char *name = (const char*)segManager->dereference(obj->_variables[SCRIPT_NAME_SELECTOR], NULL);
if (!name)
return "<invalid name>";
@@ -2056,7 +1982,7 @@
}
reg_t* ObjVarRef::getPointer(EngineState *s) const {
- Object *o = obj_get(s, obj);
+ Object *o = obj_get(s->seg_manager, s->_version, obj);
if (!o) return 0;
return &(o->_variables[varindex]);
}
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-08-17 01:42:39 UTC (rev 43457)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-08-17 05:55:21 UTC (rev 43458)
@@ -29,6 +29,7 @@
/* VM and kernel declarations */
#include "sci/engine/vm_types.h" // for reg_t
+#include "sci/resource.h" // for SciVersion
#include "common/util.h"
@@ -39,6 +40,8 @@
typedef int sci_version_t;
struct IntMapper;
struct Object;
+class ResourceManager;
+extern enum SciVersion;
/** Number of bytes to be allocated for the stack */
#define VM_STACK_SIZE 0x1000
@@ -67,12 +70,12 @@
#define SCRIPT_FUNCTAREAPTR_MAGIC 8 -8
/** Offset of the name pointer */
-#define SCRIPT_NAME_OFFSET (s->_version < SCI_VERSION_1_1 ? 14 -8 : 16)
-#define SCRIPT_NAME_SELECTOR (s->_version < SCI_VERSION_1_1 ? 3 : 8)
+#define SCRIPT_NAME_OFFSET (version < SCI_VERSION_1_1 ? 14 -8 : 16)
+#define SCRIPT_NAME_SELECTOR (version < SCI_VERSION_1_1 ? 3 : 8)
/** Object-relative offset of the -info- selector */
-#define SCRIPT_INFO_OFFSET (s->_version < SCI_VERSION_1_1 ? 12 -8 : 14)
-#define SCRIPT_INFO_SELECTOR (s->_version < SCI_VERSION_1_1 ? 2 : 7)
+#define SCRIPT_INFO_OFFSET (version < SCI_VERSION_1_1 ? 12 -8 : 14)
+#define SCRIPT_INFO_SELECTOR (version < SCI_VERSION_1_1 ? 2 : 7)
/** Flag fo the -info- selector */
#define SCRIPT_INFO_CLONE 0x0001
@@ -84,18 +87,18 @@
/** Magical object identifier */
#define SCRIPT_OBJECT_MAGIC_NUMBER 0x1234
/** Offset of this identifier */
-#define SCRIPT_OBJECT_MAGIC_OFFSET (s->_version < SCI_VERSION_1_1 ? -8 : 0)
+#define SCRIPT_OBJECT_MAGIC_OFFSET (version < SCI_VERSION_1_1 ? -8 : 0)
/** Script-relative offset of the species ID */
#define SCRIPT_SPECIES_OFFSET 8 -8
-#define SCRIPT_SUPERCLASS_OFFSET (s->_version < SCI_VERSION_1_1 ? 10 -8 : 12)
+#define SCRIPT_SUPERCLASS_OFFSET (version < SCI_VERSION_1_1 ? 10 -8 : 12)
/*---------------------------------*/
/* Script selector index variables */
/*---------------------------------*/
-#define SCRIPT_SPECIES_SELECTOR (s->_version < SCI_VERSION_1_1 ? 0 : 5)
-#define SCRIPT_SUPERCLASS_SELECTOR (s->_version < SCI_VERSION_1_1 ? 1 : 6)
+#define SCRIPT_SPECIES_SELECTOR (version < SCI_VERSION_1_1 ? 0 : 5)
+#define SCRIPT_SUPERCLASS_SELECTOR (version < SCI_VERSION_1_1 ? 1 : 6)
#define SCRIPT_CLASSSCRIPT_SELECTOR 4
/** Magic adjustment value for lofsa and lofss */
@@ -467,31 +470,13 @@
ObjVarRef *varp, reg_t *fptr);
/**
- * Parameters for script_get_segment()
- */
-typedef enum {
- SCRIPT_GET_DONT_LOAD = 0, /**< Fail if not loaded */
- SCRIPT_GET_LOAD = 1, /**< Load, if neccessary */
- SCRIPT_GET_LOCK = 3 /**< Load, if neccessary, and lock */
-} SCRIPT_GET;
-
-/**
- * Determines the segment occupied by a certain script
- * @param[in] s The state to operate on
- * @param[in] script_id The script in question
- * @param[in] load One of SCRIPT_GET_*
- * @return The script's segment, or 0 on failure
- */
-SegmentId script_get_segment(EngineState *s, int script_id, SCRIPT_GET load);
-
-/**
* Looks up an entry of the exports table of a script
- * @param[in] s The state to operate on
+ * @param[in] segManager The segment manager
* @param[in] script_nr The script to look up in
* @param[out] export_index The index of the export entry to look up
* @return The handle
*/
-reg_t script_lookup_export(EngineState *s, int script_nr, int export_index);
+reg_t script_lookup_export(SegManager *segManager, int script_nr, int export_index);
/**
* Makes sure that a script and its superclasses get loaded to the heap.
@@ -499,21 +484,24 @@
* increased. All scripts containing superclasses of this script are loaded
* recursively as well, unless 'recursive' is set to zero. The
* complementary function is "script_uninstantiate()" below.
- * @param[in] s The state to operate on
- * @param[in] script_nr The script number to load
- * @return The script's segment ID or 0 if out of heap
+ * @param[in] resMgr The resource manager
+ * @param[in] segManager The segment manager
+ * @param[in] version The SCI version to use
+ * @param[in] script_nr The script number to load
+ * @return The script's segment ID or 0 if out of heap
*/
-int script_instantiate(EngineState *s, int script_nr);
+int script_instantiate(ResourceManager *resMgr, SegManager *segManager, SciVersion version, int script_nr);
/**
* Decreases the numer of lockers of a script and unloads it if that number
* reaches zero.
* This function will recursively unload scripts containing its
* superclasses, if those aren't locked by other scripts as well.
- * @param[in] s The state to operate on
+ * @param[in] segManager The segment manager
+ * @param[in] version The SCI version to use
* @param[in] script_nr The script number that is requestet to be unloaded
*/
-void script_uninstantiate(EngineState *s, int script_nr);
+void script_uninstantiate(SegManager *segManager, SciVersion version, int script_nr);
/**
* Initializes an SCI game
@@ -613,7 +601,7 @@
* in a static buffer and need not be freed (neither may
* it be modified).
*/
-const char *obj_get_name(EngineState *s, reg_t pos);
+const char *obj_get_name(SegManager *segManager, SciVersion version, reg_t pos);
/**
* Retrieves an object from the specified location
@@ -621,7 +609,7 @@
* @param[in] offset The object's offset
* @return The object in question, or NULL if there is none
*/
-Object *obj_get(EngineState *s, reg_t offset);
+Object *obj_get(SegManager *segManager, SciVersion version, reg_t offset);
/**
* Shrink execution stack to size.
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