steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: Refactor words.cpp to Factor style

db4
Erik Charlebois 2013-05-11 22:32:09 -04:00
parent 5614985c3d
commit 38c9db88e2
1 changed files with 61 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
vm/words.cpp
View File

@ -1,55 +1,51 @@
#include "master.hpp" #include "master.hpp"
namespace factor namespace factor {
{
/* Compile a word definition with the non-optimizing compiler. */ /* Compile a word definition with the non-optimizing compiler. */
/* Allocates memory */ /* Allocates memory */
void factor_vm::jit_compile_word(cell word_, cell def_, bool relocating) void factor_vm::jit_compile_word(cell word_, cell def_, bool relocating) {
{ data_root<word> word(word_, this);
data_root<word> word(word_,this); data_root<quotation> def(def_, this);
data_root<quotation> def(def_,this);
/* Refuse to compile this word more than once, because quot_compiled_p() /* Refuse to compile this word more than once, because quot_compiled_p()
depends on the identity of its code block */ depends on the identity of its code block */
if(word->entry_point && word.value() == special_objects[LAZY_JIT_COMPILE_WORD]) if (word->entry_point &&
word.value() == special_objects[LAZY_JIT_COMPILE_WORD])
return; return;
code_block *compiled = jit_compile_quot(word.value(),def.value(),relocating); code_block* compiled =
jit_compile_quot(word.value(), def.value(), relocating);
word->entry_point = compiled->entry_point(); word->entry_point = compiled->entry_point();
if(to_boolean(word->pic_def)) jit_compile_quot(word->pic_def,relocating); if (to_boolean(word->pic_def))
if(to_boolean(word->pic_tail_def)) jit_compile_quot(word->pic_tail_def,relocating); jit_compile_quot(word->pic_def, relocating);
if (to_boolean(word->pic_tail_def))
jit_compile_quot(word->pic_tail_def, relocating);
} }
/* Allocates memory */ /* Allocates memory */
cell factor_vm::find_all_words() cell factor_vm::find_all_words() { return instances(WORD_TYPE); }
{
return instances(WORD_TYPE);
}
/* Allocates memory */ /* Allocates memory */
void factor_vm::compile_all_words() void factor_vm::compile_all_words() {
{ data_root<array> words(find_all_words(), this);
data_root<array> words(find_all_words(),this);
cell length = array_capacity(words.untagged()); cell length = array_capacity(words.untagged());
for(cell i = 0; i < length; i++) for (cell i = 0; i < length; i++) {
{ data_root<word> word(array_nth(words.untagged(), i), this);
data_root<word> word(array_nth(words.untagged(),i),this);
if(!word->entry_point || !word->code()->optimized_p()) if (!word->entry_point || !word->code()->optimized_p())
jit_compile_word(word.value(),word->def,false); jit_compile_word(word.value(), word->def, false);
} }
} }
/* Allocates memory */ /* Allocates memory */
word *factor_vm::allot_word(cell name_, cell vocab_, cell hashcode_) word* factor_vm::allot_word(cell name_, cell vocab_, cell hashcode_) {
{ data_root<object> vocab(vocab_, this);
data_root<object> vocab(vocab_,this); data_root<object> name(name_, this);
data_root<object> name(name_,this);
data_root<word> new_word(allot<word>(sizeof(word)),this); data_root<word> new_word(allot<word>(sizeof(word)), this);
new_word->hashcode = hashcode_; new_word->hashcode = hashcode_;
new_word->vocabulary = vocab.value(); new_word->vocabulary = vocab.value();
@ -61,42 +57,38 @@ word *factor_vm::allot_word(cell name_, cell vocab_, cell hashcode_)
new_word->subprimitive = false_object; new_word->subprimitive = false_object;
new_word->entry_point = NULL; new_word->entry_point = NULL;
jit_compile_word(new_word.value(),new_word->def,true); jit_compile_word(new_word.value(), new_word->def, true);
return new_word.untagged(); return new_word.untagged();
} }
/* (word) ( name vocabulary hashcode -- word ) */ /* (word) ( name vocabulary hashcode -- word ) */
/* Allocates memory */ /* Allocates memory */
void factor_vm::primitive_word() void factor_vm::primitive_word() {
{
cell hashcode = ctx->pop(); cell hashcode = ctx->pop();
cell vocab = ctx->pop(); cell vocab = ctx->pop();
cell name = ctx->pop(); cell name = ctx->pop();
ctx->push(tag<word>(allot_word(name,vocab,hashcode))); ctx->push(tag<word>(allot_word(name, vocab, hashcode)));
} }
/* word-code ( word -- start end ) */ /* word-code ( word -- start end ) */
/* Allocates memory (from_unsigned_cell allocates) */ /* Allocates memory (from_unsigned_cell allocates) */
void factor_vm::primitive_word_code() void factor_vm::primitive_word_code() {
{ data_root<word> w(ctx->pop(), this);
data_root<word> w(ctx->pop(),this);
w.untag_check(this); w.untag_check(this);
ctx->push(from_unsigned_cell((cell)w->entry_point)); ctx->push(from_unsigned_cell((cell) w->entry_point));
ctx->push(from_unsigned_cell((cell)w->code() + w->code()->size())); ctx->push(from_unsigned_cell((cell) w->code() + w->code()->size()));
} }
void factor_vm::primitive_optimized_p() void factor_vm::primitive_optimized_p() {
{ word* w = untag_check<word>(ctx->peek());
word *w = untag_check<word>(ctx->peek());
ctx->replace(tag_boolean(w->code()->optimized_p())); ctx->replace(tag_boolean(w->code()->optimized_p()));
} }
/* Allocates memory */ /* Allocates memory */
void factor_vm::primitive_wrapper() void factor_vm::primitive_wrapper() {
{ wrapper* new_wrapper = allot<wrapper>(sizeof(wrapper));
wrapper *new_wrapper = allot<wrapper>(sizeof(wrapper));
new_wrapper->object = ctx->peek(); new_wrapper->object = ctx->peek();
ctx->replace(tag<wrapper>(new_wrapper)); ctx->replace(tag<wrapper>(new_wrapper));
} }