VM: Refactor objects* to Factor style
Erik Charlebois
parent
56ceeb582a
commit
228d813a7d
|
|
@ -1,43 +1,37 @@
|
|||
#include "master.hpp"
|
||||
|
||||
namespace factor
|
||||
{
|
||||
namespace factor {
|
||||
|
||||
void factor_vm::primitive_special_object()
|
||||
{
|
||||
void factor_vm::primitive_special_object() {
|
||||
fixnum n = untag_fixnum(ctx->peek());
|
||||
ctx->replace(special_objects[n]);
|
||||
}
|
||||
|
||||
void factor_vm::primitive_set_special_object()
|
||||
{
|
||||
void factor_vm::primitive_set_special_object() {
|
||||
fixnum n = untag_fixnum(ctx->pop());
|
||||
cell value = ctx->pop();
|
||||
special_objects[n] = value;
|
||||
}
|
||||
|
||||
void factor_vm::primitive_identity_hashcode()
|
||||
{
|
||||
void factor_vm::primitive_identity_hashcode() {
|
||||
cell tagged = ctx->peek();
|
||||
object* obj = untag<object>(tagged);
|
||||
ctx->replace(tag_fixnum(obj->hashcode()));
|
||||
}
|
||||
|
||||
void factor_vm::compute_identity_hashcode(object *obj)
|
||||
{
|
||||
void factor_vm::compute_identity_hashcode(object* obj) {
|
||||
object_counter++;
|
||||
if (object_counter == 0)
|
||||
object_counter++;
|
||||
if(object_counter == 0) object_counter++;
|
||||
obj->set_hashcode((cell) obj ^ object_counter);
|
||||
}
|
||||
|
||||
void factor_vm::primitive_compute_identity_hashcode()
|
||||
{
|
||||
void factor_vm::primitive_compute_identity_hashcode() {
|
||||
object* obj = untag<object>(ctx->pop());
|
||||
compute_identity_hashcode(obj);
|
||||
}
|
||||
|
||||
void factor_vm::primitive_set_slot()
|
||||
{
|
||||
void factor_vm::primitive_set_slot() {
|
||||
fixnum slot = untag_fixnum(ctx->pop());
|
||||
object* obj = untag<object>(ctx->pop());
|
||||
cell value = ctx->pop();
|
||||
|
|
@ -48,14 +42,12 @@ void factor_vm::primitive_set_slot()
|
|||
}
|
||||
|
||||
/* Allocates memory */
|
||||
cell factor_vm::clone_object(cell obj_)
|
||||
{
|
||||
cell factor_vm::clone_object(cell obj_) {
|
||||
data_root<object> obj(obj_, this);
|
||||
|
||||
if (immediate_p(obj.value()))
|
||||
return obj.value();
|
||||
else
|
||||
{
|
||||
else {
|
||||
cell size = object_size(obj.value());
|
||||
object* new_obj = allot_object(obj.type(), size);
|
||||
memcpy(new_obj, obj.untagged(), size);
|
||||
|
|
@ -65,14 +57,10 @@ cell factor_vm::clone_object(cell obj_)
|
|||
}
|
||||
|
||||
/* Allocates memory */
|
||||
void factor_vm::primitive_clone()
|
||||
{
|
||||
ctx->replace(clone_object(ctx->peek()));
|
||||
}
|
||||
void factor_vm::primitive_clone() { ctx->replace(clone_object(ctx->peek())); }
|
||||
|
||||
/* Size of the object pointed to by a tagged pointer */
|
||||
cell factor_vm::object_size(cell tagged)
|
||||
{
|
||||
cell factor_vm::object_size(cell tagged) {
|
||||
if (immediate_p(tagged))
|
||||
return 0;
|
||||
else
|
||||
|
|
@ -80,19 +68,17 @@ cell factor_vm::object_size(cell tagged)
|
|||
}
|
||||
|
||||
/* Allocates memory */
|
||||
void factor_vm::primitive_size()
|
||||
{
|
||||
void factor_vm::primitive_size() {
|
||||
ctx->push(from_unsigned_cell(object_size(ctx->pop())));
|
||||
}
|
||||
|
||||
struct slot_become_fixup : no_fixup {
|
||||
std::map<object*, object*>* become_map;
|
||||
|
||||
explicit slot_become_fixup(std::map<object *,object *> *become_map_) :
|
||||
become_map(become_map_) {}
|
||||
explicit slot_become_fixup(std::map<object*, object*>* become_map_)
|
||||
: become_map(become_map_) {}
|
||||
|
||||
object *fixup_data(object *old)
|
||||
{
|
||||
object* fixup_data(object* old) {
|
||||
std::map<object*, object*>::const_iterator iter = become_map->find(old);
|
||||
if (iter != become_map->end())
|
||||
return iter->second;
|
||||
|
|
@ -104,23 +90,20 @@ struct slot_become_fixup : no_fixup {
|
|||
struct object_become_visitor {
|
||||
slot_visitor<slot_become_fixup>* workhorse;
|
||||
|
||||
explicit object_become_visitor(slot_visitor<slot_become_fixup> *workhorse_) :
|
||||
workhorse(workhorse_) {}
|
||||
explicit object_become_visitor(slot_visitor<slot_become_fixup>* workhorse_)
|
||||
: workhorse(workhorse_) {}
|
||||
|
||||
void operator()(object *obj)
|
||||
{
|
||||
workhorse->visit_slots(obj);
|
||||
}
|
||||
void operator()(object* obj) { workhorse->visit_slots(obj); }
|
||||
};
|
||||
|
||||
struct code_block_become_visitor {
|
||||
slot_visitor<slot_become_fixup>* workhorse;
|
||||
|
||||
explicit code_block_become_visitor(slot_visitor<slot_become_fixup> *workhorse_) :
|
||||
workhorse(workhorse_) {}
|
||||
explicit code_block_become_visitor(
|
||||
slot_visitor<slot_become_fixup>* workhorse_)
|
||||
: workhorse(workhorse_) {}
|
||||
|
||||
void operator()(code_block *compiled, cell size)
|
||||
{
|
||||
void operator()(code_block* compiled, cell size) {
|
||||
workhorse->visit_code_block_objects(compiled);
|
||||
workhorse->visit_embedded_literals(compiled);
|
||||
}
|
||||
|
|
@ -129,19 +112,16 @@ struct code_block_become_visitor {
|
|||
struct code_block_write_barrier_visitor {
|
||||
code_heap* code;
|
||||
|
||||
explicit code_block_write_barrier_visitor(code_heap *code_) :
|
||||
code(code_) {}
|
||||
explicit code_block_write_barrier_visitor(code_heap* code_) : code(code_) {}
|
||||
|
||||
void operator()(code_block *compiled, cell size)
|
||||
{
|
||||
void operator()(code_block* compiled, cell size) {
|
||||
code->write_barrier(compiled);
|
||||
}
|
||||
};
|
||||
|
||||
/* classes.tuple uses this to reshape tuples; tools.deploy.shaker uses this
|
||||
to coalesce equal but distinct quotations and wrappers. */
|
||||
void factor_vm::primitive_become()
|
||||
{
|
||||
void factor_vm::primitive_become() {
|
||||
array* new_objects = untag_check<array>(ctx->pop());
|
||||
array* old_objects = untag_check<array>(ctx->pop());
|
||||
|
||||
|
|
@ -152,8 +132,7 @@ void factor_vm::primitive_become()
|
|||
/* Build the forwarding map */
|
||||
std::map<object*, object*> become_map;
|
||||
|
||||
for(cell i = 0; i < capacity; i++)
|
||||
{
|
||||
for (cell i = 0; i < capacity; i++) {
|
||||
tagged<object> old_obj(array_nth(old_objects, i));
|
||||
tagged<object> new_obj(array_nth(new_objects, i));
|
||||
|
||||
|
|
@ -163,7 +142,8 @@ void factor_vm::primitive_become()
|
|||
|
||||
/* Update all references to old objects to point to new objects */
|
||||
{
|
||||
slot_visitor<slot_become_fixup> workhorse(this,slot_become_fixup(&become_map));
|
||||
slot_visitor<slot_become_fixup> workhorse(this,
|
||||
slot_become_fixup(&become_map));
|
||||
workhorse.visit_roots();
|
||||
workhorse.visit_contexts();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
namespace factor
|
||||
{
|
||||
namespace factor {
|
||||
|
||||
// Special object count and identifiers must be kept in sync with:
|
||||
// core/kernel/kernel.factor
|
||||
|
|
@ -114,21 +113,18 @@ anyway, to reduce image size */
|
|||
#define OBJ_FIRST_SAVE OBJ_STARTUP_QUOT
|
||||
#define OBJ_LAST_SAVE OBJ_STAGE2
|
||||
|
||||
inline static bool save_special_p(cell i)
|
||||
{
|
||||
inline static bool save_special_p(cell i) {
|
||||
return (i >= OBJ_FIRST_SAVE && i <= OBJ_LAST_SAVE);
|
||||
}
|
||||
|
||||
template<typename Iterator> void object::each_slot(Iterator &iter)
|
||||
{
|
||||
template <typename Iterator> void object::each_slot(Iterator& iter) {
|
||||
cell scan = (cell) this;
|
||||
cell payload_start = binary_payload_start();
|
||||
cell end = scan + payload_start;
|
||||
|
||||
scan += sizeof(cell);
|
||||
|
||||
while(scan < end)
|
||||
{
|
||||
while (scan < end) {
|
||||
iter((cell*)scan);
|
||||
scan += sizeof(cell);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue