X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fruntime.c;h=98a3d5755497ba5184ece3a88d41e90b87f9b7e1;hb=2fe7ca730f378505f86a7553462fa3241185d444;hp=6c0d54455e5e6b929964425a73858c7fe61a7684;hpb=64a50ee0d70f2e87f3d284d1c7a48a2e0762ea90;p=sbcl.git
diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 6c0d544..98a3d57 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -40,9 +40,6 @@
#include "interr.h"
#include "monitor.h"
#include "validate.h"
-#if defined GENCGC
-#include "gencgc.h"
-#endif
#include "core.h"
#include "save.h"
#include "lispregs.h"
@@ -198,15 +195,19 @@ main(int argc, char *argv[], char *envp[])
char *sbcl_home = getenv("SBCL_HOME");
if (sbcl_home) {
char *lookhere;
- lookhere = (char *) calloc(strlen("/sbcl.core") + strlen(sbcl_home) + 1,
- sizeof(char));
- sprintf(lookhere, "%s/sbcl.core", sbcl_home);
+ char *stem = "/sbcl.core";
+ lookhere = (char *) calloc(strlen(sbcl_home) +
+ strlen(stem) +
+ 1,
+ sizeof(char));
+ sprintf(lookhere, "%s%s", sbcl_home, stem);
core = copied_existing_filename_or_null(lookhere);
free(lookhere);
} else {
core = copied_existing_filename_or_null("/usr/lib/sbcl.core");
if (!core) {
- core = copied_existing_filename_or_null("/usr/local/lib/sbcl.core");
+ core =
+ copied_existing_filename_or_null("/usr/local/lib/sbcl.core");
}
}
if (!core) {
@@ -216,7 +217,7 @@ main(int argc, char *argv[], char *envp[])
if (!noinform) {
printf(
-"This is SBCL " SBCL_VERSION_STRING ", an implementation of ANSI Common Lisp.\n\
+"This is SBCL %s, an implementation of ANSI Common Lisp.\n\
\n\
SBCL is derived from the CMU CL system created at Carnegie Mellon University.\n\
Besides software and documentation originally created at Carnegie Mellon\n\
@@ -234,7 +235,7 @@ used under BSD-style licenses allowing copying only under certain conditions.\n\
See the COPYING file in the distribution for more information.\n\
\n\
More information about SBCL is available at .\n\
-");
+", SBCL_VERSION_STRING);
fflush(stdout);
}
@@ -250,11 +251,6 @@ More information about SBCL is available at .\n\
set_lossage_handler(monitor_or_something);
-#if 0
- os_init();
- gc_init();
- validate();
-#endif
globals_init();
initial_function = load_core_file(core);
@@ -264,17 +260,11 @@ More information about SBCL is available at .\n\
SHOW("freeing core");
free(core);
-#if defined GENCGC
- gencgc_pickup_dynamic();
-#else
-#endif
+ gc_initialize_pointers();
#ifdef BINDING_STACK_POINTER
SetSymbolValue(BINDING_STACK_POINTER, BINDING_STACK_START);
#endif
-#if defined INTERNAL_GC_TRIGGER && !defined __i386__
- SetSymbolValue(INTERNAL_GC_TRIGGER, make_fixnum(-1));
-#endif
interrupt_init();