]> gitweb.factorcode.org Git - factor.git/blobdiff - vm/factor.cpp
audio.engine.test: cleanup using
[factor.git] / vm / factor.cpp
index 3052335882ce4b84abb17634317e74c08a8e4b5c..4d364384c87a844c3c2400e60d0015eebb3090d5 100644 (file)
@@ -2,96 +2,8 @@
 
 namespace factor {
 
-void init_globals() { init_mvm(); }
-
-void factor_vm::default_parameters(vm_parameters* p) {
-  p->embedded_image = false;
-  p->image_path = NULL;
-
-  p->datastack_size = 32 * sizeof(cell);
-  p->retainstack_size = 32 * sizeof(cell);
-
-#if defined(FACTOR_PPC)
-  p->callstack_size = 256 * sizeof(cell);
-#else
-  p->callstack_size = 128 * sizeof(cell);
-#endif
-
-  p->code_size = 64;
-  p->young_size = sizeof(cell) / 4;
-  p->aging_size = sizeof(cell) / 2;
-  p->tenured_size = 24 * sizeof(cell);
-
-  p->max_pic_size = 3;
-
-  p->fep = false;
-  p->signals = true;
-
-#ifdef WINDOWS
-  p->console = GetConsoleWindow() != NULL;
-#else
-  p->console = true;
-#endif
-
-  p->callback_size = 256;
-}
-
-bool factor_vm::factor_arg(const vm_char* str, const vm_char* arg,
-                           cell* value) {
-  int val;
-  if (SSCANF(str, arg, &val) > 0) {
-    *value = val;
-    return true;
-  }
-  return false;
-}
-
-void factor_vm::init_parameters_from_args(vm_parameters* p, int argc,
-                                          vm_char** argv) {
-  default_parameters(p);
-  p->executable_path = argv[0];
-
-  int i = 0;
-
-  for (i = 1; i < argc; i++) {
-    vm_char* arg = argv[i];
-    if (STRCMP(arg, STRING_LITERAL("--")) == 0)
-      break;
-    else if (factor_arg(arg, STRING_LITERAL("-datastack=%d"),
-                        &p->datastack_size))
-      ;
-    else if (factor_arg(arg, STRING_LITERAL("-retainstack=%d"),
-                        &p->retainstack_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("-aging=%d"), &p->aging_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("-pic=%d"), &p->max_pic_size))
-      ;
-    else if (factor_arg(arg, STRING_LITERAL("-callbacks=%d"),
-                        &p->callback_size))
-      ;
-    else if (STRNCMP(arg, STRING_LITERAL("-i="), 3) == 0)
-      p->image_path = arg + 3;
-    else if (STRCMP(arg, STRING_LITERAL("-fep")) == 0)
-      p->fep = true;
-    else if (STRCMP(arg, STRING_LITERAL("-nosignals")) == 0)
-      p->signals = false;
-    else if (STRCMP(arg, STRING_LITERAL("-console")) == 0)
-      p->console = true;
-  }
-}
-
-/* Compile code in boot image so that we can execute the startup quotation */
-/* Allocates memory */
+// Compile code in boot image so that we can execute the startup quotation
+// Allocates memory
 void factor_vm::prepare_boot_image() {
   std::cout << "*** Stage 2 early init... " << std::flush;
 
@@ -124,51 +36,58 @@ void factor_vm::prepare_boot_image() {
 }
 
 void factor_vm::init_factor(vm_parameters* p) {
-  /* Kilobytes */
+  // Kilobytes
   p->datastack_size = align_page(p->datastack_size << 10);
   p->retainstack_size = align_page(p->retainstack_size << 10);
   p->callstack_size = align_page(p->callstack_size << 10);
   p->callback_size = align_page(p->callback_size << 10);
 
-  /* Megabytes */
+  // Megabytes
   p->young_size <<= 20;
   p->aging_size <<= 20;
   p->tenured_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;
 
-  /* OS-specific initialization */
+  // OS-specific initialization
   early_init();
 
-  const vm_char* executable_path = vm_executable_path();
-
-  if (executable_path)
-    p->executable_path = executable_path;
+  p->executable_path = vm_executable_path();
 
   if (p->image_path == NULL) {
     if (embedded_image_p()) {
       p->embedded_image = true;
-      p->image_path = p->executable_path;
+      p->image_path = safe_strdup(p->executable_path);
     } else
       p->image_path = default_image_path();
   }
 
   srand((unsigned int)nano_count());
   init_ffi();
-  init_contexts(p->datastack_size, p->retainstack_size, p->callstack_size);
+
+  datastack_size = p->datastack_size;
+  retainstack_size = p->retainstack_size;
+  callstack_size = p->callstack_size;
+
+  ctx = NULL;
+  spare_ctx = new_context();
+
   callbacks = new callback_heap(p->callback_size, this);
   load_image(p);
-  init_c_io();
-  init_inline_caching((int)p->max_pic_size);
+  max_pic_size = (int)p->max_pic_size;
   special_objects[OBJ_CELL_SIZE] = tag_fixnum(sizeof(cell));
   special_objects[OBJ_ARGS] = false_object;
   special_objects[OBJ_EMBEDDED] = false_object;
 
   cell aliens[][2] = {
+    {OBJ_STDIN,           (cell)stdin},
+    {OBJ_STDOUT,          (cell)stdout},
+    {OBJ_STDERR,          (cell)stderr},
     {OBJ_CPU,             (cell)FACTOR_CPU_STRING},
-    {OBJ_EXECUTABLE,      (cell)p->executable_path},
+    {OBJ_EXECUTABLE,      (cell)safe_strdup(p->executable_path)},
+    {OBJ_IMAGE,           (cell)safe_strdup(p->image_path)},
     {OBJ_OS,              (cell)FACTOR_OS_STRING},
     {OBJ_VM_COMPILE_TIME, (cell)FACTOR_COMPILE_TIME},
     {OBJ_VM_COMPILER,     (cell)FACTOR_COMPILER_VERSION},
@@ -184,7 +103,7 @@ void factor_vm::init_factor(vm_parameters* p) {
     special_objects[idx] = allot_alien(false_object, aliens[n][1]);
   }
 
-  /* We can GC now */
+  // We can GC now
   gc_off = false;
 
   if (!to_boolean(special_objects[OBJ_STAGE2]))
@@ -198,7 +117,7 @@ void factor_vm::init_factor(vm_parameters* p) {
 
 }
 
-/* Allocates memory */
+// Allocates memory
 void factor_vm::pass_args_to_factor(int argc, vm_char** argv) {
   growable_array args(this);
 
@@ -235,7 +154,7 @@ void factor_vm::factor_sleep(long us) {
 
 void factor_vm::start_standalone_factor(int argc, vm_char** argv) {
   vm_parameters p;
-  init_parameters_from_args(&p, argc, argv);
+  p.init_from_args(argc, argv);
   init_factor(&p);
   pass_args_to_factor(argc, argv);
 
@@ -256,7 +175,8 @@ factor_vm* new_factor_vm() {
 
 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);
+  newvm->start_standalone_factor(argc, argv);
+  delete newvm;
 }
 
 }