diff options
author | Max Horn | 2010-06-28 12:55:47 +0000 |
---|---|---|
committer | Max Horn | 2010-06-28 12:55:47 +0000 |
commit | 9b4406fd350458e1fe194dadd76a0cb97c2ca324 (patch) | |
tree | 66912f39851e5a4083d50dfcda66596d47ad37e3 /engines/sci/engine/gc.cpp | |
parent | 8ae9774a009a2c12123d4bc9070a3d8f043a1c34 (diff) | |
download | scummvm-rg350-9b4406fd350458e1fe194dadd76a0cb97c2ca324.tar.gz scummvm-rg350-9b4406fd350458e1fe194dadd76a0cb97c2ca324.tar.bz2 scummvm-rg350-9b4406fd350458e1fe194dadd76a0cb97c2ca324.zip |
SCI: Some more GC cleanup
svn-id: r50443
Diffstat (limited to 'engines/sci/engine/gc.cpp')
-rw-r--r-- | engines/sci/engine/gc.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index a306045cb7..3c8c1f17a8 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -150,36 +150,45 @@ reg_t_hash_map *find_all_used_references(EngineState *s) { } void run_gc(EngineState *s) { - uint seg_nr; SegManager *segMan = s->_segMan; + // Some debug stuff + debugC(2, kDebugLevelGC, "[GC] Running..."); const char *segnames[SEG_TYPE_MAX + 1]; int segcount[SEG_TYPE_MAX + 1]; - debugC(2, kDebugLevelGC, "[GC] Running..."); + memset(segnames, 0, sizeof(segnames)); memset(segcount, 0, sizeof(segcount)); - reg_t_hash_map *use_map = find_all_used_references(s); - - for (seg_nr = 1; seg_nr < segMan->_heap.size(); seg_nr++) { - if (segMan->_heap[seg_nr] != NULL) { - SegmentObj *mobj = segMan->_heap[seg_nr]; - segnames[mobj->getType()] = SegmentObj::getSegmentTypeName(mobj->getType()); - const Common::Array<reg_t> tmp = mobj->listAllDeallocatable(seg_nr); + // Compute the set of all segments references currently in use. + reg_t_hash_map *activeRefs = find_all_used_references(s); + + // Iterate over all segments, and check for each whether it + // contains stuff that can be collected. + for (uint seg = 1; seg < segMan->_heap.size(); seg++) { + SegmentObj *mobj = segMan->_heap[seg]; + if (mobj != NULL) { + const SegmentType type = mobj->getType(); + segnames[type] = SegmentObj::getSegmentTypeName(type); + + // Get a list of all deallocatable objects in this segment, + // then free any which are not referenced from somewhere. + const Common::Array<reg_t> tmp = mobj->listAllDeallocatable(seg); for (Common::Array<reg_t>::const_iterator it = tmp.begin(); it != tmp.end(); ++it) { const reg_t addr = *it; - if (!use_map->contains(addr)) { + if (!activeRefs->contains(addr)) { // Not found -> we can free it mobj->freeAtAddress(segMan, addr); debugC(2, kDebugLevelGC, "[GC] Deallocating %04x:%04x", PRINT_REG(addr)); - segcount[mobj->getType()]++; + segcount[type]++; } } } } - delete use_map; + delete activeRefs; + // Output debug summary of garbage collection debugC(2, kDebugLevelGC, "[GC] Summary:"); for (int i = 0; i <= SEG_TYPE_MAX; i++) if (segcount[i]) |