VM: init_data_heap() isn't needed
parent
67bb9a7c71
commit
3911f7b88c
|
@ -56,7 +56,7 @@ data_heap::~data_heap() {
|
||||||
|
|
||||||
data_heap* data_heap::grow(bump_allocator* vm_nursery, cell requested_bytes) {
|
data_heap* data_heap::grow(bump_allocator* vm_nursery, cell requested_bytes) {
|
||||||
FACTOR_ASSERT(vm_nursery->occupied_space() == 0);
|
FACTOR_ASSERT(vm_nursery->occupied_space() == 0);
|
||||||
cell new_tenured_size = (tenured_size * 2) + requested_bytes;
|
cell new_tenured_size = 2 * tenured_size + requested_bytes;
|
||||||
return new data_heap(vm_nursery, young_size, aging_size, new_tenured_size);
|
return new data_heap(vm_nursery, young_size, aging_size, new_tenured_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -107,11 +107,6 @@ void factor_vm::set_data_heap(data_heap* data_) {
|
||||||
decks_offset = (cell)data->decks - addr_to_deck(data->start);
|
decks_offset = (cell)data->decks - addr_to_deck(data->start);
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::init_data_heap(cell young_size, cell aging_size,
|
|
||||||
cell tenured_size) {
|
|
||||||
set_data_heap(new data_heap(&nursery, young_size, aging_size, tenured_size));
|
|
||||||
}
|
|
||||||
|
|
||||||
data_heap_room factor_vm::data_room() {
|
data_heap_room factor_vm::data_room() {
|
||||||
data_heap_room room;
|
data_heap_room room;
|
||||||
|
|
||||||
|
|
|
@ -95,8 +95,9 @@ void vm_parameters::init_from_args(int argc, vm_char** argv) {
|
||||||
void factor_vm::load_data_heap(FILE* file, image_header* h, vm_parameters* p) {
|
void factor_vm::load_data_heap(FILE* file, image_header* h, vm_parameters* p) {
|
||||||
p->tenured_size = std::max((h->data_size * 3) / 2, p->tenured_size);
|
p->tenured_size = std::max((h->data_size * 3) / 2, p->tenured_size);
|
||||||
|
|
||||||
init_data_heap(p->young_size, p->aging_size, p->tenured_size);
|
data_heap *d = new data_heap(&nursery,
|
||||||
|
p->young_size, p->aging_size, p->tenured_size);
|
||||||
|
set_data_heap(d);
|
||||||
fixnum bytes_read =
|
fixnum bytes_read =
|
||||||
raw_fread((void*)data->tenured->start, 1, h->data_size, file);
|
raw_fread((void*)data->tenured->start, 1, h->data_size, file);
|
||||||
|
|
||||||
|
|
|
@ -278,7 +278,6 @@ struct factor_vm {
|
||||||
|
|
||||||
//data heap
|
//data heap
|
||||||
void set_data_heap(data_heap* data_);
|
void set_data_heap(data_heap* data_);
|
||||||
void init_data_heap(cell young_size, cell aging_size, cell tenured_size);
|
|
||||||
void primitive_size();
|
void primitive_size();
|
||||||
data_heap_room data_room();
|
data_heap_room data_room();
|
||||||
void primitive_data_room();
|
void primitive_data_room();
|
||||||
|
|
Loading…
Reference in New Issue