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

VM: Refactor factor.cpp/hpp to Factor style

db4
Erik Charlebois 2013-05-11 21:59:58 -04:00
parent e9c0476f15
commit d92617dda7
2 changed files with 170 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

337
vm/factor.cpp
View File

@ -1,238 +1,235 @@
#include "master.hpp" #include "master.hpp"
namespace factor namespace factor {
{
void init_globals() void init_globals() { init_mvm(); }
{
init_mvm();
}
void factor_vm::default_parameters(vm_parameters *p) void factor_vm::default_parameters(vm_parameters* p) {
{ p->embedded_image = false;
p->embedded_image = false; p->image_path = NULL;
p->image_path = NULL;
p->datastack_size = 32 * sizeof(cell); p->datastack_size = 32 * sizeof(cell);
p->retainstack_size = 32 * sizeof(cell); p->retainstack_size = 32 * sizeof(cell);
#if defined(FACTOR_PPC) #if defined(FACTOR_PPC)
p->callstack_size = 256 * sizeof(cell); p->callstack_size = 256 * sizeof(cell);
#else #else
p->callstack_size = 128 * sizeof(cell); p->callstack_size = 128 * sizeof(cell);
#endif #endif
p->code_size = 64; p->code_size = 64;
p->young_size = sizeof(cell) / 4; p->young_size = sizeof(cell) / 4;
p->aging_size = sizeof(cell) / 2; p->aging_size = sizeof(cell) / 2;
p->tenured_size = 24 * sizeof(cell); p->tenured_size = 24 * sizeof(cell);
p->max_pic_size = 3; p->max_pic_size = 3;
p->fep = false; p->fep = false;
p->signals = true; p->signals = true;
#ifdef WINDOWS #ifdef WINDOWS
p->console = GetConsoleWindow() != NULL; p->console = GetConsoleWindow() != NULL;
#else #else
p->console = true; p->console = true;
#endif #endif
p->callback_size = 256; p->callback_size = 256;
} }
bool factor_vm::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; int val;
if(SSCANF(str,arg,&val) > 0) if (SSCANF(str, arg, &val) > 0) {
{ *value = val;
*value = val; return true;
return true; } else
} return false;
else
return false;
} }
void factor_vm::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); default_parameters(p);
p->executable_path = argv[0]; p->executable_path = argv[0];
int i = 0; int i = 0;
for(i = 1; i < argc; i++) for (i = 1; i < argc; i++) {
{ vm_char* arg = argv[i];
vm_char *arg = argv[i]; if (STRCMP(arg, STRING_LITERAL("--")) == 0)
if(STRCMP(arg,STRING_LITERAL("--")) == 0) break; break;
else if(factor_arg(arg,STRING_LITERAL("-datastack=%d"),&p->datastack_size)); else if (factor_arg(arg, STRING_LITERAL("-datastack=%d"),
else if(factor_arg(arg,STRING_LITERAL("-retainstack=%d"),&p->retainstack_size)); &p->datastack_size))
else if(factor_arg(arg,STRING_LITERAL("-callstack=%d"),&p->callstack_size)); ;
else if(factor_arg(arg,STRING_LITERAL("-young=%d"),&p->young_size)); else if (factor_arg(arg, STRING_LITERAL("-retainstack=%d"),
else if(factor_arg(arg,STRING_LITERAL("-aging=%d"),&p->aging_size)); &p->retainstack_size))
else if(factor_arg(arg,STRING_LITERAL("-tenured=%d"),&p->tenured_size)); ;
else if(factor_arg(arg,STRING_LITERAL("-codeheap=%d"),&p->code_size)); else if (factor_arg(arg, STRING_LITERAL("-callstack=%d"),
else if(factor_arg(arg,STRING_LITERAL("-pic=%d"),&p->max_pic_size)); &p->callstack_size))
else if(factor_arg(arg,STRING_LITERAL("-callbacks=%d"),&p->callback_size)); ;
else if(STRCMP(arg,STRING_LITERAL("-fep")) == 0) p->fep = true; else if (factor_arg(arg, STRING_LITERAL("-young=%d"), &p->young_size))
else if(STRCMP(arg,STRING_LITERAL("-nosignals")) == 0) p->signals = false; ;
else if(STRNCMP(arg,STRING_LITERAL("-i="),3) == 0) p->image_path = arg + 3; else if (factor_arg(arg, STRING_LITERAL("-aging=%d"), &p->aging_size))
else if(STRCMP(arg,STRING_LITERAL("-console")) == 0) p->console = true; ;
} else if (factor_arg(arg, STRING_LITERAL("-tenured=%d"), &p->tenured_size))
;
else if (factor_arg(arg, STRING_LITERAL("-codeheap=%d"), &p->code_size))
;
else if (factor_arg(arg, STRING_LITERAL("-pic=%d"), &p->max_pic_size))
;
else if (factor_arg(arg, STRING_LITERAL("-callbacks=%d"),
&p->callback_size))
;
else if (STRCMP(arg, STRING_LITERAL("-fep")) == 0)
p->fep = true;
else if (STRCMP(arg, STRING_LITERAL("-nosignals")) == 0)
p->signals = false;
else if (STRNCMP(arg, STRING_LITERAL("-i="), 3) == 0)
p->image_path = arg + 3;
else if (STRCMP(arg, STRING_LITERAL("-console")) == 0)
p->console = true;
}
} }
/* Compile code in boot image so that we can execute the startup quotation */ /* Compile code in boot image so that we can execute the startup quotation */
/* Allocates memory */ /* Allocates memory */
void factor_vm::prepare_boot_image() void factor_vm::prepare_boot_image() {
{ std::cout << "*** Stage 2 early init... " << std::flush;
std::cout << "*** Stage 2 early init... " << std::flush;
compile_all_words(); compile_all_words();
update_code_heap_words(true); update_code_heap_words(true);
initialize_all_quotations(); initialize_all_quotations();
special_objects[OBJ_STAGE2] = true_object; special_objects[OBJ_STAGE2] = true_object;
std::cout << "done" << std::endl; std::cout << "done" << std::endl;
} }
void factor_vm::init_factor(vm_parameters *p) void factor_vm::init_factor(vm_parameters* p) {
{ /* Kilobytes */
/* Kilobytes */ p->datastack_size = align_page(p->datastack_size << 10);
p->datastack_size = align_page(p->datastack_size << 10); p->retainstack_size = align_page(p->retainstack_size << 10);
p->retainstack_size = align_page(p->retainstack_size << 10); p->callstack_size = align_page(p->callstack_size << 10);
p->callstack_size = align_page(p->callstack_size << 10); p->callback_size = align_page(p->callback_size << 10);
p->callback_size = align_page(p->callback_size << 10);
/* Megabytes */ /* Megabytes */
p->young_size <<= 20; p->young_size <<= 20;
p->aging_size <<= 20; p->aging_size <<= 20;
p->tenured_size <<= 20; p->tenured_size <<= 20;
p->code_size <<= 20; p->code_size <<= 20;
/* Disable GC during init as a sanity check */ /* Disable GC during init as a sanity check */
gc_off = true; gc_off = true;
/* OS-specific initialization */ /* OS-specific initialization */
early_init(); early_init();
const vm_char *executable_path = vm_executable_path(); const vm_char* executable_path = vm_executable_path();
if(executable_path) if (executable_path)
p->executable_path = executable_path; p->executable_path = executable_path;
if(p->image_path == NULL) if (p->image_path == NULL) {
{ if (embedded_image_p()) {
if (embedded_image_p()) p->embedded_image = true;
{ p->image_path = p->executable_path;
p->embedded_image = true; } else
p->image_path = p->executable_path; p->image_path = default_image_path();
} }
else
p->image_path = default_image_path();
}
srand((unsigned int)nano_count()); srand((unsigned int) nano_count());
init_ffi(); init_ffi();
init_contexts(p->datastack_size,p->retainstack_size,p->callstack_size); init_contexts(p->datastack_size, p->retainstack_size, p->callstack_size);
init_callbacks(p->callback_size); init_callbacks(p->callback_size);
load_image(p); load_image(p);
init_c_io(); init_c_io();
init_inline_caching((int)p->max_pic_size); init_inline_caching((int) p->max_pic_size);
special_objects[OBJ_CPU] = allot_alien(false_object,(cell)FACTOR_CPU_STRING); special_objects[OBJ_CPU] =
special_objects[OBJ_OS] = allot_alien(false_object,(cell)FACTOR_OS_STRING); allot_alien(false_object, (cell) FACTOR_CPU_STRING);
special_objects[OBJ_CELL_SIZE] = tag_fixnum(sizeof(cell)); special_objects[OBJ_OS] = allot_alien(false_object, (cell) FACTOR_OS_STRING);
special_objects[OBJ_EXECUTABLE] = allot_alien(false_object,(cell)p->executable_path); special_objects[OBJ_CELL_SIZE] = tag_fixnum(sizeof(cell));
special_objects[OBJ_ARGS] = false_object; special_objects[OBJ_EXECUTABLE] =
special_objects[OBJ_EMBEDDED] = false_object; allot_alien(false_object, (cell) p->executable_path);
special_objects[OBJ_VM_COMPILER] = allot_alien(false_object,(cell)FACTOR_COMPILER_VERSION); special_objects[OBJ_ARGS] = false_object;
special_objects[OBJ_EMBEDDED] = false_object;
special_objects[OBJ_VM_COMPILER] =
allot_alien(false_object, (cell) FACTOR_COMPILER_VERSION);
/* We can GC now */ /* We can GC now */
gc_off = false; gc_off = false;
if(!to_boolean(special_objects[OBJ_STAGE2])) if (!to_boolean(special_objects[OBJ_STAGE2]))
prepare_boot_image(); prepare_boot_image();
if(p->signals) if (p->signals)
init_signals(); init_signals();
if(p->console) if (p->console)
open_console(); open_console();
} }
/* May allocate memory */ /* May allocate memory */
void factor_vm::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);
growable_array args(this);
for(fixnum i = 1; i < argc; i++) for (fixnum i = 1; i < argc; i++)
args.add(allot_alien(false_object,(cell)argv[i])); args.add(allot_alien(false_object, (cell) argv[i]));
args.trim(); args.trim();
special_objects[OBJ_ARGS] = args.elements.value(); special_objects[OBJ_ARGS] = args.elements.value();
} }
void factor_vm::start_factor(vm_parameters *p) void factor_vm::start_factor(vm_parameters* p) {
{ if (p->fep)
if(p->fep) factorbug(); factorbug();
c_to_factor_toplevel(special_objects[OBJ_STARTUP_QUOT]); c_to_factor_toplevel(special_objects[OBJ_STARTUP_QUOT]);
} }
void factor_vm::stop_factor() void factor_vm::stop_factor() {
{ c_to_factor_toplevel(special_objects[OBJ_SHUTDOWN_QUOT]);
c_to_factor_toplevel(special_objects[OBJ_SHUTDOWN_QUOT]);
} }
char *factor_vm::factor_eval_string(char *string) char* factor_vm::factor_eval_string(char* string) {
{ void* func = alien_offset(special_objects[OBJ_EVAL_CALLBACK]);
void *func = alien_offset(special_objects[OBJ_EVAL_CALLBACK]); CODE_TO_FUNCTION_POINTER(func);
CODE_TO_FUNCTION_POINTER(func); return ((char * (*)(char*)) func)(string);
return ((char *(*)(char *))func)(string);
} }
void factor_vm::factor_eval_free(char *result) void factor_vm::factor_eval_free(char* result) { free(result); }
{
free(result); void factor_vm::factor_yield() {
void* func = alien_offset(special_objects[OBJ_YIELD_CALLBACK]);
CODE_TO_FUNCTION_POINTER(func);
((void(*)()) func)();
} }
void factor_vm::factor_yield() void factor_vm::factor_sleep(long us) {
{ void* func = alien_offset(special_objects[OBJ_SLEEP_CALLBACK]);
void *func = alien_offset(special_objects[OBJ_YIELD_CALLBACK]); CODE_TO_FUNCTION_POINTER(func);
CODE_TO_FUNCTION_POINTER(func); ((void(*)(long)) func)(us);
((void (*)())func)();
} }
void factor_vm::factor_sleep(long us) void factor_vm::start_standalone_factor(int argc, vm_char** argv) {
{ vm_parameters p;
void *func = alien_offset(special_objects[OBJ_SLEEP_CALLBACK]); default_parameters(&p);
CODE_TO_FUNCTION_POINTER(func); init_parameters_from_args(&p, argc, argv);
((void (*)(long))func)(us); init_factor(&p);
pass_args_to_factor(argc, argv);
start_factor(&p);
} }
void factor_vm::start_standalone_factor(int argc, vm_char **argv) factor_vm* new_factor_vm() {
{ THREADHANDLE thread = thread_id();
vm_parameters p; factor_vm* newvm = new factor_vm(thread);
default_parameters(&p); register_vm_with_thread(newvm);
init_parameters_from_args(&p,argc,argv); thread_vms[thread] = newvm;
init_factor(&p);
pass_args_to_factor(argc,argv); return newvm;
start_factor(&p);
} }
factor_vm *new_factor_vm() VM_C_API void start_standalone_factor(int argc, vm_char** argv) {
{ factor_vm* newvm = new_factor_vm();
THREADHANDLE thread = thread_id(); return newvm->start_standalone_factor(argc, argv);
factor_vm *newvm = new factor_vm(thread);
register_vm_with_thread(newvm);
thread_vms[thread] = newvm;
return newvm;
}
VM_C_API void start_standalone_factor(int argc, vm_char **argv)
{
factor_vm *newvm = new_factor_vm();
return newvm->start_standalone_factor(argc,argv);
} }
} }

7
vm/factor.hpp
View File

@ -1,8 +1,7 @@
namespace factor namespace factor {
{
VM_C_API void init_globals(); VM_C_API void init_globals();
factor_vm *new_factor_vm(); factor_vm* new_factor_vm();
VM_C_API void start_standalone_factor(int argc, vm_char **argv); VM_C_API void start_standalone_factor(int argc, vm_char** argv);
} }