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

removed some global functions from quotations.cpp

db4
Phil Dawes 2009-08-17 21:37:19 +01:00
parent 7f70b6320c
commit 0de0d5f256
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vm/quotations.cpp
View File

@ -198,8 +198,8 @@ void quotation_jit::iterate_quotation()
if(compiling) if(compiling)
{ {
jit_compile(array_nth(elements.untagged(),i),relocate); myvm->jit_compile(array_nth(elements.untagged(),i),relocate);
jit_compile(array_nth(elements.untagged(),i + 1),relocate); myvm->jit_compile(array_nth(elements.untagged(),i + 1),relocate);
} }
literal(array_nth(elements.untagged(),i)); literal(array_nth(elements.untagged(),i));
@ -214,7 +214,7 @@ void quotation_jit::iterate_quotation()
else if(fast_dip_p(i)) else if(fast_dip_p(i))
{ {
if(compiling) if(compiling)
jit_compile(obj.value(),relocate); myvm->jit_compile(obj.value(),relocate);
emit_with(userenv[JIT_DIP],obj.value()); emit_with(userenv[JIT_DIP],obj.value());
i++; i++;
break; break;
@ -223,7 +223,7 @@ void quotation_jit::iterate_quotation()
else if(fast_2dip_p(i)) else if(fast_2dip_p(i))
{ {
if(compiling) if(compiling)
jit_compile(obj.value(),relocate); myvm->jit_compile(obj.value(),relocate);
emit_with(userenv[JIT_2DIP],obj.value()); emit_with(userenv[JIT_2DIP],obj.value());
i++; i++;
break; break;
@ -232,7 +232,7 @@ void quotation_jit::iterate_quotation()
else if(fast_3dip_p(i)) else if(fast_3dip_p(i))
{ {
if(compiling) if(compiling)
jit_compile(obj.value(),relocate); myvm->jit_compile(obj.value(),relocate);
emit_with(userenv[JIT_3DIP],obj.value()); emit_with(userenv[JIT_3DIP],obj.value());
i++; i++;
break; break;
@ -274,11 +274,6 @@ void factorvm::set_quot_xt(quotation *quot, code_block *code)
quot->xt = code->xt(); quot->xt = code->xt();
} }
void set_quot_xt(quotation *quot, code_block *code)
{
return vm->set_quot_xt(quot,code);
}
/* Allocates memory */ /* Allocates memory */
void factorvm::jit_compile(cell quot_, bool relocating) void factorvm::jit_compile(cell quot_, bool relocating)
{ {
@ -294,11 +289,6 @@ void factorvm::jit_compile(cell quot_, bool relocating)
if(relocating) relocate_code_block(compiled); if(relocating) relocate_code_block(compiled);
} }
void jit_compile(cell quot_, bool relocating)
{
return vm->jit_compile(quot_,relocating);
}
inline void factorvm::vmprim_jit_compile() inline void factorvm::vmprim_jit_compile()
{ {
jit_compile(dpop(),true); jit_compile(dpop(),true);
@ -357,11 +347,6 @@ void factorvm::compile_all_words()
iterate_code_heap(factor::relocate_code_block); iterate_code_heap(factor::relocate_code_block);
} }
void compile_all_words()
{
return vm->compile_all_words();
}
/* Allocates memory */ /* Allocates memory */
fixnum factorvm::quot_code_offset_to_scan(cell quot_, cell offset) fixnum factorvm::quot_code_offset_to_scan(cell quot_, cell offset)
{ {
@ -375,11 +360,6 @@ fixnum factorvm::quot_code_offset_to_scan(cell quot_, cell offset)
return compiler.get_position(); return compiler.get_position();
} }
fixnum quot_code_offset_to_scan(cell quot_, cell offset)
{
return vm->quot_code_offset_to_scan(quot_,offset);
}
cell factorvm::lazy_jit_compile_impl(cell quot_, stack_frame *stack) cell factorvm::lazy_jit_compile_impl(cell quot_, stack_frame *stack)
{ {
gc_root<quotation> quot(quot_,this); gc_root<quotation> quot(quot_,this);

6
vm/quotations.hpp
View File

@ -22,14 +22,8 @@ struct quotation_jit : public jit {
void iterate_quotation(); void iterate_quotation();
}; };
void set_quot_xt(quotation *quot, code_block *code);
void jit_compile(cell quot, bool relocate);
fixnum quot_code_offset_to_scan(cell quot, cell offset);
PRIMITIVE(jit_compile); PRIMITIVE(jit_compile);
void compile_all_words();
PRIMITIVE(array_to_quotation); PRIMITIVE(array_to_quotation);
PRIMITIVE(quotation_xt); PRIMITIVE(quotation_xt);