diff options
| author | Max Horn | 2009-04-28 15:58:19 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-28 15:58:19 +0000 |
| commit | 294bd0dc071d0e38719de1c1260ad30be8199618 (patch) | |
| tree | 684ce45ac90d0fc89e28fdabad794b8e789c3aea /engines/sci/engine/gc.cpp | |
| parent | 01fceec37c83ba855ed60b284d47c7e6a84d2f1d (diff) | |
| download | scummvm-rg350-294bd0dc071d0e38719de1c1260ad30be8199618.tar.gz scummvm-rg350-294bd0dc071d0e38719de1c1260ad30be8199618.tar.bz2 scummvm-rg350-294bd0dc071d0e38719de1c1260ad30be8199618.zip | |
SCI: Renamed execution_stack -> _executionStack and turned it into a Common::Array
svn-id: r40182
Diffstat (limited to 'engines/sci/engine/gc.cpp')
| -rw-r--r-- | engines/sci/engine/gc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/engine/gc.cpp b/engines/sci/engine/gc.cpp index ae0b9fefed..c3fcfff75f 100644 --- a/engines/sci/engine/gc.cpp +++ b/engines/sci/engine/gc.cpp @@ -153,10 +153,10 @@ reg_t_hash_map *find_all_used_references(EngineState *s) { // Init: Value Stack // We do this one by hand since the stack doesn't know the current execution stack { - ExecStack *xs = s->execution_stack + s->execution_stack_pos; + ExecStack &xs = s->_executionStack[s->execution_stack_pos]; reg_t *pos; - for (pos = s->stack_base; pos < xs->sp; pos++) + for (pos = s->stack_base; pos < xs.sp; pos++) worklist_push(&worklist, nonnormal_map, *pos); } #ifdef DEBUG_GC_VERBOSE @@ -165,13 +165,13 @@ reg_t_hash_map *find_all_used_references(EngineState *s) { // Init: Execution Stack for (i = 0; i <= s->execution_stack_pos; i++) { - ExecStack *es = s->execution_stack + i; + ExecStack &es = s->_executionStack[i]; - if (es->type != EXEC_STACK_TYPE_KERNEL) { - worklist_push(&worklist, nonnormal_map, es->objp); - worklist_push(&worklist, nonnormal_map, es->sendp); - if (es->type == EXEC_STACK_TYPE_VARSELECTOR) - worklist_push(&worklist, nonnormal_map, *(es->addr.varp)); + if (es.type != EXEC_STACK_TYPE_KERNEL) { + worklist_push(&worklist, nonnormal_map, es.objp); + worklist_push(&worklist, nonnormal_map, es.sendp); + if (es.type == EXEC_STACK_TYPE_VARSELECTOR) + worklist_push(&worklist, nonnormal_map, *(es.addr.varp)); } } #ifdef DEBUG_GC_VERBOSE |