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

Speed up compile-call

db4
Slava Pestov 2007-12-30 21:34:44 -05:00
parent 18eb8e2bd3
commit 6922bded81
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/compiler/compiler.factor
View File

@ -55,9 +55,7 @@ IN: compiler
[ compiled? not ] subset recompile ; [ compiled? not ] subset recompile ;
: compile-call ( quot -- ) : compile-call ( quot -- )
H{ } clone changed-words [ [ define-temp ] with-compilation-unit execute ;
define-temp dup 1array recompile
] with-variable execute ;
: recompile-all ( -- ) : recompile-all ( -- )
[ all-words recompile ] with-compiler-errors ; [ all-words recompile ] with-compiler-errors ;

23
vm/code_heap.c
View File

@ -339,6 +339,8 @@ DEFINE_PRIMITIVE(modify_code_heap)
{ {
F_ARRAY *alist = untag_array(dpop()); F_ARRAY *alist = untag_array(dpop());
bool rescan_code_heap = false;
CELL count = untag_fixnum_fast(alist->capacity); CELL count = untag_fixnum_fast(alist->capacity);
CELL i; CELL i;
for(i = 0; i < count; i++) for(i = 0; i < count; i++)
@ -346,6 +348,10 @@ DEFINE_PRIMITIVE(modify_code_heap)
F_ARRAY *pair = untag_array(array_nth(alist,i)); F_ARRAY *pair = untag_array(array_nth(alist,i));
F_WORD *word = untag_word(array_nth(pair,0)); F_WORD *word = untag_word(array_nth(pair,0));
if(word->vocabulary != F)
rescan_code_heap = true;
CELL data = array_nth(pair,1); CELL data = array_nth(pair,1);
if(data == F) if(data == F)
@ -395,6 +401,21 @@ DEFINE_PRIMITIVE(modify_code_heap)
} }
} }
if(count != 0) /* If there were any interned words in the set, we relocate all XT
references in the entire code heap. But if all the words are
uninterned, it is impossible that other words reference them, so we
only have to relocate the new words. This makes compile-call much
more efficient */
if(rescan_code_heap)
iterate_code_heap(relocate_code_block); iterate_code_heap(relocate_code_block);
else
{
for(i = 0; i < count; i++)
{
F_ARRAY *pair = untag_array(array_nth(alist,i));
F_WORD *word = untag_word(array_nth(pair,0));
iterate_code_heap_step(word->code,relocate_code_block);
}
}
} }