diff options
| author | Max Horn | 2009-09-17 00:45:12 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-17 00:45:12 +0000 |
| commit | 10f898c90eef6c63995d21c2150f022ae012ea4d (patch) | |
| tree | ad33cf3914f3b81b2c64744942ce46d47d1c9bbf /engines/sci/engine/gc.cpp | |
| parent | 1f0e8ef4705ba242e66d5f8c0c20b2c21078bdf7 (diff) | |
| download | scummvm-rg350-10f898c90eef6c63995d21c2150f022ae012ea4d.tar.gz scummvm-rg350-10f898c90eef6c63995d21c2150f022ae012ea4d.tar.bz2 scummvm-rg350-10f898c90eef6c63995d21c2150f022ae012ea4d.zip | |
SCI: Rename MemObject -> SegmentObj
svn-id: r44130
Diffstat (limited to 'engines/sci/engine/gc.cpp')
| -rw-r--r-- | engines/sci/engine/gc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index d6f9bab2af..5e5db1f8a4 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -53,7 +53,7 @@ static reg_t_hash_map *normalise_hashmap_ptrs(SegManager *segMan, reg_t_hash_map for (reg_t_hash_map::iterator i = nonnormal_map.begin(); i != nonnormal_map.end(); ++i) { reg_t reg = i->_key; - MemObject *mobj = (reg.segment < segMan->_heap.size()) ? segMan->_heap[reg.segment] : NULL; + SegmentObj *mobj = (reg.segment < segMan->_heap.size()) ? segMan->_heap[reg.segment] : NULL; if (mobj) { reg = mobj->findCanonicAddress(segMan, reg); @@ -111,7 +111,7 @@ reg_t_hash_map *find_all_used_references(EngineState *s) { // Init: Explicitly loaded scripts for (i = 1; i < segMan->_heap.size(); i++) if (segMan->_heap[i] - && segMan->_heap[i]->getType() == MEM_OBJ_SCRIPT) { + && segMan->_heap[i]->getType() == SEG_TYPE_SCRIPT) { Script *script = (Script *)segMan->_heap[i]; if (script->getLockers()) { // Explicitly loaded? @@ -146,10 +146,10 @@ reg_t_hash_map *find_all_used_references(EngineState *s) { struct deallocator_t { SegManager *segMan; - MemObject *mobj; + SegmentObj *mobj; #ifdef DEBUG_GC - char *segnames[MEM_OBJ_MAX + 1]; - int segcount[MEM_OBJ_MAX + 1]; + char *segnames[SEG_TYPE_MAX + 1]; + int segcount[SEG_TYPE_MAX + 1]; #endif reg_t_hash_map *use_map; }; @@ -176,7 +176,7 @@ void run_gc(EngineState *s) { #ifdef DEBUG_GC debugC(2, kDebugLevelGC, "[GC] Running...\n"); - memset(&(deallocator.segcount), 0, sizeof(int) * (MEM_OBJ_MAX + 1)); + memset(&(deallocator.segcount), 0, sizeof(int) * (SEG_TYPE_MAX + 1)); #endif deallocator.segMan = segMan; @@ -198,7 +198,7 @@ void run_gc(EngineState *s) { { int i; debugC(2, kDebugLevelGC, "[GC] Summary:\n"); - for (i = 0; i <= MEM_OBJ_MAX; i++) + for (i = 0; i <= SEG_TYPE_MAX; i++) if (deallocator.segcount[i]) debugC(2, kDebugLevelGC, "\t%d\t* %s\n", deallocator.segcount[i], deallocator.segnames[i]); } |