[Scummvm-cvs-logs] SF.net SVN: scummvm:[40374] scummvm/trunk/engines/sci/engine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri May 8 11:53:31 CEST 2009
Revision: 40374
http://scummvm.svn.sourceforge.net/scummvm/?rev=40374&view=rev
Author: fingolfin
Date: 2009-05-08 09:53:31 +0000 (Fri, 08 May 2009)
Log Message:
-----------
SCI: Renamed dstack_t -> DataStack; removed obsolete KF_OLD constant
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kernel.h
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/vm.h
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-05-08 09:53:31 UTC (rev 40374)
@@ -549,7 +549,7 @@
int game_init(EngineState *s) {
// FIXME Use new VM instantiation code all over the place"
reg_t game_obj; // Address of the game object
- dstack_t *stack;
+ DataStack *stack;
stack = s->seg_manager->allocateStack(VM_STACK_SIZE, &s->stack_segment);
s->stack_base = stack->entries;
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-05-08 09:53:31 UTC (rev 40374)
@@ -629,10 +629,6 @@
s->_kfuncTable[functnr].orig_name = sought_name;
} else
switch (kfunct_mappers[found].type) {
- case KF_OLD:
- sciprintf("Emulated kernel function found.\nThis shouldn't happen anymore.");
- return 1;
-
case KF_NONE:
s->_kfuncTable[functnr].signature = NULL;
++ignored;
@@ -697,7 +693,7 @@
return KSIG_REF | KSIG_INVALID;
case MEM_OBJ_STACK:
- if (allow_invalid || reg.offset < (*(dstack_t *)mobj).nr * sizeof(reg_t))
+ if (allow_invalid || reg.offset < (*(DataStack *)mobj).nr * sizeof(reg_t))
return KSIG_REF;
else
return KSIG_REF | KSIG_INVALID;
Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/kernel.h 2009-05-08 09:53:31 UTC (rev 40374)
@@ -310,11 +310,13 @@
Common::String orig_name; /* Original name, in case we couldn't map it */
};
-#define KF_OLD 0
-#define KF_NEW 1
-#define KF_NONE -1 /* No mapping, but name is known */
-#define KF_TERMINATOR -42 /* terminates kfunct_mappers */
+enum {
+ KF_NEW = 1,
+ KF_NONE = -1, /* No mapping, but name is known */
+ KF_TERMINATOR = -42 /* terminates kfunct_mappers */
+};
+
struct SciKernelFunction {
int type; /* KF_* */
const char *name;
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-05-08 09:53:31 UTC (rev 40374)
@@ -439,10 +439,10 @@
break;
case MEM_OBJ_STACK:
// TODO: Switch this stack to use class Common::Stack?
- s.syncAsUint32LE((*(dstack_t *)mobj).nr);
+ s.syncAsUint32LE((*(DataStack *)mobj).nr);
if (s.isLoading()) {
- //free((*(dstack_t *)mobj).entries);
- (*(dstack_t *)mobj).entries = (reg_t *)sci_calloc((*(dstack_t *)mobj).nr, sizeof(reg_t));
+ //free((*(DataStack *)mobj).entries);
+ (*(DataStack *)mobj).entries = (reg_t *)sci_calloc((*(DataStack *)mobj).nr, sizeof(reg_t));
}
break;
case MEM_OBJ_HUNK:
@@ -539,7 +539,7 @@
// FIXME: This should probably be turned into an EngineState method
static void reconstruct_stack(EngineState *retval) {
SegmentId stack_seg = find_unique_seg_by_type(retval->seg_manager, MEM_OBJ_STACK);
- dstack_t *stack = (dstack_t *)(retval->seg_manager->_heap[stack_seg]);
+ DataStack *stack = (DataStack *)(retval->seg_manager->_heap[stack_seg]);
retval->stack_segment = stack_seg;
retval->stack_base = stack->entries;
Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp 2009-05-08 09:53:31 UTC (rev 40374)
@@ -305,7 +305,7 @@
break;
case MEM_OBJ_STACK:
- sciprintf("D data stack (%d)", (*(dstack_t *)mobj).nr);
+ sciprintf("D data stack (%d)", (*(DataStack *)mobj).nr);
break;
case MEM_OBJ_SYS_STRINGS:
@@ -419,7 +419,7 @@
break;
case MEM_OBJ_STACK: {
- dstack_t *stack = (dstack_t *)mobj;
+ DataStack *stack = (DataStack *)mobj;
sciprintf("stack\n");
sciprintf(" %d (0x%x) entries\n", stack->nr, stack->nr);
}
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-05-08 09:53:31 UTC (rev 40374)
@@ -313,7 +313,7 @@
mem = new SystemStrings();
break;
case MEM_OBJ_STACK:
- mem = new dstack_t();
+ mem = new DataStack();
break;
case MEM_OBJ_HUNK:
mem = new HunkTable();
@@ -939,9 +939,9 @@
}
*/
-dstack_t *SegManager::allocateStack(int size, SegmentId *segid) {
+DataStack *SegManager::allocateStack(int size, SegmentId *segid) {
MemObject *mobj = allocNonscriptSegment(MEM_OBJ_STACK, segid);
- dstack_t *retval = (dstack_t *)mobj;
+ DataStack *retval = (DataStack *)mobj;
retval->entries = (reg_t *)sci_calloc(size, sizeof(reg_t));
retval->nr = size;
@@ -1091,7 +1091,7 @@
return base + pointer.offset;
}
-byte *dstack_t::dereference(reg_t pointer, int *size) {
+byte *DataStack::dereference(reg_t pointer, int *size) {
int count = nr * sizeof(reg_t);
byte *base = (byte *)entries;
@@ -1374,7 +1374,7 @@
return addr;
}
-void dstack_t::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
+void DataStack::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
fprintf(stderr, "Emitting %d stack entries\n", nr);
for (int i = 0; i < nr; i++)
(*note)(param, entries[i]);
Modified: scummvm/trunk/engines/sci/engine/seg_manager.h
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.h 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/seg_manager.h 2009-05-08 09:53:31 UTC (rev 40374)
@@ -278,15 +278,15 @@
// Allocates a data stack
// Parameters: (int) size: Number of stack entries to reserve
- // Returns : (dstack_t *): The physical stack
+ // Returns : (DataStack *): The physical stack
// (SegmentId) segid: Segment ID of the stack
- dstack_t *allocateStack(int size, SegmentId *segid);
+ DataStack *allocateStack(int size, SegmentId *segid);
// 5. System Strings
// Allocates a system string table
- // Returns : (dstack_t *): The physical stack
+ // Returns : (DataStack *): The physical stack
// (SegmentId) segid: Segment ID of the stack
// See also sys_string_acquire();
SystemStrings *allocateSysStrings(SegmentId *segid);
Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h 2009-05-08 09:53:10 UTC (rev 40373)
+++ scummvm/trunk/engines/sci/engine/vm.h 2009-05-08 09:53:31 UTC (rev 40374)
@@ -369,16 +369,16 @@
};
/** Data stack */
-struct dstack_t : MemObject {
+struct DataStack : MemObject {
int nr; /**< Number of stack entries */
reg_t *entries;
public:
- dstack_t() {
+ DataStack() {
nr = 0;
entries = NULL;
}
- ~dstack_t() {
+ ~DataStack() {
free(entries);
entries = NULL;
}
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