From 3b3cc151e930a68abc8eabbcf7d928d82382e480 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= Date: Wed, 23 Nov 2016 03:50:28 +0100 Subject: [PATCH] VM: removing factor_vm::init_contexts() --- vm/contexts.cpp | 12 ------------ vm/factor.cpp | 9 ++++++++- vm/vm.hpp | 2 -- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/vm/contexts.cpp b/vm/contexts.cpp index d110418db5..d0e528722e 100644 --- a/vm/contexts.cpp +++ b/vm/contexts.cpp @@ -81,18 +81,6 @@ context::~context() { delete callstack_seg; } -// called on startup -// Allocates memory (new_context()) -void factor_vm::init_contexts(cell datastack_size_, cell retainstack_size_, - cell callstack_size_) { - datastack_size = datastack_size_; - retainstack_size = retainstack_size_; - callstack_size = callstack_size_; - - ctx = NULL; - spare_ctx = new_context(); -} - context* factor_vm::new_context() { context* new_context; diff --git a/vm/factor.cpp b/vm/factor.cpp index 7ef57d1f12..2acf759660 100644 --- a/vm/factor.cpp +++ b/vm/factor.cpp @@ -68,7 +68,14 @@ void factor_vm::init_factor(vm_parameters* p) { srand((unsigned int)nano_count()); init_ffi(); - init_contexts(p->datastack_size, p->retainstack_size, p->callstack_size); + + datastack_size = p->datastack_size; + retainstack_size = p->retainstack_size; + callstack_size = p->callstack_size; + + ctx = NULL; + spare_ctx = new_context(); + callbacks = new callback_heap(p->callback_size, this); load_image(p); max_pic_size = (int)p->max_pic_size; diff --git a/vm/vm.hpp b/vm/vm.hpp index c52f1478cf..e165233d38 100644 --- a/vm/vm.hpp +++ b/vm/vm.hpp @@ -156,8 +156,6 @@ struct factor_vm { context* new_context(); void init_context(context* ctx); void delete_context(); - void init_contexts(cell datastack_size_, cell retainstack_size_, - cell callstack_size_); cell begin_callback(cell quot); void end_callback(); void primitive_current_callback(); -- 2.34.1