@@ -3,6 +3,20 @@ namespace factor { +context::context(cell ds_size, cell rs_size) : + callstack_top(NULL), + callstack_bottom(NULL), + datastack(0), + retainstack(0), + datastack_save(0), + retainstack_save(0), + magic_frame(NULL), + datastack_region(new segment(ds_size,false)), + retainstack_region(new segment(rs_size,false)), + catchstack_save(0), + current_callback_save(0), + next(NULL) {} + void factor_vm::reset_datastack() { ds = ds_bot - sizeof(cell); @@ -42,11 +56,7 @@ context *factor_vm::alloc_context() unused_contexts = unused_contexts->next; } else - { - new_context = new context; - new_context->datastack_region = new segment(ds_size,false); - new_context->retainstack_region = new segment(rs_size,false); - } + new_context = new context(ds_size,rs_size); return new_context; } vm/contexts.cpp @@ -46,6 +46,8 @@ struct context { cell current_callback_save; context *next; + + context(cell ds_size, cell rs_size); }; #define ds_bot (ctx->datastack_region->start) vm/contexts.hpp a4b760e9ad3750d5746a86b30d5ae07a04316389 Slava Pestov slava@slava-pestovs-macbook-pro.local http://github.com/slavapestov/factor/commit/07b56b9806d008d450a9b46c68ac3b5dc44407dd 07b56b9806d008d450a9b46c68ac3b5dc44407dd 2009-11-08T17:44:18-08:00 2009-11-08T17:44:18-08:00 vm/contexts: cleanup f9316bdf82426c8c9189d1868be68716c527e4ab Slava Pestov slava@slava-pestovs-macbook-pro.local