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

Merge branch 'vm_cleanup' of git://github.com/phildawes/factor

db4
Slava Pestov 2009-09-24 04:31:55 -05:00
parent 576e725662 a3c84ea278
commit cb497f009b
76 changed files with 1563 additions and 1818 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/cfg/alias-analysis/alias-analysis.factor
View File

@ -190,7 +190,7 @@ M: ##slot-imm insn-slot# slot>> ;
M: ##set-slot insn-slot# slot>> constant ;
M: ##set-slot-imm insn-slot# slot>> ;
M: ##alien-global insn-slot# [ library>> ] [ symbol>> ] bi 2array ;
M: ##vm-field-ptr insn-slot# fieldname>> 1array ; ! is this right?
M: ##vm-field-ptr insn-slot# field-name>> ; ! is this right?
M: ##slot insn-object obj>> resolve ;
M: ##slot-imm insn-object obj>> resolve ;

2
basis/compiler/cfg/instructions/instructions.factor
View File

@ -513,7 +513,7 @@ literal: symbol library ;
INSN: ##vm-field-ptr
def: dst/int-rep
literal: fieldname ;
literal: field-name ;
! FFI
INSN: ##alien-invoke

4
basis/compiler/codegen/codegen.factor
View File

@ -216,6 +216,7 @@ CODEGEN: ##compare-imm %compare-imm
CODEGEN: ##compare-float-ordered %compare-float-ordered
CODEGEN: ##compare-float-unordered %compare-float-unordered
CODEGEN: ##save-context %save-context
CODEGEN: ##vm-field-ptr %vm-field-ptr
CODEGEN: _fixnum-add %fixnum-add
CODEGEN: _fixnum-sub %fixnum-sub
@ -282,9 +283,6 @@ M: ##alien-global generate-insn
[ dst>> ] [ symbol>> ] [ library>> ] tri
%alien-global ;
M: ##vm-field-ptr generate-insn
[ dst>> ] [ fieldname>> ] bi %vm-field-ptr ;
! ##alien-invoke
GENERIC: next-fastcall-param ( rep -- )

4
basis/cpu/x86/32/bootstrap.factor
View File

@ -11,7 +11,7 @@ IN: bootstrap.x86
: shift-arg ( -- reg ) ECX ;
: div-arg ( -- reg ) EAX ;
: mod-arg ( -- reg ) EDX ;
: arg ( -- reg ) EAX ;
: arg1 ( -- reg ) EAX ;
: arg2 ( -- reg ) EDX ;
: temp0 ( -- reg ) EAX ;
: temp1 ( -- reg ) EDX ;
@ -29,7 +29,7 @@ IN: bootstrap.x86
! save stack pointer
temp0 [] stack-reg MOV
! pass vm ptr to primitive
arg 0 MOV rc-absolute-cell rt-vm jit-rel
arg1 0 MOV rc-absolute-cell rt-vm jit-rel
! call the primitive
0 JMP rc-relative rt-primitive jit-rel
] jit-primitive jit-define

2
basis/cpu/x86/64/64.factor
View File

@ -135,8 +135,6 @@ M:: x86.64 %unbox-large-struct ( n c-type -- )
[ ]
tri %copy ;
M:: x86.64 %box ( n rep func -- )
n [
n

3
basis/cpu/x86/64/bootstrap.factor
View File

@ -21,7 +21,6 @@ IN: bootstrap.x86
: rex-length ( -- n ) 1 ;
[
! load stack_chain
temp0 0 MOV rc-absolute-cell rt-stack-chain jit-rel
temp0 temp0 [] MOV
@ -30,7 +29,7 @@ IN: bootstrap.x86
! load XT
temp1 0 MOV rc-absolute-cell rt-primitive jit-rel
! load vm ptr
arg 0 MOV rc-absolute-cell rt-vm jit-rel
arg1 0 MOV rc-absolute-cell rt-vm jit-rel
! go
temp1 JMP
] jit-primitive jit-define

2
basis/cpu/x86/64/unix/bootstrap.factor
View File

@ -5,7 +5,7 @@ cpu.x86.assembler cpu.x86.assembler.operands layouts vocabs parser ;
IN: bootstrap.x86
: stack-frame-size ( -- n ) 4 bootstrap-cells ;
: arg ( -- reg ) RDI ;
: arg1 ( -- reg ) RDI ;
: arg2 ( -- reg ) RSI ;
<< "vocab:cpu/x86/64/bootstrap.factor" parse-file parsed >>

2
basis/cpu/x86/64/winnt/bootstrap.factor
View File

@ -6,7 +6,7 @@ cpu.x86.assembler.operands ;
IN: bootstrap.x86
: stack-frame-size ( -- n ) 8 bootstrap-cells ;
: arg ( -- reg ) RCX ;
: arg1 ( -- reg ) RCX ;
: arg2 ( -- reg ) RDX ;
<< "vocab:cpu/x86/64/bootstrap.factor" parse-file parsed >>

4
basis/cpu/x86/bootstrap.factor
View File

@ -248,13 +248,13 @@ big-endian off
! Quotations and words
[
! load from stack
arg ds-reg [] MOV
arg1 ds-reg [] MOV
! pop stack
ds-reg bootstrap-cell SUB
! pass vm pointer
arg2 0 MOV rc-absolute-cell rt-vm jit-rel
! call quotation
arg quot-xt-offset [+] JMP
arg1 quot-xt-offset [+] JMP
] \ (call) define-sub-primitive
! Objects

4
extra/mttest/mttest.factor → extra/native-thread-test/native-thread-test.factor
View File

@ -1,6 +1,6 @@
USING: alien.syntax io io.encodings.utf16n io.encodings.utf8 io.files
kernel namespaces sequences system threads unix.utilities ;
IN: mttest
IN: native-thread-test
FUNCTION: void* start_standalone_factor_in_new_thread ( int argc, char** argv ) ;
@ -17,7 +17,7 @@ M: unix native-string-encoding utf8 ;
{ "-run=tetris" } start-vm-in-os-thread drop ;
: start-testthread-in-os-thread ( -- )
{ "-run=mttest" } start-vm-in-os-thread drop ;
{ "-run=native-thread-test" } start-vm-in-os-thread drop ;
: testthread ( -- )
"/tmp/hello" utf8 [ "hello!\n" write ] with-file-appender 5000000 sleep ;

62
vm/alien.cpp
View File

@ -5,7 +5,7 @@ namespace factor
/* gets the address of an object representing a C pointer, with the
intention of storing the pointer across code which may potentially GC. */
char *factorvm::pinned_alien_offset(cell obj)
char *factor_vm::pinned_alien_offset(cell obj)
{
switch(tagged<object>(obj).type())
{
@ -25,7 +25,7 @@ char *factorvm::pinned_alien_offset(cell obj)
}
/* make an alien */
cell factorvm::allot_alien(cell delegate_, cell displacement)
cell factor_vm::allot_alien(cell delegate_, cell displacement)
{
gc_root<object> delegate(delegate_,this);
gc_root<alien> new_alien(allot<alien>(sizeof(alien)),this);
@ -46,7 +46,7 @@ cell factorvm::allot_alien(cell delegate_, cell displacement)
}
/* make an alien pointing at an offset of another alien */
inline void factorvm::vmprim_displaced_alien()
inline void factor_vm::primitive_displaced_alien()
{
cell alien = dpop();
cell displacement = to_cell(dpop());
@ -71,23 +71,23 @@ inline void factorvm::vmprim_displaced_alien()
PRIMITIVE(displaced_alien)
{
PRIMITIVE_GETVM()->vmprim_displaced_alien();
PRIMITIVE_GETVM()->primitive_displaced_alien();
}
/* address of an object representing a C pointer. Explicitly throw an error
if the object is a byte array, as a sanity check. */
inline void factorvm::vmprim_alien_address()
inline void factor_vm::primitive_alien_address()
{
box_unsigned_cell((cell)pinned_alien_offset(dpop()));
}
PRIMITIVE(alien_address)
{
PRIMITIVE_GETVM()->vmprim_alien_address();
PRIMITIVE_GETVM()->primitive_alien_address();
}
/* pop ( alien n ) from datastack, return alien's address plus n */
void *factorvm::alien_pointer()
void *factor_vm::alien_pointer()
{
fixnum offset = to_fixnum(dpop());
return unbox_alien() + offset;
@ -121,7 +121,7 @@ DEFINE_ALIEN_ACCESSOR(double,double,box_double,to_double)
DEFINE_ALIEN_ACCESSOR(cell,void *,box_alien,pinned_alien_offset)
/* open a native library and push a handle */
inline void factorvm::vmprim_dlopen()
inline void factor_vm::primitive_dlopen()
{
gc_root<byte_array> path(dpop(),this);
path.untag_check(this);
@ -133,11 +133,11 @@ inline void factorvm::vmprim_dlopen()
PRIMITIVE(dlopen)
{
PRIMITIVE_GETVM()->vmprim_dlopen();
PRIMITIVE_GETVM()->primitive_dlopen();
}
/* look up a symbol in a native library */
inline void factorvm::vmprim_dlsym()
inline void factor_vm::primitive_dlsym()
{
gc_root<object> library(dpop(),this);
gc_root<byte_array> name(dpop(),this);
@ -160,11 +160,11 @@ inline void factorvm::vmprim_dlsym()
PRIMITIVE(dlsym)
{
PRIMITIVE_GETVM()->vmprim_dlsym();
PRIMITIVE_GETVM()->primitive_dlsym();
}
/* close a native library handle */
inline void factorvm::vmprim_dlclose()
inline void factor_vm::primitive_dlclose()
{
dll *d = untag_check<dll>(dpop());
if(d->dll != NULL)
@ -173,10 +173,10 @@ inline void factorvm::vmprim_dlclose()
PRIMITIVE(dlclose)
{
PRIMITIVE_GETVM()->vmprim_dlclose();
PRIMITIVE_GETVM()->primitive_dlclose();
}
inline void factorvm::vmprim_dll_validp()
inline void factor_vm::primitive_dll_validp()
{
cell library = dpop();
if(library == F)
@ -187,11 +187,11 @@ inline void factorvm::vmprim_dll_validp()
PRIMITIVE(dll_validp)
{
PRIMITIVE_GETVM()->vmprim_dll_validp();
PRIMITIVE_GETVM()->primitive_dll_validp();
}
/* gets the address of an object representing a C pointer */
char *factorvm::alien_offset(cell obj)
char *factor_vm::alien_offset(cell obj)
{
switch(tagged<object>(obj).type())
{
@ -212,26 +212,26 @@ char *factorvm::alien_offset(cell obj)
}
}
VM_C_API char *alien_offset(cell obj, factorvm *myvm)
VM_C_API char *alien_offset(cell obj, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->alien_offset(obj);
}
/* pop an object representing a C pointer */
char *factorvm::unbox_alien()
char *factor_vm::unbox_alien()
{
return alien_offset(dpop());
}
VM_C_API char *unbox_alien(factorvm *myvm)
VM_C_API char *unbox_alien(factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->unbox_alien();
}
/* make an alien and push */
void factorvm::box_alien(void *ptr)
void factor_vm::box_alien(void *ptr)
{
if(ptr == NULL)
dpush(F);
@ -239,40 +239,40 @@ void factorvm::box_alien(void *ptr)
dpush(allot_alien(F,(cell)ptr));
}
VM_C_API void box_alien(void *ptr, factorvm *myvm)
VM_C_API void box_alien(void *ptr, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_alien(ptr);
}
/* for FFI calls passing structs by value */
void factorvm::to_value_struct(cell src, void *dest, cell size)
void factor_vm::to_value_struct(cell src, void *dest, cell size)
{
memcpy(dest,alien_offset(src),size);
}
VM_C_API void to_value_struct(cell src, void *dest, cell size, factorvm *myvm)
VM_C_API void to_value_struct(cell src, void *dest, cell size, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_value_struct(src,dest,size);
}
/* for FFI callbacks receiving structs by value */
void factorvm::box_value_struct(void *src, cell size)
void factor_vm::box_value_struct(void *src, cell size)
{
byte_array *bytes = allot_byte_array(size);
memcpy(bytes->data<void>(),src,size);
dpush(tag<byte_array>(bytes));
}
VM_C_API void box_value_struct(void *src, cell size,factorvm *myvm)
VM_C_API void box_value_struct(void *src, cell size,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_value_struct(src,size);
}
/* On some x86 OSes, structs <= 8 bytes are returned in registers. */
void factorvm::box_small_struct(cell x, cell y, cell size)
void factor_vm::box_small_struct(cell x, cell y, cell size)
{
cell data[2];
data[0] = x;
@ -280,14 +280,14 @@ void factorvm::box_small_struct(cell x, cell y, cell size)
box_value_struct(data,size);
}
VM_C_API void box_small_struct(cell x, cell y, cell size, factorvm *myvm)
VM_C_API void box_small_struct(cell x, cell y, cell size, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_small_struct(x,y,size);
}
/* On OS X/PPC, complex numbers are returned in registers. */
void factorvm::box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size)
void factor_vm::box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size)
{
cell data[4];
data[0] = x1;
@ -297,20 +297,20 @@ void factorvm::box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size)
box_value_struct(data,size);
}
VM_C_API void box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size, factorvm *myvm)
VM_C_API void box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_medium_struct(x1, x2, x3, x4, size);
}
inline void factorvm::vmprim_vm_ptr()
inline void factor_vm::primitive_vm_ptr()
{
box_alien(this);
}
PRIMITIVE(vm_ptr)
{
PRIMITIVE_GETVM()->vmprim_vm_ptr();
PRIMITIVE_GETVM()->primitive_vm_ptr();
}
}

14
vm/alien.hpp
View File

@ -38,12 +38,12 @@ PRIMITIVE(dll_validp);
PRIMITIVE(vm_ptr);
VM_C_API char *alien_offset(cell object, factorvm *vm);
VM_C_API char *unbox_alien(factorvm *vm);
VM_C_API void box_alien(void *ptr, factorvm *vm);
VM_C_API void to_value_struct(cell src, void *dest, cell size, factorvm *vm);
VM_C_API void box_value_struct(void *src, cell size,factorvm *vm);
VM_C_API void box_small_struct(cell x, cell y, cell size,factorvm *vm);
VM_C_API void box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size,factorvm *vm);
VM_C_API char *alien_offset(cell object, factor_vm *vm);
VM_C_API char *unbox_alien(factor_vm *vm);
VM_C_API void box_alien(void *ptr, factor_vm *vm);
VM_C_API void to_value_struct(cell src, void *dest, cell size, factor_vm *vm);
VM_C_API void box_value_struct(void *src, cell size,factor_vm *vm);
VM_C_API void box_small_struct(cell x, cell y, cell size,factor_vm *vm);
VM_C_API void box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size,factor_vm *vm);
}

32
vm/arrays.cpp
View File

@ -4,7 +4,7 @@ namespace factor
{
/* make a new array with an initial element */
array *factorvm::allot_array(cell capacity, cell fill_)
array *factor_vm::allot_array(cell capacity, cell fill_)
{
gc_root<object> fill(fill_,this);
gc_root<array> new_array(allot_array_internal<array>(capacity),this);
@ -23,9 +23,8 @@ array *factorvm::allot_array(cell capacity, cell fill_)
return new_array.untagged();
}
/* push a new array on the stack */
inline void factorvm::vmprim_array()
inline void factor_vm::primitive_array()
{
cell initial = dpop();
cell size = unbox_array_size();
@ -34,10 +33,10 @@ inline void factorvm::vmprim_array()
PRIMITIVE(array)
{
PRIMITIVE_GETVM()->vmprim_array();
PRIMITIVE_GETVM()->primitive_array();
}
cell factorvm::allot_array_1(cell obj_)
cell factor_vm::allot_array_1(cell obj_)
{
gc_root<object> obj(obj_,this);
gc_root<array> a(allot_array_internal<array>(1),this);
@ -45,8 +44,7 @@ cell factorvm::allot_array_1(cell obj_)
return a.value();
}
cell factorvm::allot_array_2(cell v1_, cell v2_)
cell factor_vm::allot_array_2(cell v1_, cell v2_)
{
gc_root<object> v1(v1_,this);
gc_root<object> v2(v2_,this);
@ -56,8 +54,7 @@ cell factorvm::allot_array_2(cell v1_, cell v2_)
return a.value();
}
cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
cell factor_vm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
{
gc_root<object> v1(v1_,this);
gc_root<object> v2(v2_,this);
@ -71,8 +68,7 @@ cell factorvm::allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_)
return a.value();
}
inline void factorvm::vmprim_resize_array()
inline void factor_vm::primitive_resize_array()
{
array* a = untag_check<array>(dpop());
cell capacity = unbox_array_size();
@ -81,23 +77,23 @@ inline void factorvm::vmprim_resize_array()
PRIMITIVE(resize_array)
{
PRIMITIVE_GETVM()->vmprim_resize_array();
PRIMITIVE_GETVM()->primitive_resize_array();
}
void growable_array::add(cell elt_)
{
factorvm* myvm = elements.myvm;
gc_root<object> elt(elt_,myvm);
factor_vm* parent_vm = elements.parent_vm;
gc_root<object> elt(elt_,parent_vm);
if(count == array_capacity(elements.untagged()))
elements = myvm->reallot_array(elements.untagged(),count * 2);
elements = parent_vm->reallot_array(elements.untagged(),count * 2);
myvm->set_array_nth(elements.untagged(),count++,elt.value());
parent_vm->set_array_nth(elements.untagged(),count++,elt.value());
}
void growable_array::trim()
{
factorvm *myvm = elements.myvm;
elements = myvm->reallot_array(elements.untagged(),count);
factor_vm *parent_vm = elements.parent_vm;
elements = parent_vm->reallot_array(elements.untagged(),count);
}
}

1
vm/arrays.hpp
View File

@ -13,5 +13,4 @@ inline cell array_nth(array *array, cell slot)
PRIMITIVE(array);
PRIMITIVE(resize_array);
}

1266
vm/bignum.cpp
View File

File diff suppressed because it is too large Load Diff

9
vm/bignum.hpp
View File

@ -1,7 +1,7 @@
namespace factor
{
/* :tabSize=2:indentSize=2:noTabs=true:
/*
Copyright (C) 1989-1992 Massachusetts Institute of Technology
Portions copyright (C) 2004-2009 Slava Pestov
@ -44,10 +44,7 @@ enum bignum_comparison
bignum_comparison_greater = 1
};
struct factorvm;
bignum * digit_stream_to_bignum(unsigned int n_digits,
unsigned int (*producer)(unsigned int,factorvm*),
unsigned int radix,
int negative_p);
struct factor_vm;
bignum * digit_stream_to_bignum(unsigned int n_digits, unsigned int (*producer)(unsigned int,factor_vm*), unsigned int radix, int negative_p);
}

1
vm/bignumint.hpp
View File

@ -54,7 +54,6 @@ typedef fixnum bignum_length_type;
/* BIGNUM_EXCEPTION is invoked to handle assertion violations. */
#define BIGNUM_EXCEPTION abort
#define BIGNUM_DIGIT_LENGTH (((sizeof (bignum_digit_type)) * CHAR_BIT) - 2)
#define BIGNUM_HALF_DIGIT_LENGTH (BIGNUM_DIGIT_LENGTH / 2)
#define BIGNUM_RADIX (bignum_digit_type)(((cell) 1) << BIGNUM_DIGIT_LENGTH)

8
vm/booleans.cpp
View File

@ -3,23 +3,23 @@
namespace factor
{
void factorvm::box_boolean(bool value)
void factor_vm::box_boolean(bool value)
{
dpush(value ? T : F);
}
VM_C_API void box_boolean(bool value, factorvm *myvm)
VM_C_API void box_boolean(bool value, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_boolean(value);
}
bool factorvm::to_boolean(cell value)
bool factor_vm::to_boolean(cell value)
{
return value != F;
}
VM_C_API bool to_boolean(cell value, factorvm *myvm)
VM_C_API bool to_boolean(cell value, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_boolean(value);

5
vm/booleans.hpp
View File

@ -1,8 +1,7 @@
namespace factor
{
VM_C_API void box_boolean(bool value, factorvm *vm);
VM_C_API bool to_boolean(cell value, factorvm *vm);
VM_C_API void box_boolean(bool value, factor_vm *vm);
VM_C_API bool to_boolean(cell value, factor_vm *vm);
}

29
vm/byte_arrays.cpp
View File

@ -3,15 +3,14 @@
namespace factor
{
byte_array *factorvm::allot_byte_array(cell size)
byte_array *factor_vm::allot_byte_array(cell size)
{
byte_array *array = allot_array_internal<byte_array>(size);
memset(array + 1,0,size);
return array;
}
inline void factorvm::vmprim_byte_array()
inline void factor_vm::primitive_byte_array()
{
cell size = unbox_array_size();
dpush(tag<byte_array>(allot_byte_array(size)));
@ -19,10 +18,10 @@ inline void factorvm::vmprim_byte_array()
PRIMITIVE(byte_array)
{
PRIMITIVE_GETVM()->vmprim_byte_array();
PRIMITIVE_GETVM()->primitive_byte_array();
}
inline void factorvm::vmprim_uninitialized_byte_array()
inline void factor_vm::primitive_uninitialized_byte_array()
{
cell size = unbox_array_size();
dpush(tag<byte_array>(allot_array_internal<byte_array>(size)));
@ -30,10 +29,10 @@ inline void factorvm::vmprim_uninitialized_byte_array()
PRIMITIVE(uninitialized_byte_array)
{
PRIMITIVE_GETVM()->vmprim_uninitialized_byte_array();
PRIMITIVE_GETVM()->primitive_uninitialized_byte_array();
}
inline void factorvm::vmprim_resize_byte_array()
inline void factor_vm::primitive_resize_byte_array()
{
byte_array *array = untag_check<byte_array>(dpop());
cell capacity = unbox_array_size();
@ -42,15 +41,15 @@ inline void factorvm::vmprim_resize_byte_array()
PRIMITIVE(resize_byte_array)
{
PRIMITIVE_GETVM()->vmprim_resize_byte_array();
PRIMITIVE_GETVM()->primitive_resize_byte_array();
}
void growable_byte_array::append_bytes(void *elts, cell len)
{
cell new_size = count + len;
factorvm *myvm = elements.myvm;
factor_vm *parent_vm = elements.parent_vm;
if(new_size >= array_capacity(elements.untagged()))
elements = myvm->reallot_array(elements.untagged(),new_size * 2);
elements = parent_vm->reallot_array(elements.untagged(),new_size * 2);
memcpy(&elements->data<u8>()[count],elts,len);
@ -59,13 +58,13 @@ void growable_byte_array::append_bytes(void *elts, cell len)
void growable_byte_array::append_byte_array(cell byte_array_)
{
gc_root<byte_array> byte_array(byte_array_,elements.myvm);
gc_root<byte_array> byte_array(byte_array_,elements.parent_vm);
cell len = array_capacity(byte_array.untagged());
cell new_size = count + len;
factorvm *myvm = elements.myvm;
factor_vm *parent_vm = elements.parent_vm;
if(new_size >= array_capacity(elements.untagged()))
elements = myvm->reallot_array(elements.untagged(),new_size * 2);
elements = parent_vm->reallot_array(elements.untagged(),new_size * 2);
memcpy(&elements->data<u8>()[count],byte_array->data<u8>(),len);
@ -74,8 +73,8 @@ void growable_byte_array::append_byte_array(cell byte_array_)
void growable_byte_array::trim()
{
factorvm *myvm = elements.myvm;
elements = myvm->reallot_array(elements.untagged(),count);
factor_vm *parent_vm = elements.parent_vm;
elements = parent_vm->reallot_array(elements.untagged(),count);
}
}

1
vm/byte_arrays.hpp
View File

@ -5,5 +5,4 @@ PRIMITIVE(byte_array);
PRIMITIVE(uninitialized_byte_array);
PRIMITIVE(resize_byte_array);
}

55
vm/callstack.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
void factorvm::check_frame(stack_frame *frame)
void factor_vm::check_frame(stack_frame *frame)
{
#ifdef FACTOR_DEBUG
check_code_pointer((cell)frame->xt);
@ -11,14 +11,14 @@ void factorvm::check_frame(stack_frame *frame)
#endif
}
callstack *factorvm::allot_callstack(cell size)
callstack *factor_vm::allot_callstack(cell size)
{
callstack *stack = allot<callstack>(callstack_size(size));
stack->length = tag_fixnum(size);
return stack;
}
stack_frame *factorvm::fix_callstack_top(stack_frame *top, stack_frame *bottom)
stack_frame *factor_vm::fix_callstack_top(stack_frame *top, stack_frame *bottom)
{
stack_frame *frame = bottom - 1;
@ -35,7 +35,7 @@ This means that if 'callstack' is called in tail position, we
will have popped a necessary frame... however this word is only
called by continuation implementation, and user code shouldn't
be calling it at all, so we leave it as it is for now. */
stack_frame *factorvm::capture_start()
stack_frame *factor_vm::capture_start()
{
stack_frame *frame = stack_chain->callstack_bottom - 1;
while(frame >= stack_chain->callstack_top
@ -46,7 +46,7 @@ stack_frame *factorvm::capture_start()
return frame + 1;
}
inline void factorvm::vmprim_callstack()
inline void factor_vm::primitive_callstack()
{
stack_frame *top = capture_start();
stack_frame *bottom = stack_chain->callstack_bottom;
@ -62,10 +62,10 @@ inline void factorvm::vmprim_callstack()
PRIMITIVE(callstack)
{
PRIMITIVE_GETVM()->vmprim_callstack();
PRIMITIVE_GETVM()->primitive_callstack();
}
inline void factorvm::vmprim_set_callstack()
inline void factor_vm::primitive_set_callstack()
{
callstack *stack = untag_check<callstack>(dpop());
@ -80,22 +80,21 @@ inline void factorvm::vmprim_set_callstack()
PRIMITIVE(set_callstack)
{
PRIMITIVE_GETVM()->vmprim_set_callstack();
PRIMITIVE_GETVM()->primitive_set_callstack();
}
code_block *factorvm::frame_code(stack_frame *frame)
code_block *factor_vm::frame_code(stack_frame *frame)
{
check_frame(frame);
return (code_block *)frame->xt - 1;
}
cell factorvm::frame_type(stack_frame *frame)
cell factor_vm::frame_type(stack_frame *frame)
{
return frame_code(frame)->type;
}
cell factorvm::frame_executing(stack_frame *frame)
cell factor_vm::frame_executing(stack_frame *frame)
{
code_block *compiled = frame_code(frame);
if(compiled->literals == F || !stack_traces_p())
@ -109,14 +108,14 @@ cell factorvm::frame_executing(stack_frame *frame)
}
}
stack_frame *factorvm::frame_successor(stack_frame *frame)
stack_frame *factor_vm::frame_successor(stack_frame *frame)
{
check_frame(frame);
return (stack_frame *)((cell)frame - frame->size);
}
/* Allocates memory */
cell factorvm::frame_scan(stack_frame *frame)
cell factor_vm::frame_scan(stack_frame *frame)
{
switch(frame_type(frame))
{
@ -148,9 +147,9 @@ namespace
struct stack_frame_accumulator {
growable_array frames;
stack_frame_accumulator(factorvm *vm) : frames(vm) {}
stack_frame_accumulator(factor_vm *vm) : frames(vm) {}
void operator()(stack_frame *frame, factorvm *myvm)
void operator()(stack_frame *frame, factor_vm *myvm)
{
gc_root<object> executing(myvm->frame_executing(frame),myvm);
gc_root<object> scan(myvm->frame_scan(frame),myvm);
@ -162,7 +161,7 @@ struct stack_frame_accumulator {
}
inline void factorvm::vmprim_callstack_to_array()
inline void factor_vm::primitive_callstack_to_array()
{
gc_root<callstack> callstack(dpop(),this);
@ -175,10 +174,10 @@ inline void factorvm::vmprim_callstack_to_array()
PRIMITIVE(callstack_to_array)
{
PRIMITIVE_GETVM()->vmprim_callstack_to_array();
PRIMITIVE_GETVM()->primitive_callstack_to_array();
}
stack_frame *factorvm::innermost_stack_frame(callstack *stack)
stack_frame *factor_vm::innermost_stack_frame(callstack *stack)
{
stack_frame *top = stack->top();
stack_frame *bottom = stack->bottom();
@ -190,7 +189,7 @@ stack_frame *factorvm::innermost_stack_frame(callstack *stack)
return frame;
}
stack_frame *factorvm::innermost_stack_frame_quot(callstack *callstack)
stack_frame *factor_vm::innermost_stack_frame_quot(callstack *callstack)
{
stack_frame *inner = innermost_stack_frame(callstack);
tagged<quotation>(frame_executing(inner)).untag_check(this);
@ -199,27 +198,27 @@ stack_frame *factorvm::innermost_stack_frame_quot(callstack *callstack)
/* Some primitives implementing a limited form of callstack mutation.
Used by the single stepper. */
inline void factorvm::vmprim_innermost_stack_frame_executing()
inline void factor_vm::primitive_innermost_stack_frame_executing()
{
dpush(frame_executing(innermost_stack_frame(untag_check<callstack>(dpop()))));
}
PRIMITIVE(innermost_stack_frame_executing)
{
PRIMITIVE_GETVM()->vmprim_innermost_stack_frame_executing();
PRIMITIVE_GETVM()->primitive_innermost_stack_frame_executing();
}
inline void factorvm::vmprim_innermost_stack_frame_scan()
inline void factor_vm::primitive_innermost_stack_frame_scan()
{
dpush(frame_scan(innermost_stack_frame_quot(untag_check<callstack>(dpop()))));
}
PRIMITIVE(innermost_stack_frame_scan)
{
PRIMITIVE_GETVM()->vmprim_innermost_stack_frame_scan();
PRIMITIVE_GETVM()->primitive_innermost_stack_frame_scan();
}
inline void factorvm::vmprim_set_innermost_stack_frame_quot()
inline void factor_vm::primitive_set_innermost_stack_frame_quot()
{
gc_root<callstack> callstack(dpop(),this);
gc_root<quotation> quot(dpop(),this);
@ -237,16 +236,16 @@ inline void factorvm::vmprim_set_innermost_stack_frame_quot()
PRIMITIVE(set_innermost_stack_frame_quot)
{
PRIMITIVE_GETVM()->vmprim_set_innermost_stack_frame_quot();
PRIMITIVE_GETVM()->primitive_set_innermost_stack_frame_quot();
}
/* called before entry into Factor code. */
void factorvm::save_callstack_bottom(stack_frame *callstack_bottom)
void factor_vm::save_callstack_bottom(stack_frame *callstack_bottom)
{
stack_chain->callstack_bottom = callstack_bottom;
}
VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom, factorvm *myvm)
VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->save_callstack_bottom(callstack_bottom);

3
vm/callstack.hpp
View File

@ -13,8 +13,7 @@ PRIMITIVE(innermost_stack_frame_executing);
PRIMITIVE(innermost_stack_frame_scan);
PRIMITIVE(set_innermost_stack_frame_quot);
VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom,factorvm *vm);
VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom,factor_vm *vm);
}

107
vm/code_block.cpp
View File

@ -3,31 +3,27 @@
namespace factor
{
relocation_type factorvm::relocation_type_of(relocation_entry r)
relocation_type factor_vm::relocation_type_of(relocation_entry r)
{
return (relocation_type)((r & 0xf0000000) >> 28);
}
relocation_class factorvm::relocation_class_of(relocation_entry r)
relocation_class factor_vm::relocation_class_of(relocation_entry r)
{
return (relocation_class)((r & 0x0f000000) >> 24);
}
cell factorvm::relocation_offset_of(relocation_entry r)
cell factor_vm::relocation_offset_of(relocation_entry r)
{
return (r & 0x00ffffff);
return (r & 0x00ffffff);
}
void factorvm::flush_icache_for(code_block *block)
void factor_vm::flush_icache_for(code_block *block)
{
flush_icache((cell)block,block->size);
}
int factorvm::number_of_parameters(relocation_type type)
int factor_vm::number_of_parameters(relocation_type type)
{
switch(type)
{
@ -52,8 +48,7 @@ int factorvm::number_of_parameters(relocation_type type)
}
}
void *factorvm::object_xt(cell obj)
void *factor_vm::object_xt(cell obj)
{
switch(tagged<object>(obj).type())
{
@ -67,8 +62,7 @@ void *factorvm::object_xt(cell obj)
}
}
void *factorvm::xt_pic(word *w, cell tagged_quot)
void *factor_vm::xt_pic(word *w, cell tagged_quot)
{
if(tagged_quot == F || max_pic_size == 0)
return w->xt;
@ -82,33 +76,30 @@ void *factorvm::xt_pic(word *w, cell tagged_quot)
}
}
void *factorvm::word_xt_pic(word *w)
void *factor_vm::word_xt_pic(word *w)
{
return xt_pic(w,w->pic_def);
}
void *factorvm::word_xt_pic_tail(word *w)
void *factor_vm::word_xt_pic_tail(word *w)
{
return xt_pic(w,w->pic_tail_def);
}
/* References to undefined symbols are patched up to call this function on
image load */
void factorvm::undefined_symbol()
void factor_vm::undefined_symbol()
{
general_error(ERROR_UNDEFINED_SYMBOL,F,F,NULL);
}
void undefined_symbol(factorvm *myvm)
void undefined_symbol(factor_vm *myvm)
{
return myvm->undefined_symbol();
}
/* Look up an external library symbol referenced by a compiled code block */
void *factorvm::get_rel_symbol(array *literals, cell index)
void *factor_vm::get_rel_symbol(array *literals, cell index)
{
cell symbol = array_nth(literals,index);
cell library = array_nth(literals,index + 1);
@ -152,8 +143,7 @@ void *factorvm::get_rel_symbol(array *literals, cell index)
}
}
cell factorvm::compute_relocation(relocation_entry rel, cell index, code_block *compiled)
cell factor_vm::compute_relocation(relocation_entry rel, cell index, code_block *compiled)
{
array *literals = untag<array>(compiled->literals);
cell offset = relocation_offset_of(rel) + (cell)compiled->xt();
@ -197,8 +187,7 @@ cell factorvm::compute_relocation(relocation_entry rel, cell index, code_block *
#undef ARG
}
void factorvm::iterate_relocations(code_block *compiled, relocation_iterator iter)
void factor_vm::iterate_relocations(code_block *compiled, relocation_iterator iter)
{
if(compiled->relocation != F)
{
@ -216,17 +205,15 @@ void factorvm::iterate_relocations(code_block *compiled, relocation_iterator ite
}
}
/* Store a 32-bit value into a PowerPC LIS/ORI sequence */
void factorvm::store_address_2_2(cell *ptr, cell value)
void factor_vm::store_address_2_2(cell *ptr, cell value)
{
ptr[-1] = ((ptr[-1] & ~0xffff) | ((value >> 16) & 0xffff));
ptr[ 0] = ((ptr[ 0] & ~0xffff) | (value & 0xffff));
}
/* Store a value into a bitfield of a PowerPC instruction */
void factorvm::store_address_masked(cell *ptr, fixnum value, cell mask, fixnum shift)
void factor_vm::store_address_masked(cell *ptr, fixnum value, cell mask, fixnum shift)
{
/* This is unaccurate but good enough */
fixnum test = (fixnum)mask >> 1;
@ -236,9 +223,8 @@ void factorvm::store_address_masked(cell *ptr, fixnum value, cell mask, fixnum s
*ptr = ((*ptr & ~mask) | ((value >> shift) & mask));
}
/* Perform a fixup on a code block */
void factorvm::store_address_in_code_block(cell klass, cell offset, fixnum absolute_value)
void factor_vm::store_address_in_code_block(cell klass, cell offset, fixnum absolute_value)
{
fixnum relative_value = absolute_value - offset;
@ -283,8 +269,7 @@ void factorvm::store_address_in_code_block(cell klass, cell offset, fixnum absol
}
}
void factorvm::update_literal_references_step(relocation_entry rel, cell index, code_block *compiled)
void factor_vm::update_literal_references_step(relocation_entry rel, cell index, code_block *compiled)
{
if(relocation_type_of(rel) == RT_IMMEDIATE)
{
@ -295,13 +280,13 @@ void factorvm::update_literal_references_step(relocation_entry rel, cell index,
}
}
void update_literal_references_step(relocation_entry rel, cell index, code_block *compiled, factorvm *myvm)
void update_literal_references_step(relocation_entry rel, cell index, code_block *compiled, factor_vm *myvm)
{
return myvm->update_literal_references_step(rel,index,compiled);
}
/* Update pointers to literals from compiled code. */
void factorvm::update_literal_references(code_block *compiled)
void factor_vm::update_literal_references(code_block *compiled)
{
if(!compiled->needs_fixup)
{
@ -310,10 +295,9 @@ void factorvm::update_literal_references(code_block *compiled)
}
}
/* Copy all literals referenced from a code block to newspace. Only for
aging and nursery collections */
void factorvm::copy_literal_references(code_block *compiled)
void factor_vm::copy_literal_references(code_block *compiled)
{
if(collecting_gen >= compiled->last_scan)
{
@ -336,13 +320,13 @@ void factorvm::copy_literal_references(code_block *compiled)
}
}
void copy_literal_references(code_block *compiled, factorvm *myvm)
void copy_literal_references(code_block *compiled, factor_vm *myvm)
{
return myvm->copy_literal_references(compiled);
}
/* Compute an address to store at a relocation */
void factorvm::relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled)
void factor_vm::relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled)
{
#ifdef FACTOR_DEBUG
tagged<array>(compiled->literals).untag_check(this);
@ -354,19 +338,19 @@ void factorvm::relocate_code_block_step(relocation_entry rel, cell index, code_b
compute_relocation(rel,index,compiled));
}
void relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled, factorvm *myvm)
void relocate_code_block_step(relocation_entry rel, cell index, code_block *compiled, factor_vm *myvm)
{
return myvm->relocate_code_block_step(rel,index,compiled);
}
void factorvm::update_word_references_step(relocation_entry rel, cell index, code_block *compiled)
void factor_vm::update_word_references_step(relocation_entry rel, cell index, code_block *compiled)
{
relocation_type type = relocation_type_of(rel);
if(type == RT_XT || type == RT_XT_PIC || type == RT_XT_PIC_TAIL)
relocate_code_block_step(rel,index,compiled);
}
void update_word_references_step(relocation_entry rel, cell index, code_block *compiled, factorvm *myvm)
void update_word_references_step(relocation_entry rel, cell index, code_block *compiled, factor_vm *myvm)
{
return myvm->update_word_references_step(rel,index,compiled);
}
@ -375,7 +359,7 @@ void update_word_references_step(relocation_entry rel, cell index, code_block *c
dlsyms, and words. For all other words in the code heap, we only need
to update references to other words, without worrying about literals
or dlsyms. */
void factorvm::update_word_references(code_block *compiled)
void factor_vm::update_word_references(code_block *compiled)
{
if(compiled->needs_fixup)
relocate_code_block(compiled);
@ -395,36 +379,35 @@ void factorvm::update_word_references(code_block *compiled)
}
}
void update_word_references(code_block *compiled, factorvm *myvm)
void update_word_references(code_block *compiled, factor_vm *myvm)
{
return myvm->update_word_references(compiled);
}
void factorvm::update_literal_and_word_references(code_block *compiled)
void factor_vm::update_literal_and_word_references(code_block *compiled)
{
update_literal_references(compiled);
update_word_references(compiled);
}
void update_literal_and_word_references(code_block *compiled, factorvm *myvm)
void update_literal_and_word_references(code_block *compiled, factor_vm *myvm)
{
return myvm->update_literal_and_word_references(compiled);
}
void factorvm::check_code_address(cell address)
void factor_vm::check_code_address(cell address)
{
#ifdef FACTOR_DEBUG
assert(address >= code.seg->start && address < code.seg->end);
#endif
}
/* Update references to words. This is done after a new code block
is added to the heap. */
/* Mark all literals referenced from a word XT. Only for tenured
collections */
void factorvm::mark_code_block(code_block *compiled)
void factor_vm::mark_code_block(code_block *compiled)
{
check_code_address((cell)compiled);
@ -434,19 +417,18 @@ void factorvm::mark_code_block(code_block *compiled)
copy_handle(&compiled->relocation);
}
void factorvm::mark_stack_frame_step(stack_frame *frame)
void factor_vm::mark_stack_frame_step(stack_frame *frame)
{
mark_code_block(frame_code(frame));
}
void mark_stack_frame_step(stack_frame *frame, factorvm *myvm)
void mark_stack_frame_step(stack_frame *frame, factor_vm *myvm)
{
return myvm->mark_stack_frame_step(frame);
}
/* Mark code blocks executing in currently active stack frames. */
void factorvm::mark_active_blocks(context *stacks)
void factor_vm::mark_active_blocks(context *stacks)
{
if(collecting_gen == data->tenured())
{
@ -457,8 +439,7 @@ void factorvm::mark_active_blocks(context *stacks)
}
}
void factorvm::mark_object_code_block(object *object)
void factor_vm::mark_object_code_block(object *object)
{
switch(object->h.hi_tag())
{
@ -487,9 +468,8 @@ void factorvm::mark_object_code_block(object *object)
}
}
/* Perform all fixups on a code block */
void factorvm::relocate_code_block(code_block *compiled)
void factor_vm::relocate_code_block(code_block *compiled)
{
compiled->last_scan = data->nursery();
compiled->needs_fixup = false;
@ -497,13 +477,13 @@ void factorvm::relocate_code_block(code_block *compiled)
flush_icache_for(compiled);
}
void relocate_code_block(code_block *compiled, factorvm *myvm)
void relocate_code_block(code_block *compiled, factor_vm *myvm)
{
return myvm->relocate_code_block(compiled);
}
/* Fixup labels. This is done at compile time, not image load time */
void factorvm::fixup_labels(array *labels, code_block *compiled)
void factor_vm::fixup_labels(array *labels, code_block *compiled)
{
cell i;
cell size = array_capacity(labels);
@ -520,9 +500,8 @@ void factorvm::fixup_labels(array *labels, code_block *compiled)
}
}
/* Might GC */
code_block *factorvm::allot_code_block(cell size)
code_block *factor_vm::allot_code_block(cell size)
{
heap_block *block = heap_allot(&code,size + sizeof(code_block));
@ -549,9 +528,8 @@ code_block *factorvm::allot_code_block(cell size)
return (code_block *)block;
}
/* Might GC */
code_block *factorvm::add_code_block(cell type,cell code_,cell labels_,cell relocation_,cell literals_)
code_block *factor_vm::add_code_block(cell type, cell code_, cell labels_, cell relocation_, cell literals_)
{
gc_root<byte_array> code(code_,this);
gc_root<object> labels(labels_,this);
@ -587,5 +565,4 @@ code_block *factorvm::add_code_block(cell type,cell code_,cell labels_,cell relo
return compiled;
}
}

14
vm/code_block.hpp
View File

@ -26,7 +26,7 @@ enum relocation_type {
RT_UNTAGGED,
/* address of megamorphic_cache_hits var */
RT_MEGAMORPHIC_CACHE_HITS,
/* address of vm object*/
/* address of vm object */
RT_VM,
};
@ -62,14 +62,14 @@ static const cell rel_relative_arm_3_mask = 0xffffff;
/* code relocation table consists of a table of entries for each fixup */
typedef u32 relocation_entry;
struct factorvm;
struct factor_vm;
typedef void (*relocation_iterator)(relocation_entry rel, cell index, code_block *compiled, factorvm *vm);
typedef void (*relocation_iterator)(relocation_entry rel, cell index, code_block *compiled, factor_vm *vm);
// callback functions
void relocate_code_block(code_block *compiled, factorvm *myvm);
void copy_literal_references(code_block *compiled, factorvm *myvm);
void update_word_references(code_block *compiled, factorvm *myvm);
void update_literal_and_word_references(code_block *compiled, factorvm *myvm);
void relocate_code_block(code_block *compiled, factor_vm *myvm);
void copy_literal_references(code_block *compiled, factor_vm *myvm);
void update_word_references(code_block *compiled, factor_vm *myvm);
void update_literal_and_word_references(code_block *compiled, factor_vm *myvm);
}

46
vm/code_gc.cpp
View File

@ -3,16 +3,15 @@
namespace factor
{
void factorvm::clear_free_list(heap *heap)
void factor_vm::clear_free_list(heap *heap)
{
memset(&heap->free,0,sizeof(heap_free_list));
}
/* This malloc-style heap code is reasonably generic. Maybe in the future, it
will be used for the data heap too, if we ever get incremental
mark/sweep/compact GC. */
void factorvm::new_heap(heap *heap, cell size)
void factor_vm::new_heap(heap *heap, cell size)
{
heap->seg = alloc_segment(align_page(size));
if(!heap->seg)
@ -21,8 +20,7 @@ void factorvm::new_heap(heap *heap, cell size)
clear_free_list(heap);
}
void factorvm::add_to_free_list(heap *heap, free_heap_block *block)
void factor_vm::add_to_free_list(heap *heap, free_heap_block *block)
{
if(block->size < free_list_count * block_size_increment)
{
@ -37,12 +35,11 @@ void factorvm::add_to_free_list(heap *heap, free_heap_block *block)
}
}
/* Called after reading the code heap from the image file, and after code GC.
In the former case, we must add a large free block from compiling.base + size to
compiling.limit. */
void factorvm::build_free_list(heap *heap, cell size)
void factor_vm::build_free_list(heap *heap, cell size)
{
heap_block *prev = NULL;
@ -94,15 +91,14 @@ void factorvm::build_free_list(heap *heap, cell size)
}
void factorvm::assert_free_block(free_heap_block *block)
void factor_vm::assert_free_block(free_heap_block *block)
{
if(block->status != B_FREE)
critical_error("Invalid block in free list",(cell)block);
}
free_heap_block *factorvm::find_free_block(heap *heap, cell size)
free_heap_block *factor_vm::find_free_block(heap *heap, cell size)
{
cell attempt = size;
@ -142,8 +138,7 @@ free_heap_block *factorvm::find_free_block(heap *heap, cell size)
return NULL;
}
free_heap_block *factorvm::split_free_block(heap *heap, free_heap_block *block, cell size)
free_heap_block *factor_vm::split_free_block(heap *heap, free_heap_block *block, cell size)
{
if(block->size != size )
{
@ -159,9 +154,8 @@ free_heap_block *factorvm::split_free_block(heap *heap, free_heap_block *block,
return block;
}
/* Allocate a block of memory from the mark and sweep GC heap */
heap_block *factorvm::heap_allot(heap *heap, cell size)
heap_block *factor_vm::heap_allot(heap *heap, cell size)
{
size = (size + block_size_increment - 1) & ~(block_size_increment - 1);
@ -177,16 +171,14 @@ heap_block *factorvm::heap_allot(heap *heap, cell size)
return NULL;
}
/* Deallocates a block manually */
void factorvm::heap_free(heap *heap, heap_block *block)
void factor_vm::heap_free(heap *heap, heap_block *block)
{
block->status = B_FREE;
add_to_free_list(heap,(free_heap_block *)block);
}
void factorvm::mark_block(heap_block *block)
void factor_vm::mark_block(heap_block *block)
{
/* If already marked, do nothing */
switch(block->status)
@ -202,10 +194,9 @@ void factorvm::mark_block(heap_block *block)
}
}
/* If in the middle of code GC, we have to grow the heap, data GC restarts from
scratch, so we have to unmark any marked blocks. */
void factorvm::unmark_marked(heap *heap)
void factor_vm::unmark_marked(heap *heap)
{
heap_block *scan = first_block(heap);
@ -218,10 +209,9 @@ void factorvm::unmark_marked(heap *heap)
}
}
/* After code GC, all referenced code blocks have status set to B_MARKED, so any
which are allocated and not marked can be reclaimed. */
void factorvm::free_unmarked(heap *heap, heap_iterator iter)
void factor_vm::free_unmarked(heap *heap, heap_iterator iter)
{
clear_free_list(heap);
@ -268,9 +258,8 @@ void factorvm::free_unmarked(heap *heap, heap_iterator iter)
add_to_free_list(heap,(free_heap_block *)prev);
}
/* Compute total sum of sizes of free blocks, and size of largest free block */
void factorvm::heap_usage(heap *heap, cell *used, cell *total_free, cell *max_free)
void factor_vm::heap_usage(heap *heap, cell *used, cell *total_free, cell *max_free)
{
*used = 0;
*total_free = 0;
@ -298,9 +287,8 @@ void factorvm::heap_usage(heap *heap, cell *used, cell *total_free, cell *max_fr
}
}
/* The size of the heap, not including the last block if it's free */
cell factorvm::heap_size(heap *heap)
cell factor_vm::heap_size(heap *heap)
{
heap_block *scan = first_block(heap);
@ -315,9 +303,8 @@ cell factorvm::heap_size(heap *heap)
return heap->seg->size;
}
/* Compute where each block is going to go, after compaction */
cell factorvm::compute_heap_forwarding(heap *heap, unordered_map<heap_block *,char *> &forwarding)
cell factor_vm::compute_heap_forwarding(heap *heap, unordered_map<heap_block *,char *> &forwarding)
{
heap_block *scan = first_block(heap);
char *address = (char *)first_block(heap);
@ -338,8 +325,7 @@ cell factorvm::compute_heap_forwarding(heap *heap, unordered_map<heap_block *,ch
return (cell)address - heap->seg->start;
}
void factorvm::compact_heap(heap *heap, unordered_map<heap_block *,char *> &forwarding)
void factor_vm::compact_heap(heap *heap, unordered_map<heap_block *,char *> &forwarding)
{
heap_block *scan = first_block(heap);

2
vm/code_gc.hpp
View File

@ -14,7 +14,7 @@ struct heap {
heap_free_list free;
};
typedef void (*heap_iterator)(heap_block *compiled,factorvm *vm);
typedef void (*heap_iterator)(heap_block *compiled,factor_vm *vm);
inline static heap_block *next_block(heap *h, heap_block *block)
{

40
vm/code_heap.cpp
View File

@ -4,18 +4,18 @@ namespace factor
{
/* Allocate a code heap during startup */
void factorvm::init_code_heap(cell size)
void factor_vm::init_code_heap(cell size)
{
new_heap(&code,size);
}
bool factorvm::in_code_heap_p(cell ptr)
bool factor_vm::in_code_heap_p(cell ptr)
{
return (ptr >= code.seg->start && ptr <= code.seg->end);
}
/* Compile a word definition with the non-optimizing compiler. Allocates memory */
void factorvm::jit_compile_word(cell word_, cell def_, bool relocate)
void factor_vm::jit_compile_word(cell word_, cell def_, bool relocate)
{
gc_root<word> word(word_,this);
gc_root<quotation> def(def_,this);
@ -28,9 +28,8 @@ void factorvm::jit_compile_word(cell word_, cell def_, bool relocate)
if(word->pic_tail_def != F) jit_compile(word->pic_tail_def,relocate);
}
/* Apply a function to every code block */
void factorvm::iterate_code_heap(code_heap_iterator iter)
void factor_vm::iterate_code_heap(code_heap_iterator iter)
{
heap_block *scan = first_block(&code);
@ -42,24 +41,21 @@ void factorvm::iterate_code_heap(code_heap_iterator iter)
}
}
/* Copy literals referenced from all code blocks to newspace. Only for
aging and nursery collections */
void factorvm::copy_code_heap_roots()
void factor_vm::copy_code_heap_roots()
{
iterate_code_heap(factor::copy_literal_references);
}
/* Update pointers to words referenced from all code blocks. Only after
defining a new word. */
void factorvm::update_code_heap_words()
void factor_vm::update_code_heap_words()
{
iterate_code_heap(factor::update_word_references);
}
inline void factorvm::vmprim_modify_code_heap()
inline void factor_vm::primitive_modify_code_heap()
{
gc_root<array> alist(dpop(),this);
@ -112,11 +108,11 @@ inline void factorvm::vmprim_modify_code_heap()
PRIMITIVE(modify_code_heap)
{
PRIMITIVE_GETVM()->vmprim_modify_code_heap();
PRIMITIVE_GETVM()->primitive_modify_code_heap();
}
/* Push the free space and total size of the code heap */
inline void factorvm::vmprim_code_room()
inline void factor_vm::primitive_code_room()
{
cell used, total_free, max_free;
heap_usage(&code,&used,&total_free,&max_free);
@ -128,17 +124,15 @@ inline void factorvm::vmprim_code_room()
PRIMITIVE(code_room)
{
PRIMITIVE_GETVM()->vmprim_code_room();
PRIMITIVE_GETVM()->primitive_code_room();
}
code_block *factorvm::forward_xt(code_block *compiled)
code_block *factor_vm::forward_xt(code_block *compiled)
{
return (code_block *)forwarding[compiled];
}
void factorvm::forward_frame_xt(stack_frame *frame)
void factor_vm::forward_frame_xt(stack_frame *frame)
{
cell offset = (cell)FRAME_RETURN_ADDRESS(frame) - (cell)frame_code(frame);
code_block *forwarded = forward_xt(frame_code(frame));
@ -146,12 +140,12 @@ void factorvm::forward_frame_xt(stack_frame *frame)
FRAME_RETURN_ADDRESS(frame) = (void *)((cell)forwarded + offset);
}
void forward_frame_xt(stack_frame *frame,factorvm *myvm)
void forward_frame_xt(stack_frame *frame,factor_vm *myvm)
{
return myvm->forward_frame_xt(frame);
}
void factorvm::forward_object_xts()
void factor_vm::forward_object_xts()
{
begin_scan();
@ -193,9 +187,8 @@ void factorvm::forward_object_xts()
end_scan();
}
/* Set the XT fields now that the heap has been compacted */
void factorvm::fixup_object_xts()
void factor_vm::fixup_object_xts()
{
begin_scan();
@ -223,12 +216,11 @@ void factorvm::fixup_object_xts()
end_scan();
}
/* Move all free space to the end of the code heap. This is not very efficient,
since it makes several passes over the code and data heaps, but we only ever
do this before saving a deployed image and exiting, so performaance is not
critical here */
void factorvm::compact_code_heap()
void factor_vm::compact_code_heap()
{
/* Free all unreachable code blocks */
gc();

4
vm/code_heap.hpp
View File

@ -1,7 +1,7 @@
namespace factor
{
struct factorvm;
typedef void (*code_heap_iterator)(code_block *compiled,factorvm *myvm);
struct factor_vm;
typedef void (*code_heap_iterator)(code_block *compiled,factor_vm *myvm);
PRIMITIVE(modify_code_heap);
PRIMITIVE(code_room);

47
vm/contexts.cpp
View File

@ -3,20 +3,19 @@
namespace factor
{
void factorvm::reset_datastack()
void factor_vm::reset_datastack()
{
ds = ds_bot - sizeof(cell);
}
void factorvm::reset_retainstack()
void factor_vm::reset_retainstack()
{
rs = rs_bot - sizeof(cell);
}
static const cell stack_reserved = (64 * sizeof(cell));
void factorvm::fix_stacks()
void factor_vm::fix_stacks()
{
if(ds + sizeof(cell) < ds_bot || ds + stack_reserved >= ds_top) reset_datastack();
if(rs + sizeof(cell) < rs_bot || rs + stack_reserved >= rs_top) reset_retainstack();
@ -24,7 +23,7 @@ void factorvm::fix_stacks()
/* called before entry into foreign C code. Note that ds and rs might
be stored in registers, so callbacks must save and restore the correct values */
void factorvm::save_stacks()
void factor_vm::save_stacks()
{
if(stack_chain)
{
@ -33,7 +32,7 @@ void factorvm::save_stacks()
}
}
context *factorvm::alloc_context()
context *factor_vm::alloc_context()
{
context *new_context;
@ -52,14 +51,14 @@ context *factorvm::alloc_context()
return new_context;
}
void factorvm::dealloc_context(context *old_context)
void factor_vm::dealloc_context(context *old_context)
{
old_context->next = unused_contexts;
unused_contexts = old_context;
}
/* called on entry into a compiled callback */
void factorvm::nest_stacks()
void factor_vm::nest_stacks()
{
context *new_context = alloc_context();
@ -90,14 +89,14 @@ void factorvm::nest_stacks()
reset_retainstack();
}
void nest_stacks(factorvm *myvm)
void nest_stacks(factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->nest_stacks();
}
/* called when leaving a compiled callback */
void factorvm::unnest_stacks()
void factor_vm::unnest_stacks()
{
ds = stack_chain->datastack_save;
rs = stack_chain->retainstack_save;
@ -111,14 +110,14 @@ void factorvm::unnest_stacks()
dealloc_context(old_stacks);
}
void unnest_stacks(factorvm *myvm)
void unnest_stacks(factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->unnest_stacks();
}
/* called on startup */
void factorvm::init_stacks(cell ds_size_, cell rs_size_)
void factor_vm::init_stacks(cell ds_size_, cell rs_size_)
{
ds_size = ds_size_;
rs_size = rs_size_;
@ -126,7 +125,7 @@ void factorvm::init_stacks(cell ds_size_, cell rs_size_)
unused_contexts = NULL;
}
bool factorvm::stack_to_array(cell bottom, cell top)
bool factor_vm::stack_to_array(cell bottom, cell top)
{
fixnum depth = (fixnum)(top - bottom + sizeof(cell));
@ -141,7 +140,7 @@ bool factorvm::stack_to_array(cell bottom, cell top)
}
}
inline void factorvm::vmprim_datastack()
inline void factor_vm::primitive_datastack()
{
if(!stack_to_array(ds_bot,ds))
general_error(ERROR_DS_UNDERFLOW,F,F,NULL);
@ -149,10 +148,10 @@ inline void factorvm::vmprim_datastack()
PRIMITIVE(datastack)
{
PRIMITIVE_GETVM()->vmprim_datastack();
PRIMITIVE_GETVM()->primitive_datastack();
}
inline void factorvm::vmprim_retainstack()
inline void factor_vm::primitive_retainstack()
{
if(!stack_to_array(rs_bot,rs))
general_error(ERROR_RS_UNDERFLOW,F,F,NULL);
@ -160,39 +159,39 @@ inline void factorvm::vmprim_retainstack()
PRIMITIVE(retainstack)
{
PRIMITIVE_GETVM()->vmprim_retainstack();
PRIMITIVE_GETVM()->primitive_retainstack();
}
/* returns pointer to top of stack */
cell factorvm::array_to_stack(array *array, cell bottom)
cell factor_vm::array_to_stack(array *array, cell bottom)
{
cell depth = array_capacity(array) * sizeof(cell);
memcpy((void*)bottom,array + 1,depth);
return bottom + depth - sizeof(cell);
}
inline void factorvm::vmprim_set_datastack()
inline void factor_vm::primitive_set_datastack()
{
ds = array_to_stack(untag_check<array>(dpop()),ds_bot);
}
PRIMITIVE(set_datastack)
{
PRIMITIVE_GETVM()->vmprim_set_datastack();
PRIMITIVE_GETVM()->primitive_set_datastack();
}
inline void factorvm::vmprim_set_retainstack()
inline void factor_vm::primitive_set_retainstack()
{
rs = array_to_stack(untag_check<array>(dpop()),rs_bot);
}
PRIMITIVE(set_retainstack)
{
PRIMITIVE_GETVM()->vmprim_set_retainstack();
PRIMITIVE_GETVM()->primitive_set_retainstack();
}
/* Used to implement call( */
inline void factorvm::vmprim_check_datastack()
inline void factor_vm::primitive_check_datastack()
{
fixnum out = to_fixnum(dpop());
fixnum in = to_fixnum(dpop());
@ -219,7 +218,7 @@ inline void factorvm::vmprim_check_datastack()
PRIMITIVE(check_datastack)
{
PRIMITIVE_GETVM()->vmprim_check_datastack();
PRIMITIVE_GETVM()->primitive_check_datastack();
}
}

6
vm/contexts.hpp
View File

@ -50,9 +50,9 @@ PRIMITIVE(set_datastack);
PRIMITIVE(set_retainstack);
PRIMITIVE(check_datastack);
struct factorvm;
VM_C_API void nest_stacks(factorvm *vm);
VM_C_API void unnest_stacks(factorvm *vm);
struct factor_vm;
VM_C_API void nest_stacks(factor_vm *vm);
VM_C_API void unnest_stacks(factor_vm *vm);
}

1
vm/cpu-x86.32.S
View File

@ -93,7 +93,6 @@ DEF(F_FASTCALL void,throw_impl,(CELL quot, F_STACK_FRAME *rewind_to, void *vm)):
mov NV_TEMP_REG,ARG1
jmp *QUOT_XT_OFFSET(ARG0)
DEF(F_FASTCALL void,lazy_jit_compile,(CELL quot, void *vm)):
mov ARG1,NV_TEMP_REG /* stash vm ptr */
mov STACK_REG,ARG1 /* Save stack pointer */

1
vm/cpu-x86.64.S
View File

@ -89,7 +89,6 @@ DEF(void,primitive_inline_cache_miss_tail,(void *vm)):
add $STACK_PADDING,%rsp
jmp *%rax
DEF(void,get_sse_env,(void*)):
stmxcsr (%rdi)
ret

4
vm/cpu-x86.S
View File

@ -39,13 +39,13 @@ multiply_overflow:
pop ARG2
jmp MANGLE(overflow_fixnum_multiply)
DEF(F_FASTCALL void,c_to_factor,(CELL quot, void *vm)):
PUSH_NONVOLATILE
mov ARG0,NV_TEMP_REG
/* Create register shadow area for Win64 */
sub $32,STACK_REG
/* Save stack pointer */
lea -CELL_SIZE(STACK_REG),ARG0
push ARG1 /* save vm ptr */

94
vm/data_gc.cpp
View File

@ -3,16 +3,15 @@
namespace factor
{
void factorvm::init_data_gc()
void factor_vm::init_data_gc()
{
performing_gc = false;
last_code_heap_scan = data->nursery();
collecting_aging_again = false;
}
/* Given a pointer to oldspace, copy it to newspace */
object *factorvm::copy_untagged_object_impl(object *pointer, cell size)
object *factor_vm::copy_untagged_object_impl(object *pointer, cell size)
{
if(newspace->here + size >= newspace->end)
longjmp(gc_jmp,1);
@ -26,16 +25,14 @@ object *factorvm::copy_untagged_object_impl(object *pointer, cell size)
return newpointer;
}
object *factorvm::copy_object_impl(object *untagged)
object *factor_vm::copy_object_impl(object *untagged)
{
object *newpointer = copy_untagged_object_impl(untagged,untagged_object_size(untagged));
untagged->h.forward_to(newpointer);
return newpointer;
}
bool factorvm::should_copy_p(object *untagged)
bool factor_vm::should_copy_p(object *untagged)
{
if(in_zone(newspace,untagged))
return false;
@ -52,9 +49,8 @@ bool factorvm::should_copy_p(object *untagged)
}
}
/* Follow a chain of forwarding pointers */
object *factorvm::resolve_forwarding(object *untagged)
object *factor_vm::resolve_forwarding(object *untagged)
{
check_data_pointer(untagged);
@ -72,8 +68,7 @@ object *factorvm::resolve_forwarding(object *untagged)
}
}
template <typename TYPE> TYPE *factorvm::copy_untagged_object(TYPE *untagged)
template <typename TYPE> TYPE *factor_vm::copy_untagged_object(TYPE *untagged)
{
check_data_pointer(untagged);
@ -88,14 +83,12 @@ template <typename TYPE> TYPE *factorvm::copy_untagged_object(TYPE *untagged)
return untagged;
}
cell factorvm::copy_object(cell pointer)
cell factor_vm::copy_object(cell pointer)
{
return RETAG(copy_untagged_object(untag<object>(pointer)),TAG(pointer));
}
void factorvm::copy_handle(cell *handle)
void factor_vm::copy_handle(cell *handle)
{
cell pointer = *handle;
@ -108,9 +101,8 @@ void factorvm::copy_handle(cell *handle)
}
}
/* Scan all the objects in the card */
void factorvm::copy_card(card *ptr, cell gen, cell here)
void factor_vm::copy_card(card *ptr, cell gen, cell here)
{
cell card_scan = card_to_addr(ptr) + card_offset(ptr);
cell card_end = card_to_addr(ptr + 1);
@ -123,8 +115,7 @@ void factorvm::copy_card(card *ptr, cell gen, cell here)
cards_scanned++;
}
void factorvm::copy_card_deck(card_deck *deck, cell gen, card mask, card unmask)
void factor_vm::copy_card_deck(card_deck *deck, cell gen, card mask, card unmask)
{
card *first_card = deck_to_card(deck);
card *last_card = deck_to_card(deck + 1);
@ -155,9 +146,8 @@ void factorvm::copy_card_deck(card_deck *deck, cell gen, card mask, card unmask)
decks_scanned++;
}
/* Copy all newspace objects referenced from marked cards to the destination */
void factorvm::copy_gen_cards(cell gen)
void factor_vm::copy_gen_cards(cell gen)
{
card_deck *first_deck = addr_to_deck(data->generations[gen].start);
card_deck *last_deck = addr_to_deck(data->generations[gen].end);
@ -222,10 +212,9 @@ void factorvm::copy_gen_cards(cell gen)
}
}
/* Scan cards in all generations older than the one being collected, copying
old->new references */
void factorvm::copy_cards()
void factor_vm::copy_cards()
{
u64 start = current_micros();
@ -236,9 +225,8 @@ void factorvm::copy_cards()
card_scan_time += (current_micros() - start);
}
/* Copy all tagged pointers in a range of memory */
void factorvm::copy_stack_elements(segment *region, cell top)
void factor_vm::copy_stack_elements(segment *region, cell top)
{
cell ptr = region->start;
@ -246,8 +234,7 @@ void factorvm::copy_stack_elements(segment *region, cell top)
copy_handle((cell*)ptr);
}
void factorvm::copy_registered_locals()
void factor_vm::copy_registered_locals()
{
std::vector<cell>::const_iterator iter = gc_locals.begin();
std::vector<cell>::const_iterator end = gc_locals.end();
@ -256,8 +243,7 @@ void factorvm::copy_registered_locals()
copy_handle((cell *)(*iter));
}
void factorvm::copy_registered_bignums()
void factor_vm::copy_registered_bignums()
{
std::vector<cell>::const_iterator iter = gc_bignums.begin();
std::vector<cell>::const_iterator end = gc_bignums.end();
@ -279,10 +265,9 @@ void factorvm::copy_registered_bignums()
}
}
/* Copy roots over at the start of GC, namely various constants, stacks,
the user environment and extra roots registered by local_roots.hpp */
void factorvm::copy_roots()
void factor_vm::copy_roots()
{
copy_handle(&T);
copy_handle(&bignum_zero);
@ -316,8 +301,7 @@ void factorvm::copy_roots()
copy_handle(&userenv[i]);
}
cell factorvm::copy_next_from_nursery(cell scan)
cell factor_vm::copy_next_from_nursery(cell scan)
{
cell *obj = (cell *)scan;
cell *end = (cell *)(scan + binary_payload_start((object *)scan));
@ -345,8 +329,7 @@ cell factorvm::copy_next_from_nursery(cell scan)
return scan + untagged_object_size((object *)scan);
}
cell factorvm::copy_next_from_aging(cell scan)
cell factor_vm::copy_next_from_aging(cell scan)
{
cell *obj = (cell *)scan;
cell *end = (cell *)(scan + binary_payload_start((object *)scan));
@ -378,8 +361,7 @@ cell factorvm::copy_next_from_aging(cell scan)
return scan + untagged_object_size((object *)scan);
}
cell factorvm::copy_next_from_tenured(cell scan)
cell factor_vm::copy_next_from_tenured(cell scan)
{
cell *obj = (cell *)scan;
cell *end = (cell *)(scan + binary_payload_start((object *)scan));
@ -409,8 +391,7 @@ cell factorvm::copy_next_from_tenured(cell scan)
return scan + untagged_object_size((object *)scan);
}
void factorvm::copy_reachable_objects(cell scan, cell *end)
void factor_vm::copy_reachable_objects(cell scan, cell *end)
{
if(collecting_gen == data->nursery())
{
@ -429,9 +410,8 @@ void factorvm::copy_reachable_objects(cell scan, cell *end)
}
}
/* Prepare to start copying reachable objects into an unused zone */
void factorvm::begin_gc(cell requested_bytes)
void factor_vm::begin_gc(cell requested_bytes)
{
if(growing_data_heap)
{
@ -464,8 +444,7 @@ void factorvm::begin_gc(cell requested_bytes)
}
}
void factorvm::end_gc(cell gc_elapsed)
void factor_vm::end_gc(cell gc_elapsed)
{
gc_stats *s = &stats[collecting_gen];
@ -503,11 +482,10 @@ void factorvm::end_gc(cell gc_elapsed)
collecting_aging_again = false;
}
/* Collect gen and all younger generations.
If growing_data_heap_ is true, we must grow the data heap to such a size that
an allocation of requested_bytes won't fail */
void factorvm::garbage_collection(cell gen,bool growing_data_heap_,cell requested_bytes)
void factor_vm::garbage_collection(cell gen,bool growing_data_heap_,cell requested_bytes)
{
if(gc_off)
{
@ -585,24 +563,22 @@ void factorvm::garbage_collection(cell gen,bool growing_data_heap_,cell requeste
performing_gc = false;
}
void factorvm::gc()
void factor_vm::gc()
{
garbage_collection(data->tenured(),false,0);
}
inline void factorvm::vmprim_gc()
inline void factor_vm::primitive_gc()
{
gc();
}
PRIMITIVE(gc)
{
PRIMITIVE_GETVM()->vmprim_gc();
PRIMITIVE_GETVM()->primitive_gc();
}
inline void factorvm::vmprim_gc_stats()
inline void factor_vm::primitive_gc_stats()
{
growable_array result(this);
@ -634,10 +610,10 @@ inline void factorvm::vmprim_gc_stats()
PRIMITIVE(gc_stats)
{
PRIMITIVE_GETVM()->vmprim_gc_stats();
PRIMITIVE_GETVM()->primitive_gc_stats();
}
void factorvm::clear_gc_stats()
void factor_vm::clear_gc_stats()
{
for(cell i = 0; i < max_gen_count; i++)
memset(&stats[i],0,sizeof(gc_stats));
@ -648,19 +624,19 @@ void factorvm::clear_gc_stats()
code_heap_scans = 0;
}
inline void factorvm::vmprim_clear_gc_stats()
inline void factor_vm::primitive_clear_gc_stats()
{
clear_gc_stats();
}
PRIMITIVE(clear_gc_stats)
{
PRIMITIVE_GETVM()->vmprim_clear_gc_stats();
PRIMITIVE_GETVM()->primitive_clear_gc_stats();
}
/* classes.tuple uses this to reshape tuples; tools.deploy.shaker uses this
to coalesce equal but distinct quotations and wrappers. */
inline void factorvm::vmprim_become()
inline void factor_vm::primitive_become()
{
array *new_objects = untag_check<array>(dpop());
array *old_objects = untag_check<array>(dpop());
@ -691,10 +667,10 @@ inline void factorvm::vmprim_become()
PRIMITIVE(become)
{
PRIMITIVE_GETVM()->vmprim_become();
PRIMITIVE_GETVM()->primitive_become();
}
void factorvm::inline_gc(cell *gc_roots_base, cell gc_roots_size)
void factor_vm::inline_gc(cell *gc_roots_base, cell gc_roots_size)
{
for(cell i = 0; i < gc_roots_size; i++)
gc_locals.push_back((cell)&gc_roots_base[i]);
@ -705,7 +681,7 @@ void factorvm::inline_gc(cell *gc_roots_base, cell gc_roots_size)
gc_locals.pop_back();
}
VM_ASM_API void inline_gc(cell *gc_roots_base, cell gc_roots_size, factorvm *myvm)
VM_ASM_API void inline_gc(cell *gc_roots_base, cell gc_roots_size, factor_vm *myvm)
{
ASSERTVM();
VM_PTR->inline_gc(gc_roots_base,gc_roots_size);

4
vm/data_gc.hpp
View File

@ -19,7 +19,7 @@ PRIMITIVE(gc);
PRIMITIVE(gc_stats);
PRIMITIVE(clear_gc_stats);
PRIMITIVE(become);
struct factorvm;
VM_ASM_API void inline_gc(cell *gc_roots_base, cell gc_roots_size, factorvm *myvm);
struct factor_vm;
VM_ASM_API void inline_gc(cell *gc_roots_base, cell gc_roots_size, factor_vm *myvm);
}

84
vm/data_heap.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
cell factorvm::init_zone(zone *z, cell size, cell start)
cell factor_vm::init_zone(zone *z, cell size, cell start)
{
z->size = size;
z->start = z->here = start;
@ -11,8 +11,7 @@ cell factorvm::init_zone(zone *z, cell size, cell start)
return z->end;
}
void factorvm::init_card_decks()
void factor_vm::init_card_decks()
{
cell start = align(data->seg->start,deck_size);
allot_markers_offset = (cell)data->allot_markers - (start >> card_bits);
@ -20,7 +19,7 @@ void factorvm::init_card_decks()
decks_offset = (cell)data->decks - (start >> deck_bits);
}
data_heap *factorvm::alloc_data_heap(cell gens, cell young_size,cell aging_size,cell tenured_size)
data_heap *factor_vm::alloc_data_heap(cell gens, cell young_size,cell aging_size,cell tenured_size)
{
young_size = align(young_size,deck_size);
aging_size = align(aging_size,deck_size);
@ -84,8 +83,7 @@ data_heap *factorvm::alloc_data_heap(cell gens, cell young_size,cell aging_size,
return data;
}
data_heap *factorvm::grow_data_heap(data_heap *data, cell requested_bytes)
data_heap *factor_vm::grow_data_heap(data_heap *data, cell requested_bytes)
{
cell new_tenured_size = (data->tenured_size * 2) + requested_bytes;
@ -95,8 +93,7 @@ data_heap *factorvm::grow_data_heap(data_heap *data, cell requested_bytes)
new_tenured_size);
}
void factorvm::dealloc_data_heap(data_heap *data)
void factor_vm::dealloc_data_heap(data_heap *data)
{
dealloc_segment(data->seg);
free(data->generations);
@ -107,8 +104,7 @@ void factorvm::dealloc_data_heap(data_heap *data)
free(data);
}
void factorvm::clear_cards(cell from, cell to)
void factor_vm::clear_cards(cell from, cell to)
{
/* NOTE: reverse order due to heap layout. */
card *first_card = addr_to_card(data->generations[to].start);
@ -116,8 +112,7 @@ void factorvm::clear_cards(cell from, cell to)
memset(first_card,0,last_card - first_card);
}
void factorvm::clear_decks(cell from, cell to)
void factor_vm::clear_decks(cell from, cell to)
{
/* NOTE: reverse order due to heap layout. */
card_deck *first_deck = addr_to_deck(data->generations[to].start);
@ -125,8 +120,7 @@ void factorvm::clear_decks(cell from, cell to)
memset(first_deck,0,last_deck - first_deck);
}
void factorvm::clear_allot_markers(cell from, cell to)
void factor_vm::clear_allot_markers(cell from, cell to)
{
/* NOTE: reverse order due to heap layout. */
card *first_card = addr_to_allot_marker((object *)data->generations[to].start);
@ -134,8 +128,7 @@ void factorvm::clear_allot_markers(cell from, cell to)
memset(first_card,invalid_allot_marker,last_card - first_card);
}
void factorvm::reset_generation(cell i)
void factor_vm::reset_generation(cell i)
{
zone *z = (i == data->nursery() ? &nursery : &data->generations[i]);
@ -144,10 +137,9 @@ void factorvm::reset_generation(cell i)
memset((void*)z->start,69,z->size);
}
/* After garbage collection, any generations which are now empty need to have
their allocation pointers and cards reset. */
void factorvm::reset_generations(cell from, cell to)
void factor_vm::reset_generations(cell from, cell to)
{
cell i;
for(i = from; i <= to; i++)
@ -158,8 +150,7 @@ void factorvm::reset_generations(cell from, cell to)
clear_allot_markers(from,to);
}
void factorvm::set_data_heap(data_heap *data_)
void factor_vm::set_data_heap(data_heap *data_)
{
data = data_;
nursery = data->generations[data->nursery()];
@ -169,17 +160,15 @@ void factorvm::set_data_heap(data_heap *data_)
clear_allot_markers(data->nursery(),data->tenured());
}
void factorvm::init_data_heap(cell gens,cell young_size,cell aging_size,cell tenured_size,bool secure_gc_)
void factor_vm::init_data_heap(cell gens,cell young_size,cell aging_size,cell tenured_size,bool secure_gc_)
{
set_data_heap(alloc_data_heap(gens,young_size,aging_size,tenured_size));
secure_gc = secure_gc_;
init_data_gc();
}
/* Size of the object pointed to by a tagged pointer */
cell factorvm::object_size(cell tagged)
cell factor_vm::object_size(cell tagged)
{
if(immediate_p(tagged))
return 0;
@ -187,16 +176,14 @@ cell factorvm::object_size(cell tagged)
return untagged_object_size(untag<object>(tagged));
}
/* Size of the object pointed to by an untagged pointer */
cell factorvm::untagged_object_size(object *pointer)
cell factor_vm::untagged_object_size(object *pointer)
{
return align8(unaligned_object_size(pointer));
}
/* Size of the data area of an object pointed to by an untagged pointer */
cell factorvm::unaligned_object_size(object *pointer)
cell factor_vm::unaligned_object_size(object *pointer)
{
switch(pointer->h.hi_tag())
{
@ -230,21 +217,20 @@ cell factorvm::unaligned_object_size(object *pointer)
}
}
inline void factorvm::vmprim_size()
inline void factor_vm::primitive_size()
{
box_unsigned_cell(object_size(dpop()));
}
PRIMITIVE(size)
{
PRIMITIVE_GETVM()->vmprim_size();
PRIMITIVE_GETVM()->primitive_size();
}
/* The number of cells from the start of the object which should be scanned by
the GC. Some types have a binary payload at the end (string, word, DLL) which
we ignore. */
cell factorvm::binary_payload_start(object *pointer)
cell factor_vm::binary_payload_start(object *pointer)
{
switch(pointer->h.hi_tag())
{
@ -278,9 +264,8 @@ cell factorvm::binary_payload_start(object *pointer)
}
}
/* Push memory usage statistics in data heap */
inline void factorvm::vmprim_data_room()
inline void factor_vm::primitive_data_room()
{
dpush(tag_fixnum((data->cards_end - data->cards) >> 10));
dpush(tag_fixnum((data->decks_end - data->decks) >> 10));
@ -301,34 +286,32 @@ inline void factorvm::vmprim_data_room()
PRIMITIVE(data_room)
{
PRIMITIVE_GETVM()->vmprim_data_room();
PRIMITIVE_GETVM()->primitive_data_room();
}
/* Disables GC and activates next-object ( -- obj ) primitive */
void factorvm::begin_scan()
void factor_vm::begin_scan()
{
heap_scan_ptr = data->generations[data->tenured()].start;
gc_off = true;
}
void factorvm::end_scan()
void factor_vm::end_scan()
{
gc_off = false;
}
inline void factorvm::vmprim_begin_scan()
inline void factor_vm::primitive_begin_scan()
{
begin_scan();
}
PRIMITIVE(begin_scan)
{
PRIMITIVE_GETVM()->vmprim_begin_scan();
PRIMITIVE_GETVM()->primitive_begin_scan();
}
cell factorvm::next_object()
cell factor_vm::next_object()
{
if(!gc_off)
general_error(ERROR_HEAP_SCAN,F,F,NULL);
@ -341,30 +324,29 @@ cell factorvm::next_object()
return tag_dynamic(obj);
}
/* Push object at heap scan cursor and advance; pushes f when done */
inline void factorvm::vmprim_next_object()
inline void factor_vm::primitive_next_object()
{
dpush(next_object());
}
PRIMITIVE(next_object)
{
PRIMITIVE_GETVM()->vmprim_next_object();
PRIMITIVE_GETVM()->primitive_next_object();
}
/* Re-enables GC */
inline void factorvm::vmprim_end_scan()
inline void factor_vm::primitive_end_scan()
{
gc_off = false;
}
PRIMITIVE(end_scan)
{
PRIMITIVE_GETVM()->vmprim_end_scan();
PRIMITIVE_GETVM()->primitive_end_scan();
}
template<typename TYPE> void factorvm::each_object(TYPE &functor)
template<typename TYPE> void factor_vm::each_object(TYPE &functor)
{
begin_scan();
cell obj;
@ -373,7 +355,6 @@ template<typename TYPE> void factorvm::each_object(TYPE &functor)
end_scan();
}
namespace
{
@ -385,13 +366,13 @@ struct word_counter {
struct word_accumulator {
growable_array words;
word_accumulator(int count,factorvm *vm) : words(vm,count) {}
word_accumulator(int count,factor_vm *vm) : words(vm,count) {}
void operator()(tagged<object> obj) { if(obj.type_p(WORD_TYPE)) words.add(obj.value()); }
};
}
cell factorvm::find_all_words()
cell factor_vm::find_all_words()
{
word_counter counter;
each_object(counter);
@ -401,5 +382,4 @@ cell factorvm::find_all_words()
return accum.words.elements.value();
}
}

2
vm/data_heap.hpp
View File

@ -1,7 +1,6 @@
namespace factor
{
/* generational copying GC divides memory into zones */
struct zone {
/* allocation pointer is 'here'; its offset is hardcoded in the
@ -45,7 +44,6 @@ struct data_heap {
bool have_aging_p() { return gen_count > 2; }
};
static const cell max_gen_count = 3;
inline static bool in_zone(zone *z, object *pointer)

70
vm/debug.cpp
View File

@ -3,16 +3,14 @@
namespace factor
{
void factorvm::print_chars(string* str)
void factor_vm::print_chars(string* str)
{
cell i;
for(i = 0; i < string_capacity(str); i++)
putchar(string_nth(str,i));
}
void factorvm::print_word(word* word, cell nesting)
void factor_vm::print_word(word* word, cell nesting)
{
if(tagged<object>(word->vocabulary).type_p(STRING_TYPE))
{
@ -30,16 +28,14 @@ void factorvm::print_word(word* word, cell nesting)
}
}
void factorvm::print_factor_string(string* str)
void factor_vm::print_factor_string(string* str)
{
putchar('"');
print_chars(str);
putchar('"');
}
void factorvm::print_array(array* array, cell nesting)
void factor_vm::print_array(array* array, cell nesting)
{
cell length = array_capacity(array);
cell i;
@ -63,8 +59,7 @@ void factorvm::print_array(array* array, cell nesting)
print_string("...");
}
void factorvm::print_tuple(tuple *tuple, cell nesting)
void factor_vm::print_tuple(tuple *tuple, cell nesting)
{
tuple_layout *layout = untag<tuple_layout>(tuple->layout);
cell length = to_fixnum(layout->size);
@ -93,8 +88,7 @@ void factorvm::print_tuple(tuple *tuple, cell nesting)
print_string("...");
}
void factorvm::print_nested_obj(cell obj, fixnum nesting)
void factor_vm::print_nested_obj(cell obj, fixnum nesting)
{
if(nesting <= 0 && !full_output)
{
@ -144,14 +138,12 @@ void factorvm::print_nested_obj(cell obj, fixnum nesting)
}
}
void factorvm::print_obj(cell obj)
void factor_vm::print_obj(cell obj)
{
print_nested_obj(obj,10);
}
void factorvm::print_objects(cell *start, cell *end)
void factor_vm::print_objects(cell *start, cell *end)
{
for(; start <= end; start++)
{
@ -160,22 +152,19 @@ void factorvm::print_objects(cell *start, cell *end)
}
}
void factorvm::print_datastack()
void factor_vm::print_datastack()
{
print_string("==== DATA STACK:\n");
print_objects((cell *)ds_bot,(cell *)ds);
}
void factorvm::print_retainstack()
void factor_vm::print_retainstack()
{
print_string("==== RETAIN STACK:\n");
print_objects((cell *)rs_bot,(cell *)rs);
}
void factorvm::print_stack_frame(stack_frame *frame)
void factor_vm::print_stack_frame(stack_frame *frame)
{
print_obj(frame_executing(frame));
print_string("\n");
@ -192,12 +181,12 @@ void factorvm::print_stack_frame(stack_frame *frame)
print_string("\n");
}
void print_stack_frame(stack_frame *frame, factorvm *myvm)
void print_stack_frame(stack_frame *frame, factor_vm *myvm)
{
return myvm->print_stack_frame(frame);
}
void factorvm::print_callstack()
void factor_vm::print_callstack()
{
print_string("==== CALL STACK:\n");
cell bottom = (cell)stack_chain->callstack_bottom;
@ -205,8 +194,7 @@ void factorvm::print_callstack()
iterate_callstack(top,bottom,factor::print_stack_frame);
}
void factorvm::dump_cell(cell x)
void factor_vm::dump_cell(cell x)
{
print_cell_hex_pad(x); print_string(": ");
x = *(cell *)x;
@ -214,8 +202,7 @@ void factorvm::dump_cell(cell x)
nl();
}
void factorvm::dump_memory(cell from, cell to)
void factor_vm::dump_memory(cell from, cell to)
{
from = UNTAG(from);
@ -223,16 +210,14 @@ void factorvm::dump_memory(cell from, cell to)
dump_cell(from);
}
void factorvm::dump_zone(zone *z)
void factor_vm::dump_zone(zone *z)
{
print_string("Start="); print_cell(z->start);
print_string(", size="); print_cell(z->size);
print_string(", here="); print_cell(z->here - z->start); nl();
}
void factorvm::dump_generations()
void factor_vm::dump_generations()
{
cell i;
@ -258,8 +243,7 @@ void factorvm::dump_generations()
nl();
}
void factorvm::dump_objects(cell type)
void factor_vm::dump_objects(cell type)
{
gc();
begin_scan();
@ -280,8 +264,7 @@ void factorvm::dump_objects(cell type)
}
void factorvm::find_data_references_step(cell *scan)
void factor_vm::find_data_references_step(cell *scan)
{
if(look_for == *scan)
{
@ -292,12 +275,12 @@ void factorvm::find_data_references_step(cell *scan)
}
}
void find_data_references_step(cell *scan,factorvm *myvm)
void find_data_references_step(cell *scan,factor_vm *myvm)
{
return myvm->find_data_references_step(scan);
}
void factorvm::find_data_references(cell look_for_)
void factor_vm::find_data_references(cell look_for_)
{
look_for = look_for_;
@ -309,9 +292,8 @@ void factorvm::find_data_references(cell look_for_)
end_scan();
}
/* Dump all code blocks for debugging */
void factorvm::dump_code_heap()
void factor_vm::dump_code_heap()
{
cell reloc_size = 0, literal_size = 0;
@ -351,8 +333,7 @@ void factorvm::dump_code_heap()
print_cell(literal_size); print_string(" bytes of literal data\n");
}
void factorvm::factorbug()
void factor_vm::factorbug()
{
if(fep_disabled)
{
@ -496,8 +477,7 @@ void factorvm::factorbug()
}
}
inline void factorvm::vmprim_die()
inline void factor_vm::primitive_die()
{
print_string("The die word was called by the library. Unless you called it yourself,\n");
print_string("you have triggered a bug in Factor. Please report.\n");
@ -506,7 +486,7 @@ inline void factorvm::vmprim_die()
PRIMITIVE(die)
{
PRIMITIVE_GETVM()->vmprim_die();
PRIMITIVE_GETVM()->primitive_die();
}
}

1
vm/debug.hpp
View File

@ -1,7 +1,6 @@
namespace factor
{
PRIMITIVE(die);
}

52
vm/dispatch.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
cell factorvm::search_lookup_alist(cell table, cell klass)
cell factor_vm::search_lookup_alist(cell table, cell klass)
{
array *elements = untag<array>(table);
fixnum index = array_capacity(elements) - 2;
@ -18,7 +18,7 @@ cell factorvm::search_lookup_alist(cell table, cell klass)
return F;
}
cell factorvm::search_lookup_hash(cell table, cell klass, cell hashcode)
cell factor_vm::search_lookup_hash(cell table, cell klass, cell hashcode)
{
array *buckets = untag<array>(table);
cell bucket = array_nth(buckets,hashcode & (array_capacity(buckets) - 1));
@ -28,19 +28,19 @@ cell factorvm::search_lookup_hash(cell table, cell klass, cell hashcode)
return search_lookup_alist(bucket,klass);
}
cell factorvm::nth_superclass(tuple_layout *layout, fixnum echelon)
cell factor_vm::nth_superclass(tuple_layout *layout, fixnum echelon)
{
cell *ptr = (cell *)(layout + 1);
return ptr[echelon * 2];
}
cell factorvm::nth_hashcode(tuple_layout *layout, fixnum echelon)
cell factor_vm::nth_hashcode(tuple_layout *layout, fixnum echelon)
{
cell *ptr = (cell *)(layout + 1);
return ptr[echelon * 2 + 1];
}
cell factorvm::lookup_tuple_method(cell obj, cell methods)
cell factor_vm::lookup_tuple_method(cell obj, cell methods)
{
tuple_layout *layout = untag<tuple_layout>(untag<tuple>(obj)->layout);
@ -72,7 +72,7 @@ cell factorvm::lookup_tuple_method(cell obj, cell methods)
return F;
}
cell factorvm::lookup_hi_tag_method(cell obj, cell methods)
cell factor_vm::lookup_hi_tag_method(cell obj, cell methods)
{
array *hi_tag_methods = untag<array>(methods);
cell tag = untag<object>(obj)->h.hi_tag() - HEADER_TYPE;
@ -82,7 +82,7 @@ cell factorvm::lookup_hi_tag_method(cell obj, cell methods)
return array_nth(hi_tag_methods,tag);
}
cell factorvm::lookup_hairy_method(cell obj, cell methods)
cell factor_vm::lookup_hairy_method(cell obj, cell methods)
{
cell method = array_nth(untag<array>(methods),TAG(obj));
if(tagged<object>(method).type_p(WORD_TYPE))
@ -104,7 +104,7 @@ cell factorvm::lookup_hairy_method(cell obj, cell methods)
}
}
cell factorvm::lookup_method(cell obj, cell methods)
cell factor_vm::lookup_method(cell obj, cell methods)
{
cell tag = TAG(obj);
if(tag == TUPLE_TYPE || tag == OBJECT_TYPE)
@ -113,7 +113,7 @@ cell factorvm::lookup_method(cell obj, cell methods)
return array_nth(untag<array>(methods),TAG(obj));
}
inline void factorvm::vmprim_lookup_method()
inline void factor_vm::primitive_lookup_method()
{
cell methods = dpop();
cell obj = dpop();
@ -122,10 +122,10 @@ inline void factorvm::vmprim_lookup_method()
PRIMITIVE(lookup_method)
{
PRIMITIVE_GETVM()->vmprim_lookup_method();
PRIMITIVE_GETVM()->primitive_lookup_method();
}
cell factorvm::object_class(cell obj)
cell factor_vm::object_class(cell obj)
{
switch(TAG(obj))
{
@ -138,13 +138,13 @@ cell factorvm::object_class(cell obj)
}
}
cell factorvm::method_cache_hashcode(cell klass, array *array)
cell factor_vm::method_cache_hashcode(cell klass, array *array)
{
cell capacity = (array_capacity(array) >> 1) - 1;
return ((klass >> TAG_BITS) & capacity) << 1;
}
void factorvm::update_method_cache(cell cache, cell klass, cell method)
void factor_vm::update_method_cache(cell cache, cell klass, cell method)
{
array *cache_elements = untag<array>(cache);
cell hashcode = method_cache_hashcode(klass,cache_elements);
@ -152,7 +152,7 @@ void factorvm::update_method_cache(cell cache, cell klass, cell method)
set_array_nth(cache_elements,hashcode + 1,method);
}
inline void factorvm::vmprim_mega_cache_miss()
inline void factor_vm::primitive_mega_cache_miss()
{
megamorphic_cache_misses++;
@ -171,20 +171,20 @@ inline void factorvm::vmprim_mega_cache_miss()
PRIMITIVE(mega_cache_miss)
{
PRIMITIVE_GETVM()->vmprim_mega_cache_miss();
PRIMITIVE_GETVM()->primitive_mega_cache_miss();
}
inline void factorvm::vmprim_reset_dispatch_stats()
inline void factor_vm::primitive_reset_dispatch_stats()
{
megamorphic_cache_hits = megamorphic_cache_misses = 0;
}
PRIMITIVE(reset_dispatch_stats)
{
PRIMITIVE_GETVM()->vmprim_reset_dispatch_stats();
PRIMITIVE_GETVM()->primitive_reset_dispatch_stats();
}
inline void factorvm::vmprim_dispatch_stats()
inline void factor_vm::primitive_dispatch_stats()
{
growable_array stats(this);
stats.add(allot_cell(megamorphic_cache_hits));
@ -195,33 +195,33 @@ inline void factorvm::vmprim_dispatch_stats()
PRIMITIVE(dispatch_stats)
{
PRIMITIVE_GETVM()->vmprim_dispatch_stats();
PRIMITIVE_GETVM()->primitive_dispatch_stats();
}
void quotation_jit::emit_mega_cache_lookup(cell methods_, fixnum index, cell cache_)
{
gc_root<array> methods(methods_,myvm);
gc_root<array> cache(cache_,myvm);
gc_root<array> methods(methods_,parent_vm);
gc_root<array> cache(cache_,parent_vm);
/* Generate machine code to determine the object's class. */
emit_class_lookup(index,PIC_HI_TAG_TUPLE);
/* Do a cache lookup. */
emit_with(myvm->userenv[MEGA_LOOKUP],cache.value());
emit_with(parent_vm->userenv[MEGA_LOOKUP],cache.value());
/* If we end up here, the cache missed. */
emit(myvm->userenv[JIT_PROLOG]);
emit(parent_vm->userenv[JIT_PROLOG]);
/* Push index, method table and cache on the stack. */
push(methods.value());
push(tag_fixnum(index));
push(cache.value());
word_call(myvm->userenv[MEGA_MISS_WORD]);
word_call(parent_vm->userenv[MEGA_MISS_WORD]);
/* Now the new method has been stored into the cache, and its on
the stack. */
emit(myvm->userenv[JIT_EPILOG]);
emit(myvm->userenv[JIT_EXECUTE_JUMP]);
emit(parent_vm->userenv[JIT_EPILOG]);
emit(parent_vm->userenv[JIT_EXECUTE_JUMP]);
}
}

38
vm/errors.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
void factorvm::out_of_memory()
void factor_vm::out_of_memory()
{
print_string("Out of memory\n\n");
dump_generations();
@ -17,7 +17,7 @@ void fatal_error(const char* msg, cell tagged)
exit(1);
}
void factorvm::critical_error(const char* msg, cell tagged)
void factor_vm::critical_error(const char* msg, cell tagged)
{
print_string("You have triggered a bug in Factor. Please report.\n");
print_string("critical_error: "); print_string(msg);
@ -25,7 +25,7 @@ void factorvm::critical_error(const char* msg, cell tagged)
factorbug();
}
void factorvm::throw_error(cell error, stack_frame *callstack_top)
void factor_vm::throw_error(cell error, stack_frame *callstack_top)
{
/* If the error handler is set, we rewind any C stack frames and
pass the error to user-space. */
@ -70,27 +70,25 @@ void factorvm::throw_error(cell error, stack_frame *callstack_top)
}
}
void factorvm::general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *callstack_top)
void factor_vm::general_error(vm_error_type error, cell arg1, cell arg2, stack_frame *callstack_top)
{
throw_error(allot_array_4(userenv[ERROR_ENV],
tag_fixnum(error),arg1,arg2),callstack_top);
}
void factorvm::type_error(cell type, cell tagged)
void factor_vm::type_error(cell type, cell tagged)
{
general_error(ERROR_TYPE,tag_fixnum(type),tagged,NULL);
}
void factorvm::not_implemented_error()
void factor_vm::not_implemented_error()
{
general_error(ERROR_NOT_IMPLEMENTED,F,F,NULL);
}
/* Test if 'fault' is in the guard page at the top or bottom (depending on
offset being 0 or -1) of area+area_size */
bool factorvm::in_page(cell fault, cell area, cell area_size, int offset)
bool factor_vm::in_page(cell fault, cell area, cell area_size, int offset)
{
int pagesize = getpagesize();
area += area_size;
@ -99,7 +97,7 @@ bool factorvm::in_page(cell fault, cell area, cell area_size, int offset)
return fault >= area && fault <= area + pagesize;
}
void factorvm::memory_protection_error(cell addr, stack_frame *native_stack)
void factor_vm::memory_protection_error(cell addr, stack_frame *native_stack)
{
if(in_page(addr, ds_bot, 0, -1))
general_error(ERROR_DS_UNDERFLOW,F,F,native_stack);
@ -115,43 +113,43 @@ void factorvm::memory_protection_error(cell addr, stack_frame *native_stack)
general_error(ERROR_MEMORY,allot_cell(addr),F,native_stack);
}
void factorvm::signal_error(int signal, stack_frame *native_stack)
void factor_vm::signal_error(int signal, stack_frame *native_stack)
{
general_error(ERROR_SIGNAL,tag_fixnum(signal),F,native_stack);
}
void factorvm::divide_by_zero_error()
void factor_vm::divide_by_zero_error()
{
general_error(ERROR_DIVIDE_BY_ZERO,F,F,NULL);
}
void factorvm::fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top)
void factor_vm::fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top)
{
general_error(ERROR_FP_TRAP,tag_fixnum(fpu_status),F,signal_callstack_top);
}
inline void factorvm::vmprim_call_clear()
inline void factor_vm::primitive_call_clear()
{
throw_impl(dpop(),stack_chain->callstack_bottom,this);
}
PRIMITIVE(call_clear)
{
PRIMITIVE_GETVM()->vmprim_call_clear();
PRIMITIVE_GETVM()->primitive_call_clear();
}
/* For testing purposes */
inline void factorvm::vmprim_unimplemented()
inline void factor_vm::primitive_unimplemented()
{
not_implemented_error();
}
PRIMITIVE(unimplemented)
{
PRIMITIVE_GETVM()->vmprim_unimplemented();
PRIMITIVE_GETVM()->primitive_unimplemented();
}
void factorvm::memory_signal_handler_impl()
void factor_vm::memory_signal_handler_impl()
{
memory_protection_error(signal_fault_addr,signal_callstack_top);
}
@ -161,7 +159,7 @@ void memory_signal_handler_impl()
SIGNAL_VM_PTR()->memory_signal_handler_impl();
}
void factorvm::misc_signal_handler_impl()
void factor_vm::misc_signal_handler_impl()
{
signal_error(signal_number,signal_callstack_top);
}
@ -171,7 +169,7 @@ void misc_signal_handler_impl()
SIGNAL_VM_PTR()->misc_signal_handler_impl();
}
void factorvm::fp_signal_handler_impl()
void factor_vm::fp_signal_handler_impl()
{
fp_trap_error(signal_fpu_status,signal_callstack_top);
}

32
vm/factor.cpp
View File

@ -3,14 +3,14 @@
namespace factor
{
factorvm *vm;
factor_vm *vm;
void init_globals()
{
init_platform_globals();
}
void factorvm::default_parameters(vm_parameters *p)
void factor_vm::default_parameters(vm_parameters *p)
{
p->image_path = NULL;
@ -54,7 +54,7 @@ void factorvm::default_parameters(vm_parameters *p)
p->stack_traces = true;
}
bool factorvm::factor_arg(const vm_char* str, const vm_char* arg, cell* value)
bool factor_vm::factor_arg(const vm_char* str, const vm_char* arg, cell* value)
{
int val;
if(SSCANF(str,arg,&val) > 0)
@ -66,7 +66,7 @@ bool factorvm::factor_arg(const vm_char* str, const vm_char* arg, cell* value)
return false;
}
void factorvm::init_parameters_from_args(vm_parameters *p, int argc, vm_char **argv)
void factor_vm::init_parameters_from_args(vm_parameters *p, int argc, vm_char **argv)
{
default_parameters(p);
p->executable_path = argv[0];
@ -92,7 +92,7 @@ void factorvm::init_parameters_from_args(vm_parameters *p, int argc, vm_char **a
}
/* Do some initialization that we do once only */
void factorvm::do_stage1_init()
void factor_vm::do_stage1_init()
{
print_string("*** Stage 2 early init... ");
fflush(stdout);
@ -104,7 +104,7 @@ void factorvm::do_stage1_init()
fflush(stdout);
}
void factorvm::init_factor(vm_parameters *p)
void factor_vm::init_factor(vm_parameters *p)
{
/* Kilobytes */
p->ds_size = align_page(p->ds_size << 10);
@ -161,7 +161,7 @@ void factorvm::init_factor(vm_parameters *p)
}
/* May allocate memory */
void factorvm::pass_args_to_factor(int argc, vm_char **argv)
void factor_vm::pass_args_to_factor(int argc, vm_char **argv)
{
growable_array args(this);
int i;
@ -174,7 +174,7 @@ void factorvm::pass_args_to_factor(int argc, vm_char **argv)
userenv[ARGS_ENV] = args.elements.value();
}
void factorvm::start_factor(vm_parameters *p)
void factor_vm::start_factor(vm_parameters *p)
{
if(p->fep) factorbug();
@ -183,31 +183,30 @@ void factorvm::start_factor(vm_parameters *p)
unnest_stacks();
}
char *factorvm::factor_eval_string(char *string)
char *factor_vm::factor_eval_string(char *string)
{
char *(*callback)(char *) = (char *(*)(char *))alien_offset(userenv[EVAL_CALLBACK_ENV]);
return callback(string);
}
void factorvm::factor_eval_free(char *result)
void factor_vm::factor_eval_free(char *result)
{
free(result);
}
void factorvm::factor_yield()
void factor_vm::factor_yield()
{
void (*callback)() = (void (*)())alien_offset(userenv[YIELD_CALLBACK_ENV]);
callback();
}
void factorvm::factor_sleep(long us)
void factor_vm::factor_sleep(long us)
{
void (*callback)(long) = (void (*)(long))alien_offset(userenv[SLEEP_CALLBACK_ENV]);
callback(us);
}
void factorvm::start_standalone_factor(int argc, vm_char **argv)
void factor_vm::start_standalone_factor(int argc, vm_char **argv)
{
vm_parameters p;
default_parameters(&p);
@ -224,17 +223,16 @@ struct startargs {
void* start_standalone_factor_thread(void *arg)
{
factorvm *newvm = new factorvm;
factor_vm *newvm = new factor_vm;
register_vm_with_thread(newvm);
startargs *args = (startargs*) arg;
newvm->start_standalone_factor(args->argc, args->argv);
return 0;
}
VM_C_API void start_standalone_factor(int argc, vm_char **argv)
{
factorvm *newvm = new factorvm;
factor_vm *newvm = new factor_vm;
vm = newvm;
register_vm_with_thread(newvm);
return newvm->start_standalone_factor(argc,argv);

61
vm/image.cpp
View File

@ -4,7 +4,7 @@ namespace factor
{
/* Certain special objects in the image are known to the runtime */
void factorvm::init_objects(image_header *h)
void factor_vm::init_objects(image_header *h)
{
memcpy(userenv,h->userenv,sizeof(userenv));
@ -14,9 +14,7 @@ void factorvm::init_objects(image_header *h)
bignum_neg_one = h->bignum_neg_one;
}
void factorvm::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)
{
cell good_size = h->data_size + (1 << 20);
@ -49,9 +47,7 @@ void factorvm::load_data_heap(FILE *file, image_header *h, vm_parameters *p)
data_relocation_base = h->data_relocation_base;
}
void factorvm::load_code_heap(FILE *file, image_header *h, vm_parameters *p)
void factor_vm::load_code_heap(FILE *file, image_header *h, vm_parameters *p)
{
if(h->code_size > p->code_size)
fatal_error("Code heap too small to fit image",h->code_size);
@ -76,9 +72,8 @@ void factorvm::load_code_heap(FILE *file, image_header *h, vm_parameters *p)
build_free_list(&code,h->code_size);
}
/* Save the current image to disk */
bool factorvm::save_image(const vm_char *filename)
bool factor_vm::save_image(const vm_char *filename)
{
FILE* file;
image_header h;
@ -123,8 +118,7 @@ bool factorvm::save_image(const vm_char *filename)
return ok;
}
inline void factorvm::vmprim_save_image()
inline void factor_vm::primitive_save_image()
{
/* do a full GC to push everything into tenured space */
gc();
@ -136,10 +130,10 @@ inline void factorvm::vmprim_save_image()
PRIMITIVE(save_image)
{
PRIMITIVE_GETVM()->vmprim_save_image();
PRIMITIVE_GETVM()->primitive_save_image();
}
inline void factorvm::vmprim_save_image_and_exit()
inline void factor_vm::primitive_save_image_and_exit()
{
/* We unbox this before doing anything else. This is the only point
where we might throw an error, so we have to throw an error here since
@ -167,10 +161,10 @@ inline void factorvm::vmprim_save_image_and_exit()
PRIMITIVE(save_image_and_exit)
{
PRIMITIVE_GETVM()->vmprim_save_image_and_exit();
PRIMITIVE_GETVM()->primitive_save_image_and_exit();
}
void factorvm::data_fixup(cell *cell)
void factor_vm::data_fixup(cell *cell)
{
if(immediate_p(*cell))
return;
@ -179,20 +173,19 @@ void factorvm::data_fixup(cell *cell)
*cell += (tenured->start - data_relocation_base);
}
void data_fixup(cell *cell, factorvm *myvm)
void data_fixup(cell *cell, factor_vm *myvm)
{
return myvm->data_fixup(cell);
}
template <typename TYPE> void factorvm::code_fixup(TYPE **handle)
template <typename TYPE> void factor_vm::code_fixup(TYPE **handle)
{
TYPE *ptr = *handle;
TYPE *new_ptr = (TYPE *)(((cell)ptr) + (code.seg->start - code_relocation_base));
*handle = new_ptr;
}
void factorvm::fixup_word(word *word)
void factor_vm::fixup_word(word *word)
{
if(word->code)
code_fixup(&word->code);
@ -201,8 +194,7 @@ void factorvm::fixup_word(word *word)
code_fixup(&word->xt);
}
void factorvm::fixup_quotation(quotation *quot)
void factor_vm::fixup_quotation(quotation *quot)
{
if(quot->code)
{
@ -213,32 +205,29 @@ void factorvm::fixup_quotation(quotation *quot)
quot->xt = (void *)lazy_jit_compile;
}
void factorvm::fixup_alien(alien *d)
void factor_vm::fixup_alien(alien *d)
{
d->expired = T;
}
void factorvm::fixup_stack_frame(stack_frame *frame)
void factor_vm::fixup_stack_frame(stack_frame *frame)
{
code_fixup(&frame->xt);
code_fixup(&FRAME_RETURN_ADDRESS(frame));
}
void fixup_stack_frame(stack_frame *frame, factorvm *myvm)
void fixup_stack_frame(stack_frame *frame, factor_vm *myvm)
{
return myvm->fixup_stack_frame(frame);
}
void factorvm::fixup_callstack_object(callstack *stack)
void factor_vm::fixup_callstack_object(callstack *stack)
{
iterate_callstack_object(stack,factor::fixup_stack_frame);
}
/* Initialize an object in a newly-loaded image */
void factorvm::relocate_object(object *object)
void factor_vm::relocate_object(object *object)
{
cell hi_tag = object->h.hi_tag();
@ -281,10 +270,9 @@ void factorvm::relocate_object(object *object)
}
}
/* Since the image might have been saved with a different base address than
where it is loaded, we need to fix up pointers in the image. */
void factorvm::relocate_data()
void factor_vm::relocate_data()
{
cell relocating;
@ -309,8 +297,7 @@ void factorvm::relocate_data()
}
}
void factorvm::fixup_code_block(code_block *compiled)
void factor_vm::fixup_code_block(code_block *compiled)
{
/* relocate literal table data */
data_fixup(&compiled->relocation);
@ -319,20 +306,19 @@ void factorvm::fixup_code_block(code_block *compiled)
relocate_code_block(compiled);
}
void fixup_code_block(code_block *compiled,factorvm *myvm)
void fixup_code_block(code_block *compiled, factor_vm *myvm)
{
return myvm->fixup_code_block(compiled);
}
void factorvm::relocate_code()
void factor_vm::relocate_code()
{
iterate_code_heap(factor::fixup_code_block);
}
/* Read an image file from disk, only done once during startup */
/* This function also initializes the data and code heaps */
void factorvm::load_image(vm_parameters *p)
void factor_vm::load_image(vm_parameters *p)
{
FILE *file = OPEN_READ(p->image_path);
if(file == NULL)
@ -366,5 +352,4 @@ void factorvm::load_image(vm_parameters *p)
userenv[IMAGE_ENV] = allot_alien(F,(cell)p->image_path);
}
}

52
vm/inline_cache.cpp
View File

@ -3,13 +3,12 @@
namespace factor
{
void factorvm::init_inline_caching(int max_size)
void factor_vm::init_inline_caching(int max_size)
{
max_pic_size = max_size;
}
void factorvm::deallocate_inline_cache(cell return_address)
void factor_vm::deallocate_inline_cache(cell return_address)
{
/* Find the call target. */
void *old_xt = get_call_target(return_address);
@ -30,7 +29,7 @@ void factorvm::deallocate_inline_cache(cell return_address)
/* Figure out what kind of type check the PIC needs based on the methods
it contains */
cell factorvm::determine_inline_cache_type(array *cache_entries)
cell factor_vm::determine_inline_cache_type(array *cache_entries)
{
bool seen_hi_tag = false, seen_tuple = false;
@ -67,7 +66,7 @@ cell factorvm::determine_inline_cache_type(array *cache_entries)
return 0;
}
void factorvm::update_pic_count(cell type)
void factor_vm::update_pic_count(cell type)
{
pic_counts[type - PIC_TAG]++;
}
@ -75,7 +74,7 @@ void factorvm::update_pic_count(cell type)
struct inline_cache_jit : public jit {
fixnum index;
inline_cache_jit(cell generic_word_,factorvm *vm) : jit(PIC_TYPE,generic_word_,vm) {};
inline_cache_jit(cell generic_word_,factor_vm *vm) : jit(PIC_TYPE,generic_word_,vm) {};
void emit_check(cell klass);
void compile_inline_cache(fixnum index,
@ -89,9 +88,9 @@ void inline_cache_jit::emit_check(cell klass)
{
cell code_template;
if(TAG(klass) == FIXNUM_TYPE && untag_fixnum(klass) < HEADER_TYPE)
code_template = myvm->userenv[PIC_CHECK_TAG];
code_template = parent_vm->userenv[PIC_CHECK_TAG];
else
code_template = myvm->userenv[PIC_CHECK];
code_template = parent_vm->userenv[PIC_CHECK];
emit_with(code_template,klass);
}
@ -104,12 +103,12 @@ void inline_cache_jit::compile_inline_cache(fixnum index,
cell cache_entries_,
bool tail_call_p)
{
gc_root<word> generic_word(generic_word_,myvm);
gc_root<array> methods(methods_,myvm);
gc_root<array> cache_entries(cache_entries_,myvm);
gc_root<word> generic_word(generic_word_,parent_vm);
gc_root<array> methods(methods_,parent_vm);
gc_root<array> cache_entries(cache_entries_,parent_vm);
cell inline_cache_type = myvm->determine_inline_cache_type(cache_entries.untagged());
myvm->update_pic_count(inline_cache_type);
cell inline_cache_type = parent_vm->determine_inline_cache_type(cache_entries.untagged());
parent_vm->update_pic_count(inline_cache_type);
/* Generate machine code to determine the object's class. */
emit_class_lookup(index,inline_cache_type);
@ -124,7 +123,7 @@ void inline_cache_jit::compile_inline_cache(fixnum index,
/* Yes? Jump to method */
cell method = array_nth(cache_entries.untagged(),i + 1);
emit_with(myvm->userenv[PIC_HIT],method);
emit_with(parent_vm->userenv[PIC_HIT],method);
}
/* Generate machine code to handle a cache miss, which ultimately results in
@ -136,10 +135,10 @@ void inline_cache_jit::compile_inline_cache(fixnum index,
push(methods.value());
push(tag_fixnum(index));
push(cache_entries.value());
word_special(myvm->userenv[tail_call_p ? PIC_MISS_TAIL_WORD : PIC_MISS_WORD]);
word_special(parent_vm->userenv[tail_call_p ? PIC_MISS_TAIL_WORD : PIC_MISS_WORD]);
}
code_block *factorvm::compile_inline_cache(fixnum index,cell generic_word_,cell methods_,cell cache_entries_,bool tail_call_p)
code_block *factor_vm::compile_inline_cache(fixnum index,cell generic_word_,cell methods_,cell cache_entries_,bool tail_call_p)
{
gc_root<word> generic_word(generic_word_,this);
gc_root<array> methods(methods_,this);
@ -157,18 +156,18 @@ code_block *factorvm::compile_inline_cache(fixnum index,cell generic_word_,cell
}
/* A generic word's definition performs general method lookup. Allocates memory */
void *factorvm::megamorphic_call_stub(cell generic_word)
void *factor_vm::megamorphic_call_stub(cell generic_word)
{
return untag<word>(generic_word)->xt;
}
cell factorvm::inline_cache_size(cell cache_entries)
cell factor_vm::inline_cache_size(cell cache_entries)
{
return array_capacity(untag_check<array>(cache_entries)) / 2;
}
/* Allocates memory */
cell factorvm::add_inline_cache_entry(cell cache_entries_, cell klass_, cell method_)
cell factor_vm::add_inline_cache_entry(cell cache_entries_, cell klass_, cell method_)
{
gc_root<array> cache_entries(cache_entries_,this);
gc_root<object> klass(klass_,this);
@ -181,7 +180,7 @@ cell factorvm::add_inline_cache_entry(cell cache_entries_, cell klass_, cell met
return new_cache_entries.value();
}
void factorvm::update_pic_transitions(cell pic_size)
void factor_vm::update_pic_transitions(cell pic_size)
{
if(pic_size == max_pic_size)
pic_to_mega_transitions++;
@ -193,7 +192,7 @@ void factorvm::update_pic_transitions(cell pic_size)
/* The cache_entries parameter is either f (on cold call site) or an array (on cache miss).
Called from assembly with the actual return address */
void *factorvm::inline_cache_miss(cell return_address)
void *factor_vm::inline_cache_miss(cell return_address)
{
check_code_pointer(return_address);
@ -245,14 +244,13 @@ void *factorvm::inline_cache_miss(cell return_address)
return xt;
}
VM_C_API void *inline_cache_miss(cell return_address, factorvm *myvm)
VM_C_API void *inline_cache_miss(cell return_address, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->inline_cache_miss(return_address);
}
inline void factorvm::vmprim_reset_inline_cache_stats()
inline void factor_vm::primitive_reset_inline_cache_stats()
{
cold_call_to_ic_transitions = ic_to_pic_transitions = pic_to_mega_transitions = 0;
cell i;
@ -261,10 +259,10 @@ inline void factorvm::vmprim_reset_inline_cache_stats()
PRIMITIVE(reset_inline_cache_stats)
{
PRIMITIVE_GETVM()->vmprim_reset_inline_cache_stats();
PRIMITIVE_GETVM()->primitive_reset_inline_cache_stats();
}
inline void factorvm::vmprim_inline_cache_stats()
inline void factor_vm::primitive_inline_cache_stats()
{
growable_array stats(this);
stats.add(allot_cell(cold_call_to_ic_transitions));
@ -279,7 +277,7 @@ inline void factorvm::vmprim_inline_cache_stats()
PRIMITIVE(inline_cache_stats)
{
PRIMITIVE_GETVM()->vmprim_inline_cache_stats();
PRIMITIVE_GETVM()->primitive_inline_cache_stats();
}
}

2
vm/inline_cache.hpp
View File

@ -5,6 +5,6 @@ PRIMITIVE(inline_cache_stats);
PRIMITIVE(inline_cache_miss);
PRIMITIVE(inline_cache_miss_tail);
VM_C_API void *inline_cache_miss(cell return_address, factorvm *vm);
VM_C_API void *inline_cache_miss(cell return_address, factor_vm *vm);
}

100
vm/inlineimpls.hpp
View File

@ -6,69 +6,66 @@ namespace factor
// segments.hpp
inline cell factorvm::align_page(cell a)
inline cell factor_vm::align_page(cell a)
{
return align(a,getpagesize());
}
// write_barrier.hpp
inline card *factorvm::addr_to_card(cell a)
inline card *factor_vm::addr_to_card(cell a)
{
return (card*)(((cell)(a) >> card_bits) + cards_offset);
}
inline cell factorvm::card_to_addr(card *c)
inline cell factor_vm::card_to_addr(card *c)
{
return ((cell)c - cards_offset) << card_bits;
}
inline cell factorvm::card_offset(card *c)
inline cell factor_vm::card_offset(card *c)
{
return *(c - (cell)data->cards + (cell)data->allot_markers);
}
inline card_deck *factorvm::addr_to_deck(cell a)
inline card_deck *factor_vm::addr_to_deck(cell a)
{
return (card_deck *)(((cell)a >> deck_bits) + decks_offset);
}
inline cell factorvm::deck_to_addr(card_deck *c)
inline cell factor_vm::deck_to_addr(card_deck *c)
{
return ((cell)c - decks_offset) << deck_bits;
}
inline card *factorvm::deck_to_card(card_deck *d)
inline card *factor_vm::deck_to_card(card_deck *d)
{
return (card *)((((cell)d - decks_offset) << (deck_bits - card_bits)) + cards_offset);
}
inline card *factorvm::addr_to_allot_marker(object *a)
inline card *factor_vm::addr_to_allot_marker(object *a)
{
return (card *)(((cell)a >> card_bits) + allot_markers_offset);
}
/* the write barrier must be called any time we are potentially storing a
pointer from an older generation to a younger one */
inline void factorvm::write_barrier(object *obj)
inline void factor_vm::write_barrier(object *obj)
{
*addr_to_card((cell)obj) = card_mark_mask;
*addr_to_deck((cell)obj) = card_mark_mask;
}
/* we need to remember the first object allocated in the card */
inline void factorvm::allot_barrier(object *address)
inline void factor_vm::allot_barrier(object *address)
{
card *ptr = addr_to_allot_marker(address);
if(*ptr == invalid_allot_marker)
*ptr = ((cell)address & addr_card_mask);
}
//data_gc.hpp
inline bool factorvm::collecting_accumulation_gen_p()
inline bool factor_vm::collecting_accumulation_gen_p()
{
return ((data->have_aging_p()
&& collecting_gen == data->aging()
@ -76,7 +73,7 @@ inline bool factorvm::collecting_accumulation_gen_p()
|| collecting_gen == data->tenured());
}
inline object *factorvm::allot_zone(zone *z, cell a)
inline object *factor_vm::allot_zone(zone *z, cell a)
{
cell h = z->here;
z->here = h + align8(a);
@ -89,7 +86,7 @@ inline object *factorvm::allot_zone(zone *z, cell a)
* It is up to the caller to fill in the object's fields in a meaningful
* fashion!
*/
inline object *factorvm::allot_object(header header, cell size)
inline object *factor_vm::allot_object(header header, cell size)
{
#ifdef GC_DEBUG
if(!gc_off)
@ -140,12 +137,12 @@ inline object *factorvm::allot_object(header header, cell size)
return obj;
}
template<typename TYPE> TYPE *factorvm::allot(cell size)
template<typename TYPE> TYPE *factor_vm::allot(cell size)
{
return (TYPE *)allot_object(header(TYPE::type_number),size);
}
inline void factorvm::check_data_pointer(object *pointer)
inline void factor_vm::check_data_pointer(object *pointer)
{
#ifdef FACTOR_DEBUG
if(!growing_data_heap)
@ -156,7 +153,7 @@ inline void factorvm::check_data_pointer(object *pointer)
#endif
}
inline void factorvm::check_tagged_pointer(cell tagged)
inline void factor_vm::check_tagged_pointer(cell tagged)
{
#ifdef FACTOR_DEBUG
if(!immediate_p(tagged))
@ -172,12 +169,12 @@ inline void factorvm::check_tagged_pointer(cell tagged)
template <typename TYPE>
struct gc_root : public tagged<TYPE>
{
factorvm *myvm;
factor_vm *parent_vm;
void push() { myvm->check_tagged_pointer(tagged<TYPE>::value()); myvm->gc_locals.push_back((cell)this); }
void push() { parent_vm->check_tagged_pointer(tagged<TYPE>::value()); parent_vm->gc_locals.push_back((cell)this); }
explicit gc_root(cell value_,factorvm *vm) : tagged<TYPE>(value_),myvm(vm) { push(); }
explicit gc_root(TYPE *value_, factorvm *vm) : tagged<TYPE>(value_),myvm(vm) { push(); }
explicit gc_root(cell value_,factor_vm *vm) : tagged<TYPE>(value_),parent_vm(vm) { push(); }
explicit gc_root(TYPE *value_, factor_vm *vm) : tagged<TYPE>(value_),parent_vm(vm) { push(); }
const gc_root<TYPE>& operator=(const TYPE *x) { tagged<TYPE>::operator=(x); return *this; }
const gc_root<TYPE>& operator=(const cell &x) { tagged<TYPE>::operator=(x); return *this; }
@ -186,7 +183,7 @@ struct gc_root : public tagged<TYPE>
#ifdef FACTOR_DEBUG
assert(myvm->gc_locals.back() == (cell)this);
#endif
myvm->gc_locals.pop_back();
parent_vm->gc_locals.pop_back();
}
};
@ -194,37 +191,37 @@ struct gc_root : public tagged<TYPE>
struct gc_bignum
{
bignum **addr;
factorvm *myvm;
gc_bignum(bignum **addr_, factorvm *vm) : addr(addr_), myvm(vm) {
factor_vm *parent_vm;
gc_bignum(bignum **addr_, factor_vm *vm) : addr(addr_), parent_vm(vm) {
if(*addr_)
myvm->check_data_pointer(*addr_);
myvm->gc_bignums.push_back((cell)addr);
parent_vm->check_data_pointer(*addr_);
parent_vm->gc_bignums.push_back((cell)addr);
}
~gc_bignum() {
#ifdef FACTOR_DEBUG
assert(myvm->gc_bignums.back() == (cell)addr);
#endif
myvm->gc_bignums.pop_back();
parent_vm->gc_bignums.pop_back();
}
};
#define GC_BIGNUM(x,vm) gc_bignum x##__gc_root(&x,vm)
#define GC_BIGNUM(x) gc_bignum x##__gc_root(&x,this)
//generic_arrays.hpp
template <typename TYPE> TYPE *factorvm::allot_array_internal(cell capacity)
template <typename TYPE> TYPE *factor_vm::allot_array_internal(cell capacity)
{
TYPE *array = allot<TYPE>(array_size<TYPE>(capacity));
array->capacity = tag_fixnum(capacity);
return array;
}
template <typename TYPE> bool factorvm::reallot_array_in_place_p(TYPE *array, cell capacity)
template <typename TYPE> bool factor_vm::reallot_array_in_place_p(TYPE *array, cell capacity)
{
return in_zone(&nursery,array) && capacity <= array_capacity(array);
}
template <typename TYPE> TYPE *factorvm::reallot_array(TYPE *array_, cell capacity)
template <typename TYPE> TYPE *factor_vm::reallot_array(TYPE *array_, cell capacity)
{
gc_root<TYPE> array(array_,this);
@ -250,7 +247,7 @@ template <typename TYPE> TYPE *factorvm::reallot_array(TYPE *array_, cell capaci
}
//arrays.hpp
inline void factorvm::set_array_nth(array *array, cell slot, cell value)
inline void factor_vm::set_array_nth(array *array, cell slot, cell value)
{
#ifdef FACTOR_DEBUG
assert(slot < array_capacity(array));
@ -265,7 +262,7 @@ struct growable_array {
cell count;
gc_root<array> elements;
growable_array(factorvm *myvm, cell capacity = 10) : count(0), elements(myvm->allot_array(capacity,F),myvm) {}
growable_array(factor_vm *myvm, cell capacity = 10) : count(0), elements(myvm->allot_array(capacity,F),myvm) {}
void add(cell elt);
void trim();
@ -276,7 +273,7 @@ struct growable_byte_array {
cell count;
gc_root<byte_array> elements;
growable_byte_array(factorvm *myvm,cell capacity = 40) : count(0), elements(myvm->allot_byte_array(capacity),myvm) { }
growable_byte_array(factor_vm *myvm,cell capacity = 40) : count(0), elements(myvm->allot_byte_array(capacity),myvm) { }
void append_bytes(void *elts, cell len);
void append_byte_array(cell elts);
@ -285,7 +282,7 @@ struct growable_byte_array {
};
//math.hpp
inline cell factorvm::allot_integer(fixnum x)
inline cell factor_vm::allot_integer(fixnum x)
{
if(x < fixnum_min || x > fixnum_max)
return tag<bignum>(fixnum_to_bignum(x));
@ -293,7 +290,7 @@ inline cell factorvm::allot_integer(fixnum x)
return tag_fixnum(x);
}
inline cell factorvm::allot_cell(cell x)
inline cell factor_vm::allot_cell(cell x)
{
if(x > (cell)fixnum_max)
return tag<bignum>(cell_to_bignum(x));
@ -301,39 +298,39 @@ inline cell factorvm::allot_cell(cell x)
return tag_fixnum(x);
}
inline cell factorvm::allot_float(double n)
inline cell factor_vm::allot_float(double n)
{
boxed_float *flo = allot<boxed_float>(sizeof(boxed_float));
flo->n = n;
return tag(flo);
}
inline bignum *factorvm::float_to_bignum(cell tagged)
inline bignum *factor_vm::float_to_bignum(cell tagged)
{
return double_to_bignum(untag_float(tagged));
}
inline double factorvm::bignum_to_float(cell tagged)
inline double factor_vm::bignum_to_float(cell tagged)
{
return bignum_to_double(untag<bignum>(tagged));
}
inline double factorvm::untag_float(cell tagged)
inline double factor_vm::untag_float(cell tagged)
{
return untag<boxed_float>(tagged)->n;
}
inline double factorvm::untag_float_check(cell tagged)
inline double factor_vm::untag_float_check(cell tagged)
{
return untag_check<boxed_float>(tagged)->n;
}
inline fixnum factorvm::float_to_fixnum(cell tagged)
inline fixnum factor_vm::float_to_fixnum(cell tagged)
{
return (fixnum)untag_float(tagged);
}
inline double factorvm::fixnum_to_float(cell tagged)
inline double factor_vm::fixnum_to_float(cell tagged)
{
return (double)untag_fixnum(tagged);
}
@ -341,7 +338,7 @@ inline double factorvm::fixnum_to_float(cell tagged)
//callstack.hpp
/* This is a little tricky. The iterator may allocate memory, so we
keep the callstack in a GC root and use relative offsets */
template<typename TYPE> void factorvm::iterate_callstack_object(callstack *stack_, TYPE &iterator)
template<typename TYPE> void factor_vm::iterate_callstack_object(callstack *stack_, TYPE &iterator)
{
gc_root<callstack> stack(stack_,this);
fixnum frame_offset = untag_fixnum(stack->length) - sizeof(stack_frame);
@ -355,13 +352,13 @@ template<typename TYPE> void factorvm::iterate_callstack_object(callstack *stack
}
//booleans.hpp
inline cell factorvm::tag_boolean(cell untagged)
inline cell factor_vm::tag_boolean(cell untagged)
{
return (untagged ? T : F);
}
// callstack.hpp
template<typename TYPE> void factorvm::iterate_callstack(cell top, cell bottom, TYPE &iterator)
template<typename TYPE> void factor_vm::iterate_callstack(cell top, cell bottom, TYPE &iterator)
{
stack_frame *frame = (stack_frame *)bottom - 1;
@ -372,13 +369,12 @@ template<typename TYPE> void factorvm::iterate_callstack(cell top, cell bottom,
}
}
// data_heap.hpp
/* Every object has a regular representation in the runtime, which makes GC
much simpler. Every slot of the object until binary_payload_start is a pointer
to some other object. */
struct factorvm;
inline void factorvm::do_slots(cell obj, void (* iter)(cell *,factorvm*))
struct factor_vm;
inline void factor_vm::do_slots(cell obj, void (* iter)(cell *,factor_vm*))
{
cell scan = obj;
cell payload_start = binary_payload_start((object *)obj);
@ -395,7 +391,7 @@ inline void factorvm::do_slots(cell obj, void (* iter)(cell *,factorvm*))
// code_heap.hpp
inline void factorvm::check_code_pointer(cell ptr)
inline void factor_vm::check_code_pointer(cell ptr)
{
#ifdef FACTOR_DEBUG
assert(in_code_heap_p(ptr));

38
vm/io.cpp
View File

@ -14,15 +14,14 @@ The Factor library provides platform-specific code for Unix and Windows
with many more capabilities so these words are not usually used in
normal operation. */
void factorvm::init_c_io()
void factor_vm::init_c_io()
{
userenv[STDIN_ENV] = allot_alien(F,(cell)stdin);
userenv[STDOUT_ENV] = allot_alien(F,(cell)stdout);
userenv[STDERR_ENV] = allot_alien(F,(cell)stderr);
}
void factorvm::io_error()
void factor_vm::io_error()
{
#ifndef WINCE
if(errno == EINTR)
@ -32,8 +31,7 @@ void factorvm::io_error()
general_error(ERROR_IO,tag_fixnum(errno),F,NULL);
}
inline void factorvm::vmprim_fopen()
inline void factor_vm::primitive_fopen()
{
gc_root<byte_array> mode(dpop(),this);
gc_root<byte_array> path(dpop(),this);
@ -56,10 +54,10 @@ inline void factorvm::vmprim_fopen()
PRIMITIVE(fopen)
{
PRIMITIVE_GETVM()->vmprim_fopen();
PRIMITIVE_GETVM()->primitive_fopen();
}
inline void factorvm::vmprim_fgetc()
inline void factor_vm::primitive_fgetc()
{
FILE *file = (FILE *)unbox_alien();
@ -86,10 +84,10 @@ inline void factorvm::vmprim_fgetc()
PRIMITIVE(fgetc)
{
PRIMITIVE_GETVM()->vmprim_fgetc();
PRIMITIVE_GETVM()->primitive_fgetc();
}
inline void factorvm::vmprim_fread()
inline void factor_vm::primitive_fread()
{
FILE *file = (FILE *)unbox_alien();
fixnum size = unbox_array_size();
@ -131,10 +129,10 @@ inline void factorvm::vmprim_fread()
PRIMITIVE(fread)
{
PRIMITIVE_GETVM()->vmprim_fread();
PRIMITIVE_GETVM()->primitive_fread();
}
inline void factorvm::vmprim_fputc()
inline void factor_vm::primitive_fputc()
{
FILE *file = (FILE *)unbox_alien();
fixnum ch = to_fixnum(dpop());
@ -154,10 +152,10 @@ inline void factorvm::vmprim_fputc()
PRIMITIVE(fputc)
{
PRIMITIVE_GETVM()->vmprim_fputc();
PRIMITIVE_GETVM()->primitive_fputc();
}
inline void factorvm::vmprim_fwrite()
inline void factor_vm::primitive_fwrite()
{
FILE *file = (FILE *)unbox_alien();
byte_array *text = untag_check<byte_array>(dpop());
@ -188,10 +186,10 @@ inline void factorvm::vmprim_fwrite()
PRIMITIVE(fwrite)
{
PRIMITIVE_GETVM()->vmprim_fwrite();
PRIMITIVE_GETVM()->primitive_fwrite();
}
inline void factorvm::vmprim_fseek()
inline void factor_vm::primitive_fseek()
{
int whence = to_fixnum(dpop());
FILE *file = (FILE *)unbox_alien();
@ -218,10 +216,10 @@ inline void factorvm::vmprim_fseek()
PRIMITIVE(fseek)
{
PRIMITIVE_GETVM()->vmprim_fseek();
PRIMITIVE_GETVM()->primitive_fseek();
}
inline void factorvm::vmprim_fflush()
inline void factor_vm::primitive_fflush()
{
FILE *file = (FILE *)unbox_alien();
for(;;)
@ -235,10 +233,10 @@ inline void factorvm::vmprim_fflush()
PRIMITIVE(fflush)
{
PRIMITIVE_GETVM()->vmprim_fflush();
PRIMITIVE_GETVM()->primitive_fflush();
}
inline void factorvm::vmprim_fclose()
inline void factor_vm::primitive_fclose()
{
FILE *file = (FILE *)unbox_alien();
for(;;)
@ -252,7 +250,7 @@ inline void factorvm::vmprim_fclose()
PRIMITIVE(fclose)
{
PRIMITIVE_GETVM()->vmprim_fclose();
PRIMITIVE_GETVM()->primitive_fclose();
}
/* This function is used by FFI I/O. Accessing the errno global directly is

22
vm/jit.cpp
View File

@ -10,7 +10,7 @@ namespace factor
- polymorphic inline caches (inline_cache.cpp) */
/* Allocates memory */
jit::jit(cell type_, cell owner_, factorvm *vm)
jit::jit(cell type_, cell owner_, factor_vm *vm)
: type(type_),
owner(owner_,vm),
code(vm),
@ -19,14 +19,14 @@ jit::jit(cell type_, cell owner_, factorvm *vm)
computing_offset_p(false),
position(0),
offset(0),
myvm(vm)
parent_vm(vm)
{
if(myvm->stack_traces_p()) literal(owner.value());
if(parent_vm->stack_traces_p()) literal(owner.value());
}
void jit::emit_relocation(cell code_template_)
{
gc_root<array> code_template(code_template_,myvm);
gc_root<array> code_template(code_template_,parent_vm);
cell capacity = array_capacity(code_template.untagged());
for(cell i = 1; i < capacity; i += 3)
{
@ -45,11 +45,11 @@ void jit::emit_relocation(cell code_template_)
/* Allocates memory */
void jit::emit(cell code_template_)
{
gc_root<array> code_template(code_template_,myvm);
gc_root<array> code_template(code_template_,parent_vm);
emit_relocation(code_template.value());
gc_root<byte_array> insns(array_nth(code_template.untagged(),0),myvm);
gc_root<byte_array> insns(array_nth(code_template.untagged(),0),parent_vm);
if(computing_offset_p)
{
@ -73,16 +73,16 @@ void jit::emit(cell code_template_)
}
void jit::emit_with(cell code_template_, cell argument_) {
gc_root<array> code_template(code_template_,myvm);
gc_root<object> argument(argument_,myvm);
gc_root<array> code_template(code_template_,parent_vm);
gc_root<object> argument(argument_,parent_vm);
literal(argument.value());
emit(code_template.value());
}
void jit::emit_class_lookup(fixnum index, cell type)
{
emit_with(myvm->userenv[PIC_LOAD],tag_fixnum(-index * sizeof(cell)));
emit(myvm->userenv[type]);
emit_with(parent_vm->userenv[PIC_LOAD],tag_fixnum(-index * sizeof(cell)));
emit(parent_vm->userenv[type]);
}
/* Facility to convert compiled code offsets to quotation offsets.
@ -102,7 +102,7 @@ code_block *jit::to_code_block()
relocation.trim();
literals.trim();
return myvm->add_code_block(
return parent_vm->add_code_block(
type,
code.elements.value(),
F, /* no labels */

18
vm/jit.hpp
View File

@ -10,9 +10,9 @@ struct jit {
bool computing_offset_p;
fixnum position;
cell offset;
factorvm *myvm;
factor_vm *parent_vm;
jit(cell jit_type, cell owner, factorvm *vm);
jit(cell jit_type, cell owner, factor_vm *vm);
void compute_position(cell offset);
void emit_relocation(cell code_template);
@ -22,27 +22,27 @@ struct jit {
void emit_with(cell code_template_, cell literal_);
void push(cell literal) {
emit_with(myvm->userenv[JIT_PUSH_IMMEDIATE],literal);
emit_with(parent_vm->userenv[JIT_PUSH_IMMEDIATE],literal);
}
void word_jump(cell word) {
literal(tag_fixnum(xt_tail_pic_offset));
literal(word);
emit(myvm->userenv[JIT_WORD_JUMP]);
emit(parent_vm->userenv[JIT_WORD_JUMP]);
}
void word_call(cell word) {
emit_with(myvm->userenv[JIT_WORD_CALL],word);
emit_with(parent_vm->userenv[JIT_WORD_CALL],word);
}
void word_special(cell word) {
emit_with(myvm->userenv[JIT_WORD_SPECIAL],word);
emit_with(parent_vm->userenv[JIT_WORD_SPECIAL],word);
}
void emit_subprimitive(cell word_) {
gc_root<word> word(word_,myvm);
gc_root<array> code_template(word->subprimitive,myvm);
if(array_capacity(code_template.untagged()) > 1) literal(myvm->T);
gc_root<word> word(word_,parent_vm);
gc_root<array> code_template(word->subprimitive,parent_vm);
if(array_capacity(code_template.untagged()) > 1) literal(parent_vm->T);
emit(code_template.value());
}

3
vm/mach_signal.cpp
View File

@ -28,7 +28,7 @@ http://www.wodeveloper.com/omniLists/macosx-dev/2000/June/msg00137.html */
/* Modify a suspended thread's thread_state so that when the thread resumes
executing, the call frame of the current C primitive (if any) is rewound, and
the appropriate Factor error is thrown from the top-most Factor frame. */
void factorvm::call_fault_handler(
void factor_vm::call_fault_handler(
exception_type_t exception,
exception_data_type_t code,
MACH_EXC_STATE_TYPE *exc_state,
@ -150,7 +150,6 @@ catch_exception_raise (mach_port_t exception_port,
return KERN_SUCCESS;
}
/* The main function of the thread listening for exceptions. */
static void *
mach_exception_thread (void *arg)

1
vm/mach_signal.hpp
View File

@ -38,7 +38,6 @@ Modified for Factor by Slava Pestov */
exception thread directly. */
extern "C" boolean_t exc_server (mach_msg_header_t *request_msg, mach_msg_header_t *reply_msg);
/* http://web.mit.edu/darwin/src/modules/xnu/osfmk/man/catch_exception_raise.html
These functions are defined in this file, and called by exc_server.
FIXME: What needs to be done when this code is put into a shared library? */

2
vm/master.hpp
View File

@ -79,6 +79,4 @@
#include "factor.hpp"
#include "utilities.hpp"
#endif /* __FACTOR_MASTER_H__ */

281
vm/math.cpp
View File

@ -3,29 +3,29 @@
namespace factor
{
inline void factorvm::vmprim_bignum_to_fixnum()
inline void factor_vm::primitive_bignum_to_fixnum()
{
drepl(tag_fixnum(bignum_to_fixnum(untag<bignum>(dpeek()))));
}
PRIMITIVE(bignum_to_fixnum)
{
PRIMITIVE_GETVM()->vmprim_bignum_to_fixnum();
PRIMITIVE_GETVM()->primitive_bignum_to_fixnum();
}
inline void factorvm::vmprim_float_to_fixnum()
inline void factor_vm::primitive_float_to_fixnum()
{
drepl(tag_fixnum(float_to_fixnum(dpeek())));
}
PRIMITIVE(float_to_fixnum)
{
PRIMITIVE_GETVM()->vmprim_float_to_fixnum();
PRIMITIVE_GETVM()->primitive_float_to_fixnum();
}
/* Division can only overflow when we are dividing the most negative fixnum
by -1. */
inline void factorvm::vmprim_fixnum_divint()
inline void factor_vm::primitive_fixnum_divint()
{
fixnum y = untag_fixnum(dpop()); \
fixnum x = untag_fixnum(dpeek());
@ -38,10 +38,10 @@ inline void factorvm::vmprim_fixnum_divint()
PRIMITIVE(fixnum_divint)
{
PRIMITIVE_GETVM()->vmprim_fixnum_divint();
PRIMITIVE_GETVM()->primitive_fixnum_divint();
}
inline void factorvm::vmprim_fixnum_divmod()
inline void factor_vm::primitive_fixnum_divmod()
{
cell y = ((cell *)ds)[0];
cell x = ((cell *)ds)[-1];
@ -59,32 +59,29 @@ inline void factorvm::vmprim_fixnum_divmod()
PRIMITIVE(fixnum_divmod)
{
PRIMITIVE_GETVM()->vmprim_fixnum_divmod();
PRIMITIVE_GETVM()->primitive_fixnum_divmod();
}
/*
* If we're shifting right by n bits, we won't overflow as long as none of the
* high WORD_SIZE-TAG_BITS-n bits are set.
*/
inline fixnum factorvm::sign_mask(fixnum x)
inline fixnum factor_vm::sign_mask(fixnum x)
{
return x >> (WORD_SIZE - 1);
}
inline fixnum factorvm::branchless_max(fixnum x, fixnum y)
inline fixnum factor_vm::branchless_max(fixnum x, fixnum y)
{
return (x - ((x - y) & sign_mask(x - y)));
}
inline fixnum factorvm::branchless_abs(fixnum x)
inline fixnum factor_vm::branchless_abs(fixnum x)
{
return (x ^ sign_mask(x)) - sign_mask(x);
}
inline void factorvm::vmprim_fixnum_shift()
inline void factor_vm::primitive_fixnum_shift()
{
fixnum y = untag_fixnum(dpop());
fixnum x = untag_fixnum(dpeek());
@ -113,34 +110,34 @@ inline void factorvm::vmprim_fixnum_shift()
PRIMITIVE(fixnum_shift)
{
PRIMITIVE_GETVM()->vmprim_fixnum_shift();
PRIMITIVE_GETVM()->primitive_fixnum_shift();
}
inline void factorvm::vmprim_fixnum_to_bignum()
inline void factor_vm::primitive_fixnum_to_bignum()
{
drepl(tag<bignum>(fixnum_to_bignum(untag_fixnum(dpeek()))));
}
PRIMITIVE(fixnum_to_bignum)
{
PRIMITIVE_GETVM()->vmprim_fixnum_to_bignum();
PRIMITIVE_GETVM()->primitive_fixnum_to_bignum();
}
inline void factorvm::vmprim_float_to_bignum()
inline void factor_vm::primitive_float_to_bignum()
{
drepl(tag<bignum>(float_to_bignum(dpeek())));
}
PRIMITIVE(float_to_bignum)
{
PRIMITIVE_GETVM()->vmprim_float_to_bignum();
PRIMITIVE_GETVM()->primitive_float_to_bignum();
}
#define POP_BIGNUMS(x,y) \
bignum * y = untag<bignum>(dpop()); \
bignum * x = untag<bignum>(dpop());
inline void factorvm::vmprim_bignum_eq()
inline void factor_vm::primitive_bignum_eq()
{
POP_BIGNUMS(x,y);
box_boolean(bignum_equal_p(x,y));
@ -148,10 +145,10 @@ inline void factorvm::vmprim_bignum_eq()
PRIMITIVE(bignum_eq)
{
PRIMITIVE_GETVM()->vmprim_bignum_eq();
PRIMITIVE_GETVM()->primitive_bignum_eq();
}
inline void factorvm::vmprim_bignum_add()
inline void factor_vm::primitive_bignum_add()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_add(x,y)));
@ -159,10 +156,10 @@ inline void factorvm::vmprim_bignum_add()
PRIMITIVE(bignum_add)
{
PRIMITIVE_GETVM()->vmprim_bignum_add();
PRIMITIVE_GETVM()->primitive_bignum_add();
}
inline void factorvm::vmprim_bignum_subtract()
inline void factor_vm::primitive_bignum_subtract()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_subtract(x,y)));
@ -170,10 +167,10 @@ inline void factorvm::vmprim_bignum_subtract()
PRIMITIVE(bignum_subtract)
{
PRIMITIVE_GETVM()->vmprim_bignum_subtract();
PRIMITIVE_GETVM()->primitive_bignum_subtract();
}
inline void factorvm::vmprim_bignum_multiply()
inline void factor_vm::primitive_bignum_multiply()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_multiply(x,y)));
@ -181,10 +178,10 @@ inline void factorvm::vmprim_bignum_multiply()
PRIMITIVE(bignum_multiply)
{
PRIMITIVE_GETVM()->vmprim_bignum_multiply();
PRIMITIVE_GETVM()->primitive_bignum_multiply();
}
inline void factorvm::vmprim_bignum_divint()
inline void factor_vm::primitive_bignum_divint()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_quotient(x,y)));
@ -192,10 +189,10 @@ inline void factorvm::vmprim_bignum_divint()
PRIMITIVE(bignum_divint)
{
PRIMITIVE_GETVM()->vmprim_bignum_divint();
PRIMITIVE_GETVM()->primitive_bignum_divint();
}
inline void factorvm::vmprim_bignum_divmod()
inline void factor_vm::primitive_bignum_divmod()
{
bignum *q, *r;
POP_BIGNUMS(x,y);
@ -206,10 +203,10 @@ inline void factorvm::vmprim_bignum_divmod()
PRIMITIVE(bignum_divmod)
{
PRIMITIVE_GETVM()->vmprim_bignum_divmod();
PRIMITIVE_GETVM()->primitive_bignum_divmod();
}
inline void factorvm::vmprim_bignum_mod()
inline void factor_vm::primitive_bignum_mod()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_remainder(x,y)));
@ -217,10 +214,10 @@ inline void factorvm::vmprim_bignum_mod()
PRIMITIVE(bignum_mod)
{
PRIMITIVE_GETVM()->vmprim_bignum_mod();
PRIMITIVE_GETVM()->primitive_bignum_mod();
}
inline void factorvm::vmprim_bignum_and()
inline void factor_vm::primitive_bignum_and()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_bitwise_and(x,y)));
@ -228,10 +225,10 @@ inline void factorvm::vmprim_bignum_and()
PRIMITIVE(bignum_and)
{
PRIMITIVE_GETVM()->vmprim_bignum_and();
PRIMITIVE_GETVM()->primitive_bignum_and();
}
inline void factorvm::vmprim_bignum_or()
inline void factor_vm::primitive_bignum_or()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_bitwise_ior(x,y)));
@ -239,10 +236,10 @@ inline void factorvm::vmprim_bignum_or()
PRIMITIVE(bignum_or)
{
PRIMITIVE_GETVM()->vmprim_bignum_or();
PRIMITIVE_GETVM()->primitive_bignum_or();
}
inline void factorvm::vmprim_bignum_xor()
inline void factor_vm::primitive_bignum_xor()
{
POP_BIGNUMS(x,y);
dpush(tag<bignum>(bignum_bitwise_xor(x,y)));
@ -250,10 +247,10 @@ inline void factorvm::vmprim_bignum_xor()
PRIMITIVE(bignum_xor)
{
PRIMITIVE_GETVM()->vmprim_bignum_xor();
PRIMITIVE_GETVM()->primitive_bignum_xor();
}
inline void factorvm::vmprim_bignum_shift()
inline void factor_vm::primitive_bignum_shift()
{
fixnum y = untag_fixnum(dpop());
bignum* x = untag<bignum>(dpop());
@ -262,10 +259,10 @@ inline void factorvm::vmprim_bignum_shift()
PRIMITIVE(bignum_shift)
{
PRIMITIVE_GETVM()->vmprim_bignum_shift();
PRIMITIVE_GETVM()->primitive_bignum_shift();
}
inline void factorvm::vmprim_bignum_less()
inline void factor_vm::primitive_bignum_less()
{
POP_BIGNUMS(x,y);
box_boolean(bignum_compare(x,y) == bignum_comparison_less);
@ -273,10 +270,10 @@ inline void factorvm::vmprim_bignum_less()
PRIMITIVE(bignum_less)
{
PRIMITIVE_GETVM()->vmprim_bignum_less();
PRIMITIVE_GETVM()->primitive_bignum_less();
}
inline void factorvm::vmprim_bignum_lesseq()
inline void factor_vm::primitive_bignum_lesseq()
{
POP_BIGNUMS(x,y);
box_boolean(bignum_compare(x,y) != bignum_comparison_greater);
@ -284,10 +281,10 @@ inline void factorvm::vmprim_bignum_lesseq()
PRIMITIVE(bignum_lesseq)
{
PRIMITIVE_GETVM()->vmprim_bignum_lesseq();
PRIMITIVE_GETVM()->primitive_bignum_lesseq();
}
inline void factorvm::vmprim_bignum_greater()
inline void factor_vm::primitive_bignum_greater()
{
POP_BIGNUMS(x,y);
box_boolean(bignum_compare(x,y) == bignum_comparison_greater);
@ -295,10 +292,10 @@ inline void factorvm::vmprim_bignum_greater()
PRIMITIVE(bignum_greater)
{
PRIMITIVE_GETVM()->vmprim_bignum_greater();
PRIMITIVE_GETVM()->primitive_bignum_greater();
}
inline void factorvm::vmprim_bignum_greatereq()
inline void factor_vm::primitive_bignum_greatereq()
{
POP_BIGNUMS(x,y);
box_boolean(bignum_compare(x,y) != bignum_comparison_less);
@ -306,20 +303,20 @@ inline void factorvm::vmprim_bignum_greatereq()
PRIMITIVE(bignum_greatereq)
{
PRIMITIVE_GETVM()->vmprim_bignum_greatereq();
PRIMITIVE_GETVM()->primitive_bignum_greatereq();
}
inline void factorvm::vmprim_bignum_not()
inline void factor_vm::primitive_bignum_not()
{
drepl(tag<bignum>(bignum_bitwise_not(untag<bignum>(dpeek()))));
}
PRIMITIVE(bignum_not)
{
PRIMITIVE_GETVM()->vmprim_bignum_not();
PRIMITIVE_GETVM()->primitive_bignum_not();
}
inline void factorvm::vmprim_bignum_bitp()
inline void factor_vm::primitive_bignum_bitp()
{
fixnum bit = to_fixnum(dpop());
bignum *x = untag<bignum>(dpop());
@ -328,44 +325,43 @@ inline void factorvm::vmprim_bignum_bitp()
PRIMITIVE(bignum_bitp)
{
PRIMITIVE_GETVM()->vmprim_bignum_bitp();
PRIMITIVE_GETVM()->primitive_bignum_bitp();
}
inline void factorvm::vmprim_bignum_log2()
inline void factor_vm::primitive_bignum_log2()
{
drepl(tag<bignum>(bignum_integer_length(untag<bignum>(dpeek()))));
}
PRIMITIVE(bignum_log2)
{
PRIMITIVE_GETVM()->vmprim_bignum_log2();
PRIMITIVE_GETVM()->primitive_bignum_log2();
}
unsigned int factorvm::bignum_producer(unsigned int digit)
unsigned int factor_vm::bignum_producer(unsigned int digit)
{
unsigned char *ptr = (unsigned char *)alien_offset(dpeek());
return *(ptr + digit);
}
unsigned int bignum_producer(unsigned int digit, factorvm *myvm)
unsigned int bignum_producer(unsigned int digit, factor_vm *myvm)
{
return myvm->bignum_producer(digit);
}
inline void factorvm::vmprim_byte_array_to_bignum()
inline void factor_vm::primitive_byte_array_to_bignum()
{
cell n_digits = array_capacity(untag_check<byte_array>(dpeek()));
// bignum * result = factor::digit_stream_to_bignum(n_digits,factor::bignum_producer,0x100,0);
bignum * result = digit_stream_to_bignum(n_digits,factor::bignum_producer,0x100,0);
drepl(tag<bignum>(result));
}
PRIMITIVE(byte_array_to_bignum)
{
PRIMITIVE_GETVM()->vmprim_byte_array_to_bignum();
PRIMITIVE_GETVM()->primitive_byte_array_to_bignum();
}
cell factorvm::unbox_array_size()
cell factor_vm::unbox_array_size()
{
switch(tagged<object>(dpeek()).type())
{
@ -398,28 +394,27 @@ cell factorvm::unbox_array_size()
return 0; /* can't happen */
}
inline void factorvm::vmprim_fixnum_to_float()
inline void factor_vm::primitive_fixnum_to_float()
{
drepl(allot_float(fixnum_to_float(dpeek())));
}
PRIMITIVE(fixnum_to_float)
{
PRIMITIVE_GETVM()->vmprim_fixnum_to_float();
PRIMITIVE_GETVM()->primitive_fixnum_to_float();
}
inline void factorvm::vmprim_bignum_to_float()
inline void factor_vm::primitive_bignum_to_float()
{
drepl(allot_float(bignum_to_float(dpeek())));
}
PRIMITIVE(bignum_to_float)
{
PRIMITIVE_GETVM()->vmprim_bignum_to_float();
PRIMITIVE_GETVM()->primitive_bignum_to_float();
}
inline void factorvm::vmprim_str_to_float()
inline void factor_vm::primitive_str_to_float()
{
byte_array *bytes = untag_check<byte_array>(dpeek());
cell capacity = array_capacity(bytes);
@ -435,10 +430,10 @@ inline void factorvm::vmprim_str_to_float()
PRIMITIVE(str_to_float)
{
PRIMITIVE_GETVM()->vmprim_str_to_float();
PRIMITIVE_GETVM()->primitive_str_to_float();
}
inline void factorvm::vmprim_float_to_str()
inline void factor_vm::primitive_float_to_str()
{
byte_array *array = allot_byte_array(33);
snprintf((char *)(array + 1),32,"%.16g",untag_float_check(dpop()));
@ -447,14 +442,14 @@ inline void factorvm::vmprim_float_to_str()
PRIMITIVE(float_to_str)
{
PRIMITIVE_GETVM()->vmprim_float_to_str();
PRIMITIVE_GETVM()->primitive_float_to_str();
}
#define POP_FLOATS(x,y) \
double y = untag_float(dpop()); \
double x = untag_float(dpop());
inline void factorvm::vmprim_float_eq()
inline void factor_vm::primitive_float_eq()
{
POP_FLOATS(x,y);
box_boolean(x == y);
@ -462,10 +457,10 @@ inline void factorvm::vmprim_float_eq()
PRIMITIVE(float_eq)
{
PRIMITIVE_GETVM()->vmprim_float_eq();
PRIMITIVE_GETVM()->primitive_float_eq();
}
inline void factorvm::vmprim_float_add()
inline void factor_vm::primitive_float_add()
{
POP_FLOATS(x,y);
box_double(x + y);
@ -473,10 +468,10 @@ inline void factorvm::vmprim_float_add()
PRIMITIVE(float_add)
{
PRIMITIVE_GETVM()->vmprim_float_add();
PRIMITIVE_GETVM()->primitive_float_add();
}
inline void factorvm::vmprim_float_subtract()
inline void factor_vm::primitive_float_subtract()
{
POP_FLOATS(x,y);
box_double(x - y);
@ -484,10 +479,10 @@ inline void factorvm::vmprim_float_subtract()
PRIMITIVE(float_subtract)
{
PRIMITIVE_GETVM()->vmprim_float_subtract();
PRIMITIVE_GETVM()->primitive_float_subtract();
}
inline void factorvm::vmprim_float_multiply()
inline void factor_vm::primitive_float_multiply()
{
POP_FLOATS(x,y);
box_double(x * y);
@ -495,10 +490,10 @@ inline void factorvm::vmprim_float_multiply()
PRIMITIVE(float_multiply)
{
PRIMITIVE_GETVM()->vmprim_float_multiply();
PRIMITIVE_GETVM()->primitive_float_multiply();
}
inline void factorvm::vmprim_float_divfloat()
inline void factor_vm::primitive_float_divfloat()
{
POP_FLOATS(x,y);
box_double(x / y);
@ -506,10 +501,10 @@ inline void factorvm::vmprim_float_divfloat()
PRIMITIVE(float_divfloat)
{
PRIMITIVE_GETVM()->vmprim_float_divfloat();
PRIMITIVE_GETVM()->primitive_float_divfloat();
}
inline void factorvm::vmprim_float_mod()
inline void factor_vm::primitive_float_mod()
{
POP_FLOATS(x,y);
box_double(fmod(x,y));
@ -517,10 +512,10 @@ inline void factorvm::vmprim_float_mod()
PRIMITIVE(float_mod)
{
PRIMITIVE_GETVM()->vmprim_float_mod();
PRIMITIVE_GETVM()->primitive_float_mod();
}
inline void factorvm::vmprim_float_less()
inline void factor_vm::primitive_float_less()
{
POP_FLOATS(x,y);
box_boolean(x < y);
@ -528,10 +523,10 @@ inline void factorvm::vmprim_float_less()
PRIMITIVE(float_less)
{
PRIMITIVE_GETVM()->vmprim_float_less();
PRIMITIVE_GETVM()->primitive_float_less();
}
inline void factorvm::vmprim_float_lesseq()
inline void factor_vm::primitive_float_lesseq()
{
POP_FLOATS(x,y);
box_boolean(x <= y);
@ -539,10 +534,10 @@ inline void factorvm::vmprim_float_lesseq()
PRIMITIVE(float_lesseq)
{
PRIMITIVE_GETVM()->vmprim_float_lesseq();
PRIMITIVE_GETVM()->primitive_float_lesseq();
}
inline void factorvm::vmprim_float_greater()
inline void factor_vm::primitive_float_greater()
{
POP_FLOATS(x,y);
box_boolean(x > y);
@ -550,10 +545,10 @@ inline void factorvm::vmprim_float_greater()
PRIMITIVE(float_greater)
{
PRIMITIVE_GETVM()->vmprim_float_greater();
PRIMITIVE_GETVM()->primitive_float_greater();
}
inline void factorvm::vmprim_float_greatereq()
inline void factor_vm::primitive_float_greatereq()
{
POP_FLOATS(x,y);
box_boolean(x >= y);
@ -561,50 +556,50 @@ inline void factorvm::vmprim_float_greatereq()
PRIMITIVE(float_greatereq)
{
PRIMITIVE_GETVM()->vmprim_float_greatereq();
PRIMITIVE_GETVM()->primitive_float_greatereq();
}
inline void factorvm::vmprim_float_bits()
inline void factor_vm::primitive_float_bits()
{
box_unsigned_4(float_bits(untag_float_check(dpop())));
}
PRIMITIVE(float_bits)
{
PRIMITIVE_GETVM()->vmprim_float_bits();
PRIMITIVE_GETVM()->primitive_float_bits();
}
inline void factorvm::vmprim_bits_float()
inline void factor_vm::primitive_bits_float()
{
box_float(bits_float(to_cell(dpop())));
}
PRIMITIVE(bits_float)
{
PRIMITIVE_GETVM()->vmprim_bits_float();
PRIMITIVE_GETVM()->primitive_bits_float();
}
inline void factorvm::vmprim_double_bits()
inline void factor_vm::primitive_double_bits()
{
box_unsigned_8(double_bits(untag_float_check(dpop())));
}
PRIMITIVE(double_bits)
{
PRIMITIVE_GETVM()->vmprim_double_bits();
PRIMITIVE_GETVM()->primitive_double_bits();
}
inline void factorvm::vmprim_bits_double()
inline void factor_vm::primitive_bits_double()
{
box_double(bits_double(to_unsigned_8(dpop())));
}
PRIMITIVE(bits_double)
{
PRIMITIVE_GETVM()->vmprim_bits_double();
PRIMITIVE_GETVM()->primitive_bits_double();
}
fixnum factorvm::to_fixnum(cell tagged)
fixnum factor_vm::to_fixnum(cell tagged)
{
switch(TAG(tagged))
{
@ -618,112 +613,112 @@ fixnum factorvm::to_fixnum(cell tagged)
}
}
VM_C_API fixnum to_fixnum(cell tagged,factorvm *myvm)
VM_C_API fixnum to_fixnum(cell tagged,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_fixnum(tagged);
}
cell factorvm::to_cell(cell tagged)
cell factor_vm::to_cell(cell tagged)
{
return (cell)to_fixnum(tagged);
}
VM_C_API cell to_cell(cell tagged, factorvm *myvm)
VM_C_API cell to_cell(cell tagged, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_cell(tagged);
}
void factorvm::box_signed_1(s8 n)
void factor_vm::box_signed_1(s8 n)
{
dpush(tag_fixnum(n));
}
VM_C_API void box_signed_1(s8 n,factorvm *myvm)
VM_C_API void box_signed_1(s8 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_signed_1(n);
}
void factorvm::box_unsigned_1(u8 n)
void factor_vm::box_unsigned_1(u8 n)
{
dpush(tag_fixnum(n));
}
VM_C_API void box_unsigned_1(u8 n,factorvm *myvm)
VM_C_API void box_unsigned_1(u8 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_unsigned_1(n);
}
void factorvm::box_signed_2(s16 n)
void factor_vm::box_signed_2(s16 n)
{
dpush(tag_fixnum(n));
}
VM_C_API void box_signed_2(s16 n,factorvm *myvm)
VM_C_API void box_signed_2(s16 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_signed_2(n);
}
void factorvm::box_unsigned_2(u16 n)
void factor_vm::box_unsigned_2(u16 n)
{
dpush(tag_fixnum(n));
}
VM_C_API void box_unsigned_2(u16 n,factorvm *myvm)
VM_C_API void box_unsigned_2(u16 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_unsigned_2(n);
}
void factorvm::box_signed_4(s32 n)
void factor_vm::box_signed_4(s32 n)
{
dpush(allot_integer(n));
}
VM_C_API void box_signed_4(s32 n,factorvm *myvm)
VM_C_API void box_signed_4(s32 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_signed_4(n);
}
void factorvm::box_unsigned_4(u32 n)
void factor_vm::box_unsigned_4(u32 n)
{
dpush(allot_cell(n));
}
VM_C_API void box_unsigned_4(u32 n,factorvm *myvm)
VM_C_API void box_unsigned_4(u32 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_unsigned_4(n);
}
void factorvm::box_signed_cell(fixnum integer)
void factor_vm::box_signed_cell(fixnum integer)
{
dpush(allot_integer(integer));
}
VM_C_API void box_signed_cell(fixnum integer,factorvm *myvm)
VM_C_API void box_signed_cell(fixnum integer,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_signed_cell(integer);
}
void factorvm::box_unsigned_cell(cell cell)
void factor_vm::box_unsigned_cell(cell cell)
{
dpush(allot_cell(cell));
}
VM_C_API void box_unsigned_cell(cell cell,factorvm *myvm)
VM_C_API void box_unsigned_cell(cell cell,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_unsigned_cell(cell);
}
void factorvm::box_signed_8(s64 n)
void factor_vm::box_signed_8(s64 n)
{
if(n < fixnum_min || n > fixnum_max)
dpush(tag<bignum>(long_long_to_bignum(n)));
@ -731,13 +726,13 @@ void factorvm::box_signed_8(s64 n)
dpush(tag_fixnum(n));
}
VM_C_API void box_signed_8(s64 n,factorvm *myvm)
VM_C_API void box_signed_8(s64 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_signed_8(n);
}
s64 factorvm::to_signed_8(cell obj)
s64 factor_vm::to_signed_8(cell obj)
{
switch(tagged<object>(obj).type())
{
@ -751,13 +746,13 @@ s64 factorvm::to_signed_8(cell obj)
}
}
VM_C_API s64 to_signed_8(cell obj,factorvm *myvm)
VM_C_API s64 to_signed_8(cell obj,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_signed_8(obj);
}
void factorvm::box_unsigned_8(u64 n)
void factor_vm::box_unsigned_8(u64 n)
{
if(n > (u64)fixnum_max)
dpush(tag<bignum>(ulong_long_to_bignum(n)));
@ -765,13 +760,13 @@ void factorvm::box_unsigned_8(u64 n)
dpush(tag_fixnum(n));
}
VM_C_API void box_unsigned_8(u64 n,factorvm *myvm)
VM_C_API void box_unsigned_8(u64 n,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_unsigned_8(n);
}
u64 factorvm::to_unsigned_8(cell obj)
u64 factor_vm::to_unsigned_8(cell obj)
{
switch(tagged<object>(obj).type())
{
@ -785,51 +780,51 @@ u64 factorvm::to_unsigned_8(cell obj)
}
}
VM_C_API u64 to_unsigned_8(cell obj,factorvm *myvm)
VM_C_API u64 to_unsigned_8(cell obj,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_unsigned_8(obj);
}
void factorvm::box_float(float flo)
void factor_vm::box_float(float flo)
{
dpush(allot_float(flo));
}
VM_C_API void box_float(float flo,factorvm *myvm) // not sure if this is ever called
VM_C_API void box_float(float flo, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_float(flo);
}
float factorvm::to_float(cell value)
float factor_vm::to_float(cell value)
{
return untag_float_check(value);
}
VM_C_API float to_float(cell value,factorvm *myvm)
VM_C_API float to_float(cell value,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_float(value);
}
void factorvm::box_double(double flo)
void factor_vm::box_double(double flo)
{
dpush(allot_float(flo));
}
VM_C_API void box_double(double flo,factorvm *myvm)
VM_C_API void box_double(double flo,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->box_double(flo);
}
double factorvm::to_double(cell value)
double factor_vm::to_double(cell value)
{
return untag_float_check(value);
}
VM_C_API double to_double(cell value,factorvm *myvm)
VM_C_API double to_double(cell value,factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->to_double(value);
@ -837,38 +832,38 @@ VM_C_API double to_double(cell value,factorvm *myvm)
/* The fixnum+, fixnum- and fixnum* primitives are defined in cpu_*.S. On
overflow, they call these functions. */
inline void factorvm::overflow_fixnum_add(fixnum x, fixnum y)
inline void factor_vm::overflow_fixnum_add(fixnum x, fixnum y)
{
drepl(tag<bignum>(fixnum_to_bignum(
untag_fixnum(x) + untag_fixnum(y))));
}
VM_ASM_API_OVERFLOW void overflow_fixnum_add(fixnum x, fixnum y, factorvm *myvm)
VM_ASM_API_OVERFLOW void overflow_fixnum_add(fixnum x, fixnum y, factor_vm *myvm)
{
PRIMITIVE_OVERFLOW_GETVM()->overflow_fixnum_add(x,y);
}
inline void factorvm::overflow_fixnum_subtract(fixnum x, fixnum y)
inline void factor_vm::overflow_fixnum_subtract(fixnum x, fixnum y)
{
drepl(tag<bignum>(fixnum_to_bignum(
untag_fixnum(x) - untag_fixnum(y))));
}
VM_ASM_API_OVERFLOW void overflow_fixnum_subtract(fixnum x, fixnum y, factorvm *myvm)
VM_ASM_API_OVERFLOW void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm *myvm)
{
PRIMITIVE_OVERFLOW_GETVM()->overflow_fixnum_subtract(x,y);
}
inline void factorvm::overflow_fixnum_multiply(fixnum x, fixnum y)
inline void factor_vm::overflow_fixnum_multiply(fixnum x, fixnum y)
{
bignum *bx = fixnum_to_bignum(x);
GC_BIGNUM(bx,this);
GC_BIGNUM(bx);
bignum *by = fixnum_to_bignum(y);
GC_BIGNUM(by,this);
GC_BIGNUM(by);
drepl(tag<bignum>(bignum_multiply(bx,by)));
}
VM_ASM_API_OVERFLOW void overflow_fixnum_multiply(fixnum x, fixnum y, factorvm *myvm)
VM_ASM_API_OVERFLOW void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm *myvm)
{
PRIMITIVE_OVERFLOW_GETVM()->overflow_fixnum_multiply(x,y);
}

42
vm/math.hpp
View File

@ -61,30 +61,30 @@ PRIMITIVE(bits_float);
PRIMITIVE(double_bits);
PRIMITIVE(bits_double);
VM_C_API void box_float(float flo, factorvm *vm);
VM_C_API float to_float(cell value, factorvm *vm);
VM_C_API void box_double(double flo, factorvm *vm);
VM_C_API double to_double(cell value, factorvm *vm);
VM_C_API void box_float(float flo, factor_vm *vm);
VM_C_API float to_float(cell value, factor_vm *vm);
VM_C_API void box_double(double flo, factor_vm *vm);
VM_C_API double to_double(cell value, factor_vm *vm);
VM_C_API void box_signed_1(s8 n, factorvm *vm);
VM_C_API void box_unsigned_1(u8 n, factorvm *vm);
VM_C_API void box_signed_2(s16 n, factorvm *vm);
VM_C_API void box_unsigned_2(u16 n, factorvm *vm);
VM_C_API void box_signed_4(s32 n, factorvm *vm);
VM_C_API void box_unsigned_4(u32 n, factorvm *vm);
VM_C_API void box_signed_cell(fixnum integer, factorvm *vm);
VM_C_API void box_unsigned_cell(cell cell, factorvm *vm);
VM_C_API void box_signed_8(s64 n, factorvm *vm);
VM_C_API void box_unsigned_8(u64 n, factorvm *vm);
VM_C_API void box_signed_1(s8 n, factor_vm *vm);
VM_C_API void box_unsigned_1(u8 n, factor_vm *vm);
VM_C_API void box_signed_2(s16 n, factor_vm *vm);
VM_C_API void box_unsigned_2(u16 n, factor_vm *vm);
VM_C_API void box_signed_4(s32 n, factor_vm *vm);
VM_C_API void box_unsigned_4(u32 n, factor_vm *vm);
VM_C_API void box_signed_cell(fixnum integer, factor_vm *vm);
VM_C_API void box_unsigned_cell(cell cell, factor_vm *vm);
VM_C_API void box_signed_8(s64 n, factor_vm *vm);
VM_C_API void box_unsigned_8(u64 n, factor_vm *vm);
VM_C_API s64 to_signed_8(cell obj, factorvm *vm);
VM_C_API u64 to_unsigned_8(cell obj, factorvm *vm);
VM_C_API s64 to_signed_8(cell obj, factor_vm *vm);
VM_C_API u64 to_unsigned_8(cell obj, factor_vm *vm);
VM_C_API fixnum to_fixnum(cell tagged, factorvm *vm);
VM_C_API cell to_cell(cell tagged, factorvm *vm);
VM_C_API fixnum to_fixnum(cell tagged, factor_vm *vm);
VM_C_API cell to_cell(cell tagged, factor_vm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_add(fixnum x, fixnum y, factorvm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_subtract(fixnum x, fixnum y, factorvm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_multiply(fixnum x, fixnum y, factorvm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_add(fixnum x, fixnum y, factor_vm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm *vm);
VM_ASM_API_OVERFLOW void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm *vm);
}

2
vm/os-genunix.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
void factorvm::c_to_factor_toplevel(cell quot)
void factor_vm::c_to_factor_toplevel(cell quot)
{
c_to_factor(quot,this);
}

2
vm/os-macosx.mm
View File

@ -5,7 +5,7 @@
namespace factor
{
void factorvm::c_to_factor_toplevel(cell quot)
void factor_vm::c_to_factor_toplevel(cell quot)
{
for(;;)
{

32
vm/os-unix.cpp
View File

@ -17,7 +17,6 @@ THREADHANDLE start_thread(void *(*start_routine)(void *),void *args)
return thread;
}
pthread_key_t tlsKey = 0;
void init_platform_globals()
@ -28,14 +27,14 @@ void init_platform_globals()
}
void register_vm_with_thread(factorvm *vm)
void register_vm_with_thread(factor_vm *vm)
{
pthread_setspecific(tlsKey,vm);
}
factorvm *tls_vm()
factor_vm *tls_vm()
{
return (factorvm*)pthread_getspecific(tlsKey);
return (factor_vm*)pthread_getspecific(tlsKey);
}
static void *null_dll;
@ -52,24 +51,24 @@ void sleep_micros(cell usec)
usleep(usec);
}
void factorvm::init_ffi()
void factor_vm::init_ffi()
{
/* NULL_DLL is "libfactor.dylib" for OS X and NULL for generic unix */
null_dll = dlopen(NULL_DLL,RTLD_LAZY);
}
void factorvm::ffi_dlopen(dll *dll)
void factor_vm::ffi_dlopen(dll *dll)
{
dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY);
}
void *factorvm::ffi_dlsym(dll *dll, symbol_char *symbol)
void *factor_vm::ffi_dlsym(dll *dll, symbol_char *symbol)
{
void *handle = (dll == NULL ? null_dll : dll->dll);
return dlsym(handle,symbol);
}
void factorvm::ffi_dlclose(dll *dll)
void factor_vm::ffi_dlclose(dll *dll)
{
if(dlclose(dll->dll))
general_error(ERROR_FFI,F,F,NULL);
@ -78,8 +77,7 @@ void factorvm::ffi_dlclose(dll *dll)
inline void factorvm::vmprim_existsp()
inline void factor_vm::primitive_existsp()
{
struct stat sb;
char *path = (char *)(untag_check<byte_array>(dpop()) + 1);
@ -88,10 +86,10 @@ inline void factorvm::vmprim_existsp()
PRIMITIVE(existsp)
{
PRIMITIVE_GETVM()->vmprim_existsp();
PRIMITIVE_GETVM()->primitive_existsp();
}
segment *factorvm::alloc_segment(cell size)
segment *factor_vm::alloc_segment(cell size)
{
int pagesize = getpagesize();
@ -130,7 +128,7 @@ void dealloc_segment(segment *block)
free(block);
}
stack_frame *factorvm::uap_stack_pointer(void *uap)
stack_frame *factor_vm::uap_stack_pointer(void *uap)
{
/* There is a race condition here, but in practice a signal
delivered during stack frame setup/teardown or while transitioning
@ -148,8 +146,7 @@ stack_frame *factorvm::uap_stack_pointer(void *uap)
}
void factorvm::memory_signal_handler(int signal, siginfo_t *siginfo, void *uap)
void factor_vm::memory_signal_handler(int signal, siginfo_t *siginfo, void *uap)
{
signal_fault_addr = (cell)siginfo->si_addr;
signal_callstack_top = uap_stack_pointer(uap);
@ -161,8 +158,7 @@ void memory_signal_handler(int signal, siginfo_t *siginfo, void *uap)
SIGNAL_VM_PTR()->memory_signal_handler(signal,siginfo,uap);
}
void factorvm::misc_signal_handler(int signal, siginfo_t *siginfo, void *uap)
void factor_vm::misc_signal_handler(int signal, siginfo_t *siginfo, void *uap)
{
signal_number = signal;
signal_callstack_top = uap_stack_pointer(uap);
@ -174,7 +170,7 @@ void misc_signal_handler(int signal, siginfo_t *siginfo, void *uap)
SIGNAL_VM_PTR()->misc_signal_handler(signal,siginfo,uap);
}
void factorvm::fpe_signal_handler(int signal, siginfo_t *siginfo, void *uap)
void factor_vm::fpe_signal_handler(int signal, siginfo_t *siginfo, void *uap)
{
signal_number = signal;
signal_callstack_top = uap_stack_pointer(uap);

6
vm/os-unix.hpp
View File

@ -55,8 +55,8 @@ s64 current_micros();
void sleep_micros(cell usec);
void init_platform_globals();
struct factorvm;
void register_vm_with_thread(factorvm *vm);
factorvm *tls_vm();
struct factor_vm;
void register_vm_with_thread(factor_vm *vm);
factor_vm *tls_vm();
void open_console();
}

22
vm/os-windows-nt.cpp
View File

@ -3,34 +3,29 @@
namespace factor
{
THREADHANDLE start_thread(void *(*start_routine)(void *),void *args){
return (void*) CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)start_routine, args, 0, 0);
}
DWORD dwTlsIndex;
void init_platform_globals()
{
if ((dwTlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES) {
if ((dwTlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES)
fatal_error("TlsAlloc failed - out of indexes",0);
}
}
void register_vm_with_thread(factorvm *vm)
void register_vm_with_thread(factor_vm *vm)
{
if (! TlsSetValue(dwTlsIndex, vm)) {
if (! TlsSetValue(dwTlsIndex, vm))
fatal_error("TlsSetValue failed",0);
}
}
factorvm *tls_vm()
factor_vm *tls_vm()
{
return (factorvm*)TlsGetValue(dwTlsIndex);
return (factor_vm*)TlsGetValue(dwTlsIndex);
}
s64 current_micros()
{
FILETIME t;
@ -39,7 +34,7 @@ s64 current_micros()
- EPOCH_OFFSET) / 10;
}
LONG factorvm::exception_handler(PEXCEPTION_POINTERS pe)
LONG factor_vm::exception_handler(PEXCEPTION_POINTERS pe)
{
PEXCEPTION_RECORD e = (PEXCEPTION_RECORD)pe->ExceptionRecord;
CONTEXT *c = (CONTEXT*)pe->ContextRecord;
@ -85,7 +80,6 @@ LONG factorvm::exception_handler(PEXCEPTION_POINTERS pe)
return EXCEPTION_CONTINUE_EXECUTION;
}
FACTOR_STDCALL LONG exception_handler(PEXCEPTION_POINTERS pe)
{
return SIGNAL_VM_PTR()->exception_handler(pe);
@ -93,7 +87,7 @@ FACTOR_STDCALL LONG exception_handler(PEXCEPTION_POINTERS pe)
bool handler_added = 0;
void factorvm::c_to_factor_toplevel(cell quot)
void factor_vm::c_to_factor_toplevel(cell quot)
{
if(!handler_added){
if(!AddVectoredExceptionHandler(0, (PVECTORED_EXCEPTION_HANDLER)factor::exception_handler))
@ -104,7 +98,7 @@ void factorvm::c_to_factor_toplevel(cell quot)
RemoveVectoredExceptionHandler((void *)factor::exception_handler);
}
void factorvm::open_console()
void factor_vm::open_console()
{
}

6
vm/os-windows-nt.hpp
View File

@ -31,8 +31,8 @@ typedef HANDLE THREADHANDLE;
THREADHANDLE start_thread(void *(*start_routine)(void *),void *args);
void init_platform_globals();
struct factorvm;
void register_vm_with_thread(factorvm *vm);
factorvm *tls_vm();
struct factor_vm;
void register_vm_with_thread(factor_vm *vm);
factor_vm *tls_vm();
}

30
vm/os-windows.cpp
View File

@ -5,30 +5,30 @@ namespace factor
HMODULE hFactorDll;
void factorvm::init_ffi()
void factor_vm::init_ffi()
{
hFactorDll = GetModuleHandle(FACTOR_DLL);
if(!hFactorDll)
fatal_error("GetModuleHandle(\"" FACTOR_DLL_NAME "\") failed", 0);
}
void factorvm::ffi_dlopen(dll *dll)
void factor_vm::ffi_dlopen(dll *dll)
{
dll->dll = LoadLibraryEx((WCHAR *)alien_offset(dll->path), NULL, 0);
}
void *factorvm::ffi_dlsym(dll *dll, symbol_char *symbol)
void *factor_vm::ffi_dlsym(dll *dll, symbol_char *symbol)
{
return (void *)GetProcAddress(dll ? (HMODULE)dll->dll : hFactorDll, symbol);
}
void factorvm::ffi_dlclose(dll *dll)
void factor_vm::ffi_dlclose(dll *dll)
{
FreeLibrary((HMODULE)dll->dll);
dll->dll = NULL;
}
bool factorvm::windows_stat(vm_char *path)
bool factor_vm::windows_stat(vm_char *path)
{
BY_HANDLE_FILE_INFORMATION bhfi;
HANDLE h = CreateFileW(path,
@ -56,15 +56,14 @@ bool factorvm::windows_stat(vm_char *path)
return ret;
}
void factorvm::windows_image_path(vm_char *full_path, vm_char *temp_path, unsigned int length)
void factor_vm::windows_image_path(vm_char *full_path, vm_char *temp_path, unsigned int length)
{
snwprintf(temp_path, length-1, L"%s.image", full_path);
temp_path[length - 1] = 0;
}
/* You must free() this yourself. */
const vm_char *factorvm::default_image_path()
const vm_char *factor_vm::default_image_path()
{
vm_char full_path[MAX_UNICODE_PATH];
vm_char *ptr;
@ -83,7 +82,7 @@ const vm_char *factorvm::default_image_path()
}
/* You must free() this yourself. */
const vm_char *factorvm::vm_executable_path()
const vm_char *factor_vm::vm_executable_path()
{
vm_char full_path[MAX_UNICODE_PATH];
if(!GetModuleFileName(NULL, full_path, MAX_UNICODE_PATH))
@ -91,8 +90,7 @@ const vm_char *factorvm::vm_executable_path()
return safe_strdup(full_path);
}
inline void factorvm::vmprim_existsp()
inline void factor_vm::primitive_existsp()
{
vm_char *path = untag_check<byte_array>(dpop())->data<vm_char>();
box_boolean(windows_stat(path));
@ -100,10 +98,10 @@ inline void factorvm::vmprim_existsp()
PRIMITIVE(existsp)
{
PRIMITIVE_GETVM()->vmprim_existsp();
PRIMITIVE_GETVM()->primitive_existsp();
}
segment *factorvm::alloc_segment(cell size)
segment *factor_vm::alloc_segment(cell size)
{
char *mem;
DWORD ignore;
@ -128,7 +126,7 @@ segment *factorvm::alloc_segment(cell size)
return block;
}
void factorvm::dealloc_segment(segment *block)
void factor_vm::dealloc_segment(segment *block)
{
SYSTEM_INFO si;
GetSystemInfo(&si);
@ -137,7 +135,7 @@ void factorvm::dealloc_segment(segment *block)
free(block);
}
long factorvm::getpagesize()
long factor_vm::getpagesize()
{
static long g_pagesize = 0;
if (! g_pagesize)
@ -149,7 +147,7 @@ long factorvm::getpagesize()
return g_pagesize;
}
void factorvm::sleep_micros(u64 usec)
void factor_vm::sleep_micros(u64 usec)
{
Sleep((DWORD)(usec / 1000));
}

1
vm/os-windows.hpp
View File

@ -41,7 +41,6 @@ typedef wchar_t vm_char;
/* Difference between Jan 1 00:00:00 1601 and Jan 1 00:00:00 1970 */
#define EPOCH_OFFSET 0x019db1ded53e8000LL
inline static void init_signals() {}
inline static void early_init() {}

14
vm/profiler.cpp
View File

@ -3,15 +3,13 @@
namespace factor
{
void factorvm::init_profiler()
void factor_vm::init_profiler()
{
profiling_p = false;
}
/* Allocates memory */
code_block *factorvm::compile_profiling_stub(cell word_)
code_block *factor_vm::compile_profiling_stub(cell word_)
{
gc_root<word> word(word_,this);
@ -21,9 +19,8 @@ code_block *factorvm::compile_profiling_stub(cell word_)
return jit.to_code_block();
}
/* Allocates memory */
void factorvm::set_profiling(bool profiling)
void factor_vm::set_profiling(bool profiling)
{
if(profiling == profiling_p)
return;
@ -50,15 +47,14 @@ void factorvm::set_profiling(bool profiling)
iterate_code_heap(factor::relocate_code_block);
}
inline void factorvm::vmprim_profiling()
inline void factor_vm::primitive_profiling()
{
set_profiling(to_boolean(dpop()));
}
PRIMITIVE(profiling)
{
PRIMITIVE_GETVM()->vmprim_profiling();
PRIMITIVE_GETVM()->primitive_profiling();
}
}

86
vm/quotations.cpp
View File

@ -40,7 +40,7 @@ bool quotation_jit::primitive_call_p(cell i)
{
return (i + 2) == array_capacity(elements.untagged())
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(FIXNUM_TYPE)
&& array_nth(elements.untagged(),i + 1) == myvm->userenv[JIT_PRIMITIVE_WORD];
&& array_nth(elements.untagged(),i + 1) == parent_vm->userenv[JIT_PRIMITIVE_WORD];
}
bool quotation_jit::fast_if_p(cell i)
@ -48,28 +48,28 @@ bool quotation_jit::fast_if_p(cell i)
return (i + 3) == array_capacity(elements.untagged())
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(QUOTATION_TYPE)
&& tagged<object>(array_nth(elements.untagged(),i + 1)).type_p(QUOTATION_TYPE)
&& array_nth(elements.untagged(),i + 2) == myvm->userenv[JIT_IF_WORD];
&& array_nth(elements.untagged(),i + 2) == parent_vm->userenv[JIT_IF_WORD];
}
bool quotation_jit::fast_dip_p(cell i)
{
return (i + 2) <= array_capacity(elements.untagged())
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(QUOTATION_TYPE)
&& array_nth(elements.untagged(),i + 1) == myvm->userenv[JIT_DIP_WORD];
&& array_nth(elements.untagged(),i + 1) == parent_vm->userenv[JIT_DIP_WORD];
}
bool quotation_jit::fast_2dip_p(cell i)
{
return (i + 2) <= array_capacity(elements.untagged())
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(QUOTATION_TYPE)
&& array_nth(elements.untagged(),i + 1) == myvm->userenv[JIT_2DIP_WORD];
&& array_nth(elements.untagged(),i + 1) == parent_vm->userenv[JIT_2DIP_WORD];
}
bool quotation_jit::fast_3dip_p(cell i)
{
return (i + 2) <= array_capacity(elements.untagged())
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(QUOTATION_TYPE)
&& array_nth(elements.untagged(),i + 1) == myvm->userenv[JIT_3DIP_WORD];
&& array_nth(elements.untagged(),i + 1) == parent_vm->userenv[JIT_3DIP_WORD];
}
bool quotation_jit::mega_lookup_p(cell i)
@ -78,7 +78,7 @@ bool quotation_jit::mega_lookup_p(cell i)
&& tagged<object>(array_nth(elements.untagged(),i)).type_p(ARRAY_TYPE)
&& tagged<object>(array_nth(elements.untagged(),i + 1)).type_p(FIXNUM_TYPE)
&& tagged<object>(array_nth(elements.untagged(),i + 2)).type_p(ARRAY_TYPE)
&& array_nth(elements.untagged(),i + 3) == myvm->userenv[MEGA_LOOKUP_WORD];
&& array_nth(elements.untagged(),i + 3) == parent_vm->userenv[MEGA_LOOKUP_WORD];
}
bool quotation_jit::stack_frame_p()
@ -92,7 +92,7 @@ bool quotation_jit::stack_frame_p()
switch(tagged<object>(obj).type())
{
case WORD_TYPE:
if(myvm->untag<word>(obj)->subprimitive == F)
if(parent_vm->untag<word>(obj)->subprimitive == F)
return true;
break;
case QUOTATION_TYPE:
@ -115,7 +115,7 @@ void quotation_jit::iterate_quotation()
set_position(0);
if(stack_frame)
emit(myvm->userenv[JIT_PROLOG]);
emit(parent_vm->userenv[JIT_PROLOG]);
cell i;
cell length = array_capacity(elements.untagged());
@ -125,7 +125,7 @@ void quotation_jit::iterate_quotation()
{
set_position(i);
gc_root<object> obj(array_nth(elements.untagged(),i),myvm);
gc_root<object> obj(array_nth(elements.untagged(),i),parent_vm);
switch(obj.type())
{
@ -134,23 +134,23 @@ void quotation_jit::iterate_quotation()
if(obj.as<word>()->subprimitive != F)
emit_subprimitive(obj.value());
/* The (execute) primitive is special-cased */
else if(obj.value() == myvm->userenv[JIT_EXECUTE_WORD])
else if(obj.value() == parent_vm->userenv[JIT_EXECUTE_WORD])
{
if(i == length - 1)
{
if(stack_frame) emit(myvm->userenv[JIT_EPILOG]);
if(stack_frame) emit(parent_vm->userenv[JIT_EPILOG]);
tail_call = true;
emit(myvm->userenv[JIT_EXECUTE_JUMP]);
emit(parent_vm->userenv[JIT_EXECUTE_JUMP]);
}
else
emit(myvm->userenv[JIT_EXECUTE_CALL]);
emit(parent_vm->userenv[JIT_EXECUTE_CALL]);
}
/* Everything else */
else
{
if(i == length - 1)
{
if(stack_frame) emit(myvm->userenv[JIT_EPILOG]);
if(stack_frame) emit(parent_vm->userenv[JIT_EPILOG]);
tail_call = true;
/* Inline cache misses are special-cased.
The calling convention for tail
@ -160,8 +160,8 @@ void quotation_jit::iterate_quotation()
the inline cache miss primitive, and
we don't want to clobber the saved
address. */
if(obj.value() == myvm->userenv[PIC_MISS_WORD]
|| obj.value() == myvm->userenv[PIC_MISS_TAIL_WORD])
if(obj.value() == parent_vm->userenv[PIC_MISS_WORD]
|| obj.value() == parent_vm->userenv[PIC_MISS_TAIL_WORD])
{
word_special(obj.value());
}
@ -181,7 +181,7 @@ void quotation_jit::iterate_quotation()
/* Primitive calls */
if(primitive_call_p(i))
{
emit_with(myvm->userenv[JIT_PRIMITIVE],obj.value());
emit_with(parent_vm->userenv[JIT_PRIMITIVE],obj.value());
i++;
@ -193,18 +193,18 @@ void quotation_jit::iterate_quotation()
mutually recursive in the library, but both still work) */
if(fast_if_p(i))
{
if(stack_frame) emit(myvm->userenv[JIT_EPILOG]);
if(stack_frame) emit(parent_vm->userenv[JIT_EPILOG]);
tail_call = true;
if(compiling)
{
myvm->jit_compile(array_nth(elements.untagged(),i),relocate);
myvm->jit_compile(array_nth(elements.untagged(),i + 1),relocate);
parent_vm->jit_compile(array_nth(elements.untagged(),i),relocate);
parent_vm->jit_compile(array_nth(elements.untagged(),i + 1),relocate);
}
literal(array_nth(elements.untagged(),i));
literal(array_nth(elements.untagged(),i + 1));
emit(myvm->userenv[JIT_IF]);
emit(parent_vm->userenv[JIT_IF]);
i += 2;
@ -214,8 +214,8 @@ void quotation_jit::iterate_quotation()
else if(fast_dip_p(i))
{
if(compiling)
myvm->jit_compile(obj.value(),relocate);
emit_with(myvm->userenv[JIT_DIP],obj.value());
parent_vm->jit_compile(obj.value(),relocate);
emit_with(parent_vm->userenv[JIT_DIP],obj.value());
i++;
break;
}
@ -223,8 +223,8 @@ void quotation_jit::iterate_quotation()
else if(fast_2dip_p(i))
{
if(compiling)
myvm->jit_compile(obj.value(),relocate);
emit_with(myvm->userenv[JIT_2DIP],obj.value());
parent_vm->jit_compile(obj.value(),relocate);
emit_with(parent_vm->userenv[JIT_2DIP],obj.value());
i++;
break;
}
@ -232,8 +232,8 @@ void quotation_jit::iterate_quotation()
else if(fast_3dip_p(i))
{
if(compiling)
myvm->jit_compile(obj.value(),relocate);
emit_with(myvm->userenv[JIT_3DIP],obj.value());
parent_vm->jit_compile(obj.value(),relocate);
emit_with(parent_vm->userenv[JIT_3DIP],obj.value());
i++;
break;
}
@ -260,12 +260,12 @@ void quotation_jit::iterate_quotation()
set_position(length);
if(stack_frame)
emit(myvm->userenv[JIT_EPILOG]);
emit(myvm->userenv[JIT_RETURN]);
emit(parent_vm->userenv[JIT_EPILOG]);
emit(parent_vm->userenv[JIT_RETURN]);
}
}
void factorvm::set_quot_xt(quotation *quot, code_block *code)
void factor_vm::set_quot_xt(quotation *quot, code_block *code)
{
if(code->type != QUOTATION_TYPE)
critical_error("Bad param to set_quot_xt",(cell)code);
@ -275,7 +275,7 @@ void factorvm::set_quot_xt(quotation *quot, code_block *code)
}
/* Allocates memory */
void factorvm::jit_compile(cell quot_, bool relocating)
void factor_vm::jit_compile(cell quot_, bool relocating)
{
gc_root<quotation> quot(quot_,this);
if(quot->code) return;
@ -289,18 +289,18 @@ void factorvm::jit_compile(cell quot_, bool relocating)
if(relocating) relocate_code_block(compiled);
}
inline void factorvm::vmprim_jit_compile()
inline void factor_vm::primitive_jit_compile()
{
jit_compile(dpop(),true);
}
PRIMITIVE(jit_compile)
{
PRIMITIVE_GETVM()->vmprim_jit_compile();
PRIMITIVE_GETVM()->primitive_jit_compile();
}
/* push a new quotation on the stack */
inline void factorvm::vmprim_array_to_quotation()
inline void factor_vm::primitive_array_to_quotation()
{
quotation *quot = allot<quotation>(sizeof(quotation));
quot->array = dpeek();
@ -313,10 +313,10 @@ inline void factorvm::vmprim_array_to_quotation()
PRIMITIVE(array_to_quotation)
{
PRIMITIVE_GETVM()->vmprim_array_to_quotation();
PRIMITIVE_GETVM()->primitive_array_to_quotation();
}
inline void factorvm::vmprim_quotation_xt()
inline void factor_vm::primitive_quotation_xt()
{
quotation *quot = untag_check<quotation>(dpeek());
drepl(allot_cell((cell)quot->xt));
@ -324,10 +324,10 @@ inline void factorvm::vmprim_quotation_xt()
PRIMITIVE(quotation_xt)
{
PRIMITIVE_GETVM()->vmprim_quotation_xt();
PRIMITIVE_GETVM()->primitive_quotation_xt();
}
void factorvm::compile_all_words()
void factor_vm::compile_all_words()
{
gc_root<array> words(find_all_words(),this);
@ -348,7 +348,7 @@ void factorvm::compile_all_words()
}
/* Allocates memory */
fixnum factorvm::quot_code_offset_to_scan(cell quot_, cell offset)
fixnum factor_vm::quot_code_offset_to_scan(cell quot_, cell offset)
{
gc_root<quotation> quot(quot_,this);
gc_root<array> array(quot->array,this);
@ -360,7 +360,7 @@ fixnum factorvm::quot_code_offset_to_scan(cell quot_, cell offset)
return compiler.get_position();
}
cell factorvm::lazy_jit_compile_impl(cell quot_, stack_frame *stack)
cell factor_vm::lazy_jit_compile_impl(cell quot_, stack_frame *stack)
{
gc_root<quotation> quot(quot_,this);
stack_chain->callstack_top = stack;
@ -368,13 +368,13 @@ cell factorvm::lazy_jit_compile_impl(cell quot_, stack_frame *stack)
return quot.value();
}
VM_ASM_API cell lazy_jit_compile_impl(cell quot_, stack_frame *stack, factorvm *myvm)
VM_ASM_API cell lazy_jit_compile_impl(cell quot_, stack_frame *stack, factor_vm *myvm)
{
ASSERTVM();
return VM_PTR->lazy_jit_compile_impl(quot_,stack);
}
inline void factorvm::vmprim_quot_compiled_p()
inline void factor_vm::primitive_quot_compiled_p()
{
tagged<quotation> quot(dpop());
quot.untag_check(this);
@ -383,7 +383,7 @@ inline void factorvm::vmprim_quot_compiled_p()
PRIMITIVE(quot_compiled_p)
{
PRIMITIVE_GETVM()->vmprim_quot_compiled_p();
PRIMITIVE_GETVM()->primitive_quot_compiled_p();
}
}

4
vm/quotations.hpp
View File

@ -5,7 +5,7 @@ struct quotation_jit : public jit {
gc_root<array> elements;
bool compiling, relocate;
quotation_jit(cell quot, bool compiling_, bool relocate_, factorvm *vm)
quotation_jit(cell quot, bool compiling_, bool relocate_, factor_vm *vm)
: jit(QUOTATION_TYPE,quot,vm),
elements(owner.as<quotation>().untagged()->array,vm),
compiling(compiling_),
@ -27,7 +27,7 @@ PRIMITIVE(jit_compile);
PRIMITIVE(array_to_quotation);
PRIMITIVE(quotation_xt);
VM_ASM_API cell lazy_jit_compile_impl(cell quot, stack_frame *stack, factorvm *myvm);
VM_ASM_API cell lazy_jit_compile_impl(cell quot, stack_frame *stack, factor_vm *myvm);
PRIMITIVE(quot_compiled_p);

35
vm/run.cpp
View File

@ -3,8 +3,7 @@
namespace factor
{
inline void factorvm::vmprim_getenv()
inline void factor_vm::primitive_getenv()
{
fixnum e = untag_fixnum(dpeek());
drepl(userenv[e]);
@ -12,10 +11,10 @@ inline void factorvm::vmprim_getenv()
PRIMITIVE(getenv)
{
PRIMITIVE_GETVM()->vmprim_getenv();
PRIMITIVE_GETVM()->primitive_getenv();
}
inline void factorvm::vmprim_setenv()
inline void factor_vm::primitive_setenv()
{
fixnum e = untag_fixnum(dpop());
cell value = dpop();
@ -24,40 +23,40 @@ inline void factorvm::vmprim_setenv()
PRIMITIVE(setenv)
{
PRIMITIVE_GETVM()->vmprim_setenv();
PRIMITIVE_GETVM()->primitive_setenv();
}
inline void factorvm::vmprim_exit()
inline void factor_vm::primitive_exit()
{
exit(to_fixnum(dpop()));
}
PRIMITIVE(exit)
{
PRIMITIVE_GETVM()->vmprim_exit();
PRIMITIVE_GETVM()->primitive_exit();
}
inline void factorvm::vmprim_micros()
inline void factor_vm::primitive_micros()
{
box_unsigned_8(current_micros());
}
PRIMITIVE(micros)
{
PRIMITIVE_GETVM()->vmprim_micros();
PRIMITIVE_GETVM()->primitive_micros();
}
inline void factorvm::vmprim_sleep()
inline void factor_vm::primitive_sleep()
{
sleep_micros(to_cell(dpop()));
}
PRIMITIVE(sleep)
{
PRIMITIVE_GETVM()->vmprim_sleep();
PRIMITIVE_GETVM()->primitive_sleep();
}
inline void factorvm::vmprim_set_slot()
inline void factor_vm::primitive_set_slot()
{
fixnum slot = untag_fixnum(dpop());
object *obj = untag<object>(dpop());
@ -69,10 +68,10 @@ inline void factorvm::vmprim_set_slot()
PRIMITIVE(set_slot)
{
PRIMITIVE_GETVM()->vmprim_set_slot();
PRIMITIVE_GETVM()->primitive_set_slot();
}
inline void factorvm::vmprim_load_locals()
inline void factor_vm::primitive_load_locals()
{
fixnum count = untag_fixnum(dpop());
memcpy((cell *)(rs + sizeof(cell)),(cell *)(ds - sizeof(cell) * (count - 1)),sizeof(cell) * count);
@ -82,10 +81,10 @@ inline void factorvm::vmprim_load_locals()
PRIMITIVE(load_locals)
{
PRIMITIVE_GETVM()->vmprim_load_locals();
PRIMITIVE_GETVM()->primitive_load_locals();
}
cell factorvm::clone_object(cell obj_)
cell factor_vm::clone_object(cell obj_)
{
gc_root<object> obj(obj_,this);
@ -100,14 +99,14 @@ cell factorvm::clone_object(cell obj_)
}
}
inline void factorvm::vmprim_clone()
inline void factor_vm::primitive_clone()
{
drepl(clone_object(dpeek()));
}
PRIMITIVE(clone)
{
PRIMITIVE_GETVM()->vmprim_clone();
PRIMITIVE_GETVM()->primitive_clone();
}
}

47
vm/strings.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
cell factorvm::string_nth(string* str, cell index)
cell factor_vm::string_nth(string* str, cell index)
{
/* If high bit is set, the most significant 16 bits of the char
come from the aux vector. The least significant bit of the
@ -22,14 +22,12 @@ cell factorvm::string_nth(string* str, cell index)
}
}
void factorvm::set_string_nth_fast(string *str, cell index, cell ch)
void factor_vm::set_string_nth_fast(string *str, cell index, cell ch)
{
str->data()[index] = ch;
}
void factorvm::set_string_nth_slow(string *str_, cell index, cell ch)
void factor_vm::set_string_nth_slow(string *str_, cell index, cell ch)
{
gc_root<string> str(str_,this);
@ -56,9 +54,8 @@ void factorvm::set_string_nth_slow(string *str_, cell index, cell ch)
aux->data<u16>()[index] = ((ch >> 7) ^ 1);
}
/* allocates memory */
void factorvm::set_string_nth(string *str, cell index, cell ch)
void factor_vm::set_string_nth(string *str, cell index, cell ch)
{
if(ch <= 0x7f)
set_string_nth_fast(str,index,ch);
@ -66,9 +63,8 @@ void factorvm::set_string_nth(string *str, cell index, cell ch)
set_string_nth_slow(str,index,ch);
}
/* Allocates memory */
string *factorvm::allot_string_internal(cell capacity)
string *factor_vm::allot_string_internal(cell capacity)
{
string *str = allot<string>(string_size(capacity));
@ -79,9 +75,8 @@ string *factorvm::allot_string_internal(cell capacity)
return str;
}
/* Allocates memory */
void factorvm::fill_string(string *str_, cell start, cell capacity, cell fill)
void factor_vm::fill_string(string *str_, cell start, cell capacity, cell fill)
{
gc_root<string> str(str_,this);
@ -96,17 +91,15 @@ void factorvm::fill_string(string *str_, cell start, cell capacity, cell fill)
}
}
/* Allocates memory */
string *factorvm::allot_string(cell capacity, cell fill)
string *factor_vm::allot_string(cell capacity, cell fill)
{
gc_root<string> str(allot_string_internal(capacity),this);
fill_string(str.untagged(),0,capacity,fill);
return str.untagged();
}
inline void factorvm::vmprim_string()
inline void factor_vm::primitive_string()
{
cell initial = to_cell(dpop());
cell length = unbox_array_size();
@ -115,18 +108,17 @@ inline void factorvm::vmprim_string()
PRIMITIVE(string)
{
PRIMITIVE_GETVM()->vmprim_string();
PRIMITIVE_GETVM()->primitive_string();
}
bool factorvm::reallot_string_in_place_p(string *str, cell capacity)
bool factor_vm::reallot_string_in_place_p(string *str, cell capacity)
{
return in_zone(&nursery,str)
&& (str->aux == F || in_zone(&nursery,untag<byte_array>(str->aux)))
&& capacity <= string_capacity(str);
}
string* factorvm::reallot_string(string *str_, cell capacity)
string* factor_vm::reallot_string(string *str_, cell capacity)
{
gc_root<string> str(str_,this);
@ -168,8 +160,7 @@ string* factorvm::reallot_string(string *str_, cell capacity)
}
}
inline void factorvm::vmprim_resize_string()
inline void factor_vm::primitive_resize_string()
{
string* str = untag_check<string>(dpop());
cell capacity = unbox_array_size();
@ -178,10 +169,10 @@ inline void factorvm::vmprim_resize_string()
PRIMITIVE(resize_string)
{
PRIMITIVE_GETVM()->vmprim_resize_string();
PRIMITIVE_GETVM()->primitive_resize_string();
}
inline void factorvm::vmprim_string_nth()
inline void factor_vm::primitive_string_nth()
{
string *str = untag<string>(dpop());
cell index = untag_fixnum(dpop());
@ -190,10 +181,10 @@ inline void factorvm::vmprim_string_nth()
PRIMITIVE(string_nth)
{
PRIMITIVE_GETVM()->vmprim_string_nth();
PRIMITIVE_GETVM()->primitive_string_nth();
}
inline void factorvm::vmprim_set_string_nth_fast()
inline void factor_vm::primitive_set_string_nth_fast()
{
string *str = untag<string>(dpop());
cell index = untag_fixnum(dpop());
@ -203,10 +194,10 @@ inline void factorvm::vmprim_set_string_nth_fast()
PRIMITIVE(set_string_nth_fast)
{
PRIMITIVE_GETVM()->vmprim_set_string_nth_fast();
PRIMITIVE_GETVM()->primitive_set_string_nth_fast();
}
inline void factorvm::vmprim_set_string_nth_slow()
inline void factor_vm::primitive_set_string_nth_slow()
{
string *str = untag<string>(dpop());
cell index = untag_fixnum(dpop());
@ -216,7 +207,7 @@ inline void factorvm::vmprim_set_string_nth_slow()
PRIMITIVE(set_string_nth_slow)
{
PRIMITIVE_GETVM()->vmprim_set_string_nth_slow();
PRIMITIVE_GETVM()->primitive_set_string_nth_slow();
}
}

6
vm/tagged.hpp
View File

@ -29,7 +29,7 @@ struct tagged
bool type_p(cell type_) const { return type() == type_; }
TYPE *untag_check(factorvm *myvm) const {
TYPE *untag_check(factor_vm *myvm) const {
if(TYPE::type_number != TYPE_COUNT && !type_p(TYPE::type_number))
myvm->type_error(TYPE::type_number,value_);
return untagged();
@ -59,12 +59,12 @@ struct tagged
template<typename X> tagged<X> as() { return tagged<X>(value_); }
};
template <typename TYPE> TYPE *factorvm::untag_check(cell value)
template <typename TYPE> TYPE *factor_vm::untag_check(cell value)
{
return tagged<TYPE>(value).untag_check(this);
}
template <typename TYPE> TYPE *factorvm::untag(cell value)
template <typename TYPE> TYPE *factor_vm::untag(cell value)
{
return tagged<TYPE>(value).untagged();
}

10
vm/tuples.cpp
View File

@ -4,7 +4,7 @@ namespace factor
{
/* push a new tuple on the stack */
tuple *factorvm::allot_tuple(cell layout_)
tuple *factor_vm::allot_tuple(cell layout_)
{
gc_root<tuple_layout> layout(layout_,this);
gc_root<tuple> t(allot<tuple>(tuple_size(layout.untagged())),this);
@ -12,7 +12,7 @@ tuple *factorvm::allot_tuple(cell layout_)
return t.untagged();
}
inline void factorvm::vmprim_tuple()
inline void factor_vm::primitive_tuple()
{
gc_root<tuple_layout> layout(dpop(),this);
tuple *t = allot_tuple(layout.value());
@ -25,11 +25,11 @@ inline void factorvm::vmprim_tuple()
PRIMITIVE(tuple)
{
PRIMITIVE_GETVM()->vmprim_tuple();
PRIMITIVE_GETVM()->primitive_tuple();
}
/* push a new tuple on the stack, filling its slots from the stack */
inline void factorvm::vmprim_tuple_boa()
inline void factor_vm::primitive_tuple_boa()
{
gc_root<tuple_layout> layout(dpop(),this);
gc_root<tuple> t(allot_tuple(layout.value()),this);
@ -41,7 +41,7 @@ inline void factorvm::vmprim_tuple_boa()
PRIMITIVE(tuple_boa)
{
PRIMITIVE_GETVM()->vmprim_tuple_boa();
PRIMITIVE_GETVM()->primitive_tuple_boa();
}
}

2
vm/utilities.cpp
View File

@ -18,7 +18,6 @@ vm_char *safe_strdup(const vm_char *str)
return ptr;
}
/* We don't use printf directly, because format directives are not portable.
Instead we define the common cases here. */
void nl()
@ -31,7 +30,6 @@ void print_string(const char *str)
fputs(str,stdout);
}
void print_cell(cell x)
{
printf(CELL_FORMAT,x);

4
vm/vm-data.hpp
View File

@ -1,7 +1,7 @@
namespace factor
{
struct factorvmdata {
struct factor_vm_data {
// if you change this struct, also change vm.factor k--------
context *stack_chain;
zone nursery; /* new objects are allocated here */
@ -101,7 +101,7 @@ struct factorvmdata {
cell pic_to_mega_transitions;
cell pic_counts[4]; /* PIC_TAG, PIC_HI_TAG, PIC_TUPLE, PIC_HI_TAG_TUPLE */
factorvmdata()
factor_vm_data()
: profiling_p(false),
secure_gc(false),
gc_off(false),

264
vm/vm.hpp
View File

@ -3,7 +3,7 @@
namespace factor
{
struct factorvm : factorvmdata {
struct factor_vm : factor_vm_data {
// segments
inline cell align_page(cell a);
@ -20,28 +20,28 @@ struct factorvm : factorvmdata {
void init_stacks(cell ds_size_, cell rs_size_);
bool stack_to_array(cell bottom, cell top);
cell array_to_stack(array *array, cell bottom);
inline void vmprim_datastack();
inline void vmprim_retainstack();
inline void vmprim_set_datastack();
inline void vmprim_set_retainstack();
inline void vmprim_check_datastack();
inline void primitive_datastack();
inline void primitive_retainstack();
inline void primitive_set_datastack();
inline void primitive_set_retainstack();
inline void primitive_check_datastack();
// run
inline void vmprim_getenv();
inline void vmprim_setenv();
inline void vmprim_exit();
inline void vmprim_micros();
inline void vmprim_sleep();
inline void vmprim_set_slot();
inline void vmprim_load_locals();
inline void primitive_getenv();
inline void primitive_setenv();
inline void primitive_exit();
inline void primitive_micros();
inline void primitive_sleep();
inline void primitive_set_slot();
inline void primitive_load_locals();
cell clone_object(cell obj_);
inline void vmprim_clone();
inline void primitive_clone();
// profiler
void init_profiler();
code_block *compile_profiling_stub(cell word_);
void set_profiling(bool profiling);
inline void vmprim_profiling();
inline void primitive_profiling();
// errors
void out_of_memory();
@ -53,8 +53,8 @@ struct factorvm : factorvmdata {
void signal_error(int signal, stack_frame *native_stack);
void divide_by_zero_error();
void fp_trap_error(unsigned int fpu_status, stack_frame *signal_callstack_top);
inline void vmprim_call_clear();
inline void vmprim_unimplemented();
inline void primitive_call_clear();
inline void primitive_unimplemented();
void memory_signal_handler_impl();
void misc_signal_handler_impl();
void fp_signal_handler_impl();
@ -124,7 +124,7 @@ struct factorvm : factorvmdata {
bignum *bignum_integer_length(bignum * x);
int bignum_logbitp(int shift, bignum * arg);
int bignum_unsigned_logbitp(int shift, bignum * bignum);
bignum *digit_stream_to_bignum(unsigned int n_digits, unsigned int (*producer)(unsigned int, factorvm *), unsigned int radix, int negative_p);
bignum *digit_stream_to_bignum(unsigned int n_digits, unsigned int (*producer)(unsigned int, factor_vm *), unsigned int radix, int negative_p);
//data_heap
cell init_zone(zone *z, cell size, cell start);
@ -141,15 +141,15 @@ struct factorvm : factorvmdata {
void init_data_heap(cell gens,cell young_size,cell aging_size,cell tenured_size,bool secure_gc_);
cell untagged_object_size(object *pointer);
cell unaligned_object_size(object *pointer);
inline void vmprim_size();
inline void primitive_size();
cell binary_payload_start(object *pointer);
inline void vmprim_data_room();
inline void primitive_data_room();
void begin_scan();
void end_scan();
inline void vmprim_begin_scan();
inline void primitive_begin_scan();
cell next_object();
inline void vmprim_next_object();
inline void vmprim_end_scan();
inline void primitive_next_object();
inline void primitive_end_scan();
template<typename T> void each_object(T &functor);
cell find_all_words();
cell object_size(cell tagged);
@ -166,7 +166,6 @@ struct factorvm : factorvmdata {
inline void write_barrier(object *obj);
inline void allot_barrier(object *address);
//data_gc
void init_data_gc();
object *copy_untagged_object_impl(object *pointer, cell size);
@ -192,10 +191,10 @@ struct factorvm : factorvmdata {
void end_gc(cell gc_elapsed);
void garbage_collection(cell gen,bool growing_data_heap_,cell requested_bytes);
void gc();
inline void vmprim_gc();
inline void vmprim_gc_stats();
inline void primitive_gc();
inline void primitive_gc_stats();
void clear_gc_stats();
inline void vmprim_become();
inline void primitive_become();
void inline_gc(cell *gc_roots_base, cell gc_roots_size);
inline bool collecting_accumulation_gen_p();
inline object *allot_zone(zone *z, cell a);
@ -203,7 +202,7 @@ struct factorvm : factorvmdata {
template <typename TYPE> TYPE *allot(cell size);
inline void check_data_pointer(object *pointer);
inline void check_tagged_pointer(cell tagged);
inline void vmprim_clear_gc_stats();
inline void primitive_clear_gc_stats();
// generic arrays
template <typename T> T *allot_array_internal(cell capacity);
@ -232,15 +231,15 @@ struct factorvm : factorvmdata {
void find_data_references(cell look_for_);
void dump_code_heap();
void factorbug();
inline void vmprim_die();
inline void primitive_die();
//arrays
array *allot_array(cell capacity, cell fill_);
inline void vmprim_array();
inline void primitive_array();
cell allot_array_1(cell obj_);
cell allot_array_2(cell v1_, cell v2_);
cell allot_array_4(cell v1_, cell v2_, cell v3_, cell v4_);
inline void vmprim_resize_array();
inline void primitive_resize_array();
inline void set_array_nth(array *array, cell slot, cell value);
//strings
@ -251,13 +250,13 @@ struct factorvm : factorvmdata {
string *allot_string_internal(cell capacity);
void fill_string(string *str_, cell start, cell capacity, cell fill);
string *allot_string(cell capacity, cell fill);
inline void vmprim_string();
inline void primitive_string();
bool reallot_string_in_place_p(string *str, cell capacity);
string* reallot_string(string *str_, cell capacity);
inline void vmprim_resize_string();
inline void vmprim_string_nth();
inline void vmprim_set_string_nth_fast();
inline void vmprim_set_string_nth_slow();
inline void primitive_resize_string();
inline void primitive_string_nth();
inline void primitive_set_string_nth_fast();
inline void primitive_set_string_nth_slow();
//booleans
void box_boolean(bool value);
@ -266,28 +265,28 @@ struct factorvm : factorvmdata {
//byte arrays
byte_array *allot_byte_array(cell size);
inline void vmprim_byte_array();
inline void vmprim_uninitialized_byte_array();
inline void vmprim_resize_byte_array();
inline void primitive_byte_array();
inline void primitive_uninitialized_byte_array();
inline void primitive_resize_byte_array();
//tuples
tuple *allot_tuple(cell layout_);
inline void vmprim_tuple();
inline void vmprim_tuple_boa();
inline void primitive_tuple();
inline void primitive_tuple_boa();
//words
word *allot_word(cell vocab_, cell name_);
inline void vmprim_word();
inline void vmprim_word_xt();
inline void primitive_word();
inline void primitive_word_xt();
void update_word_xt(cell w_);
inline void vmprim_optimized_p();
inline void vmprim_wrapper();
inline void primitive_optimized_p();
inline void primitive_wrapper();
//math
inline void vmprim_bignum_to_fixnum();
inline void vmprim_float_to_fixnum();
inline void vmprim_fixnum_divint();
inline void vmprim_fixnum_divmod();
inline void primitive_bignum_to_fixnum();
inline void primitive_float_to_fixnum();
inline void primitive_fixnum_divint();
inline void primitive_fixnum_divmod();
bignum *fixnum_to_bignum(fixnum);
bignum *cell_to_bignum(cell);
bignum *long_long_to_bignum(s64 n);
@ -295,48 +294,48 @@ struct factorvm : factorvmdata {
inline fixnum sign_mask(fixnum x);
inline fixnum branchless_max(fixnum x, fixnum y);
inline fixnum branchless_abs(fixnum x);
inline void vmprim_fixnum_shift();
inline void vmprim_fixnum_to_bignum();
inline void vmprim_float_to_bignum();
inline void vmprim_bignum_eq();
inline void vmprim_bignum_add();
inline void vmprim_bignum_subtract();
inline void vmprim_bignum_multiply();
inline void vmprim_bignum_divint();
inline void vmprim_bignum_divmod();
inline void vmprim_bignum_mod();
inline void vmprim_bignum_and();
inline void vmprim_bignum_or();
inline void vmprim_bignum_xor();
inline void vmprim_bignum_shift();
inline void vmprim_bignum_less();
inline void vmprim_bignum_lesseq();
inline void vmprim_bignum_greater();
inline void vmprim_bignum_greatereq();
inline void vmprim_bignum_not();
inline void vmprim_bignum_bitp();
inline void vmprim_bignum_log2();
inline void primitive_fixnum_shift();
inline void primitive_fixnum_to_bignum();
inline void primitive_float_to_bignum();
inline void primitive_bignum_eq();
inline void primitive_bignum_add();
inline void primitive_bignum_subtract();
inline void primitive_bignum_multiply();
inline void primitive_bignum_divint();
inline void primitive_bignum_divmod();
inline void primitive_bignum_mod();
inline void primitive_bignum_and();
inline void primitive_bignum_or();
inline void primitive_bignum_xor();
inline void primitive_bignum_shift();
inline void primitive_bignum_less();
inline void primitive_bignum_lesseq();
inline void primitive_bignum_greater();
inline void primitive_bignum_greatereq();
inline void primitive_bignum_not();
inline void primitive_bignum_bitp();
inline void primitive_bignum_log2();
unsigned int bignum_producer(unsigned int digit);
inline void vmprim_byte_array_to_bignum();
inline void primitive_byte_array_to_bignum();
cell unbox_array_size();
inline void vmprim_fixnum_to_float();
inline void vmprim_bignum_to_float();
inline void vmprim_str_to_float();
inline void vmprim_float_to_str();
inline void vmprim_float_eq();
inline void vmprim_float_add();
inline void vmprim_float_subtract();
inline void vmprim_float_multiply();
inline void vmprim_float_divfloat();
inline void vmprim_float_mod();
inline void vmprim_float_less();
inline void vmprim_float_lesseq();
inline void vmprim_float_greater();
inline void vmprim_float_greatereq();
inline void vmprim_float_bits();
inline void vmprim_bits_float();
inline void vmprim_double_bits();
inline void vmprim_bits_double();
inline void primitive_fixnum_to_float();
inline void primitive_bignum_to_float();
inline void primitive_str_to_float();
inline void primitive_float_to_str();
inline void primitive_float_eq();
inline void primitive_float_add();
inline void primitive_float_subtract();
inline void primitive_float_multiply();
inline void primitive_float_divfloat();
inline void primitive_float_mod();
inline void primitive_float_less();
inline void primitive_float_lesseq();
inline void primitive_float_greater();
inline void primitive_float_greatereq();
inline void primitive_float_bits();
inline void primitive_bits_float();
inline void primitive_double_bits();
inline void primitive_bits_double();
fixnum to_fixnum(cell tagged);
cell to_cell(cell tagged);
void box_signed_1(s8 n);
@ -373,14 +372,14 @@ struct factorvm : factorvmdata {
//io
void init_c_io();
void io_error();
inline void vmprim_fopen();
inline void vmprim_fgetc();
inline void vmprim_fread();
inline void vmprim_fputc();
inline void vmprim_fwrite();
inline void vmprim_fseek();
inline void vmprim_fflush();
inline void vmprim_fclose();
inline void primitive_fopen();
inline void primitive_fgetc();
inline void primitive_fread();
inline void primitive_fputc();
inline void primitive_fwrite();
inline void primitive_fseek();
inline void primitive_fflush();
inline void primitive_fclose();
//code_gc
void clear_free_list(heap *heap);
@ -445,8 +444,8 @@ struct factorvm : factorvmdata {
void iterate_code_heap(code_heap_iterator iter);
void copy_code_heap_roots();
void update_code_heap_words();
inline void vmprim_modify_code_heap();
inline void vmprim_code_room();
inline void primitive_modify_code_heap();
inline void primitive_code_room();
code_block *forward_xt(code_block *compiled);
void forward_frame_xt(stack_frame *frame);
void forward_object_xts();
@ -454,14 +453,13 @@ struct factorvm : factorvmdata {
void compact_code_heap();
inline void check_code_pointer(cell ptr);
//image
void init_objects(image_header *h);
void load_data_heap(FILE *file, image_header *h, vm_parameters *p);
void load_code_heap(FILE *file, image_header *h, vm_parameters *p);
bool save_image(const vm_char *filename);
inline void vmprim_save_image();
inline void vmprim_save_image_and_exit();
inline void primitive_save_image();
inline void primitive_save_image_and_exit();
void data_fixup(cell *cell);
template <typename T> void code_fixup(T **handle);
void fixup_word(word *word);
@ -481,35 +479,34 @@ struct factorvm : factorvmdata {
callstack *allot_callstack(cell size);
stack_frame *fix_callstack_top(stack_frame *top, stack_frame *bottom);
stack_frame *capture_start();
inline void vmprim_callstack();
inline void vmprim_set_callstack();
inline void primitive_callstack();
inline void primitive_set_callstack();
code_block *frame_code(stack_frame *frame);
cell frame_type(stack_frame *frame);
cell frame_executing(stack_frame *frame);
stack_frame *frame_successor(stack_frame *frame);
cell frame_scan(stack_frame *frame);
inline void vmprim_callstack_to_array();
inline void primitive_callstack_to_array();
stack_frame *innermost_stack_frame(callstack *stack);
stack_frame *innermost_stack_frame_quot(callstack *callstack);
inline void vmprim_innermost_stack_frame_executing();
inline void vmprim_innermost_stack_frame_scan();
inline void vmprim_set_innermost_stack_frame_quot();
inline void primitive_innermost_stack_frame_executing();
inline void primitive_innermost_stack_frame_scan();
inline void primitive_set_innermost_stack_frame_quot();
void save_callstack_bottom(stack_frame *callstack_bottom);
template<typename T> void iterate_callstack(cell top, cell bottom, T &iterator);
inline void do_slots(cell obj, void (* iter)(cell *,factorvm*));
inline void do_slots(cell obj, void (* iter)(cell *,factor_vm*));
//alien
char *pinned_alien_offset(cell obj);
cell allot_alien(cell delegate_, cell displacement);
inline void vmprim_displaced_alien();
inline void vmprim_alien_address();
inline void primitive_displaced_alien();
inline void primitive_alien_address();
void *alien_pointer();
inline void vmprim_dlopen();
inline void vmprim_dlsym();
inline void vmprim_dlclose();
inline void vmprim_dll_validp();
inline void vmprim_vm_ptr();
inline void primitive_dlopen();
inline void primitive_dlsym();
inline void primitive_dlclose();
inline void primitive_dll_validp();
inline void primitive_vm_ptr();
char *alien_offset(cell obj);
char *unbox_alien();
void box_alien(void *ptr);
@ -519,15 +516,15 @@ struct factorvm : factorvmdata {
void box_medium_struct(cell x1, cell x2, cell x3, cell x4, cell size);
//quotations
inline void vmprim_jit_compile();
inline void vmprim_array_to_quotation();
inline void vmprim_quotation_xt();
inline void primitive_jit_compile();
inline void primitive_array_to_quotation();
inline void primitive_quotation_xt();
void set_quot_xt(quotation *quot, code_block *code);
void jit_compile(cell quot_, bool relocating);
void compile_all_words();
fixnum quot_code_offset_to_scan(cell quot_, cell offset);
cell lazy_jit_compile_impl(cell quot_, stack_frame *stack);
inline void vmprim_quot_compiled_p();
inline void primitive_quot_compiled_p();
//dispatch
cell search_lookup_alist(cell table, cell klass);
@ -538,13 +535,13 @@ struct factorvm : factorvmdata {
cell lookup_hi_tag_method(cell obj, cell methods);
cell lookup_hairy_method(cell obj, cell methods);
cell lookup_method(cell obj, cell methods);
inline void vmprim_lookup_method();
inline void primitive_lookup_method();
cell object_class(cell obj);
cell method_cache_hashcode(cell klass, array *array);
void update_method_cache(cell cache, cell klass, cell method);
inline void vmprim_mega_cache_miss();
inline void vmprim_reset_dispatch_stats();
inline void vmprim_dispatch_stats();
inline void primitive_mega_cache_miss();
inline void primitive_reset_dispatch_stats();
inline void primitive_dispatch_stats();
//inline cache
void init_inline_caching(int max_size);
@ -557,8 +554,8 @@ struct factorvm : factorvmdata {
cell add_inline_cache_entry(cell cache_entries_, cell klass_, cell method_);
void update_pic_transitions(cell pic_size);
void *inline_cache_miss(cell return_address);
inline void vmprim_reset_inline_cache_stats();
inline void vmprim_inline_cache_stats();
inline void primitive_reset_inline_cache_stats();
inline void primitive_inline_cache_stats();
//factor
void default_parameters(vm_parameters *p);
@ -576,7 +573,7 @@ struct factorvm : factorvmdata {
void factor_sleep(long us);
// os-*
inline void vmprim_existsp();
inline void primitive_existsp();
void init_ffi();
void ffi_dlopen(dll *dll);
void *ffi_dlsym(dll *dll, symbol_char *symbol);
@ -614,14 +611,13 @@ struct factorvm : factorvmdata {
void print_vm_data();
};
#ifndef FACTOR_REENTRANT
#define FACTOR_SINGLE_THREADED_SINGLETON
#endif
#ifdef FACTOR_SINGLE_THREADED_SINGLETON
/* calls are dispatched using the singleton vm ptr */
extern factorvm *vm;
extern factor_vm *vm;
#define PRIMITIVE_GETVM() vm
#define PRIMITIVE_OVERFLOW_GETVM() vm
#define VM_PTR vm
@ -631,9 +627,9 @@ struct factorvm : factorvmdata {
#ifdef FACTOR_SINGLE_THREADED_TESTING
/* calls are dispatched as per multithreaded, but checked against singleton */
extern factorvm *vm;
extern factor_vm *vm;
#define ASSERTVM() assert(vm==myvm)
#define PRIMITIVE_GETVM() ((factorvm*)myvm)
#define PRIMITIVE_GETVM() ((factor_vm*)myvm)
#define PRIMITIVE_OVERFLOW_GETVM() ASSERTVM(); myvm
#define VM_PTR myvm
#define SIGNAL_VM_PTR() tls_vm()
@ -649,8 +645,8 @@ struct factorvm : factorvmdata {
#endif
#ifdef FACTOR_REENTRANT
#define PRIMITIVE_GETVM() ((factorvm*)myvm)
#define PRIMITIVE_OVERFLOW_GETVM() ((factorvm*)myvm)
#define PRIMITIVE_GETVM() ((factor_vm*)myvm)
#define PRIMITIVE_OVERFLOW_GETVM() ((factor_vm*)myvm)
#define VM_PTR myvm
#define ASSERTVM()
#define SIGNAL_VM_PTR() tls_vm()

20
vm/words.cpp
View File

@ -3,7 +3,7 @@
namespace factor
{
word *factorvm::allot_word(cell vocab_, cell name_)
word *factor_vm::allot_word(cell vocab_, cell name_)
{
gc_root<object> vocab(vocab_,this);
gc_root<object> name(name_,this);
@ -32,7 +32,7 @@ word *factorvm::allot_word(cell vocab_, cell name_)
}
/* <word> ( name vocabulary -- word ) */
inline void factorvm::vmprim_word()
inline void factor_vm::primitive_word()
{
cell vocab = dpop();
cell name = dpop();
@ -41,11 +41,11 @@ inline void factorvm::vmprim_word()
PRIMITIVE(word)
{
PRIMITIVE_GETVM()->vmprim_word();
PRIMITIVE_GETVM()->primitive_word();
}
/* word-xt ( word -- start end ) */
inline void factorvm::vmprim_word_xt()
inline void factor_vm::primitive_word_xt()
{
word *w = untag_check<word>(dpop());
code_block *code = (profiling_p ? w->profiling : w->code);
@ -55,11 +55,11 @@ inline void factorvm::vmprim_word_xt()
PRIMITIVE(word_xt)
{
PRIMITIVE_GETVM()->vmprim_word_xt();
PRIMITIVE_GETVM()->primitive_word_xt();
}
/* Allocates memory */
void factorvm::update_word_xt(cell w_)
void factor_vm::update_word_xt(cell w_)
{
gc_root<word> w(w_,this);
@ -80,17 +80,17 @@ void factorvm::update_word_xt(cell w_)
w->xt = w->code->xt();
}
inline void factorvm::vmprim_optimized_p()
inline void factor_vm::primitive_optimized_p()
{
drepl(tag_boolean(word_optimized_p(untag_check<word>(dpeek()))));
}
PRIMITIVE(optimized_p)
{
PRIMITIVE_GETVM()->vmprim_optimized_p();
PRIMITIVE_GETVM()->primitive_optimized_p();
}
inline void factorvm::vmprim_wrapper()
inline void factor_vm::primitive_wrapper()
{
wrapper *new_wrapper = allot<wrapper>(sizeof(wrapper));
new_wrapper->object = dpeek();
@ -99,7 +99,7 @@ inline void factorvm::vmprim_wrapper()
PRIMITIVE(wrapper)
{
PRIMITIVE_GETVM()->vmprim_wrapper();
PRIMITIVE_GETVM()->primitive_wrapper();
}
}

1
vm/write_barrier.cpp
View File

@ -2,4 +2,3 @@
using namespace factor;

1
vm/write_barrier.hpp
View File

@ -19,7 +19,6 @@ static const cell card_bits = 8;
static const cell card_size = (1<<card_bits);
static const cell addr_card_mask = (card_size-1);
typedef u8 card_deck;
static const cell deck_bits = (card_bits + 10);