X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=039dac65f1aca777022b74a42a3f2cd57748a562;hb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;hp=c4251cb122e892e25c45c22afe78afb9e2caa340;hpb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index c4251cb..039dac6 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -14,6 +14,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -21,6 +22,10 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 
+#if defined(SVR4) || defined(__linux__)
+#include <time.h>
+#endif
+
 #include "signal.h"
 
 #include "runtime.h"
@@ -48,13 +53,11 @@
 #endif
 
 /* SIGINT handler that invokes the monitor (for when Lisp isn't up to it) */
-
 static void
 sigint_handler(int signal, siginfo_t *info, void *void_context)
 {
-    printf("\nSIGINT hit at 0x%08lX\n", 
-	   (unsigned long) *os_context_pc_addr(void_context));
-    ldb_monitor();
+    lose("\nSIGINT hit at 0x%08lX\n", 
+	 (unsigned long) *os_context_pc_addr(void_context));
 }
 
 /* (This is not static, because we want to be able to call it from
@@ -195,15 +198,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) {
@@ -213,25 +220,25 @@ main(int argc, char *argv[], char *envp[])
 
     if (!noinform) {
 	printf(
-"This is SBCL " SBCL_VERSION_STRING ", an implementation of ANSI Common Lisp.
-
-SBCL is derived from the CMU CL system created at Carnegie Mellon University.
-Besides software and documentation originally created at Carnegie Mellon
-University, SBCL contains some software originally from the Massachusetts
-Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and
-material contributed by volunteers since the release of CMU CL into the
-public domain. See the CREDITS file in the distribution for more information.
-
-SBCL is a free software system, provided as is, with absolutely no warranty.
-It is mostly in the public domain, but also includes some software copyrighted
-  Massachusetts Institute of Technology, 1986;
-  Symbolics, Inc., 1989, 1990, 1991, 1992; and
-  Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990
-used under BSD-style licenses allowing copying only under certain conditions.
-See the COPYING file in the distribution for more information.
-
-More information on SBCL is available at <http://sbcl.sourceforge.net/>.
-");
+"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\
+University, SBCL contains some software originally from the Massachusetts\n\
+Institute of Technology, Symbolics Incorporated, and Xerox Corporation, and\n\
+material contributed by volunteers since the release of CMU CL into the\n\
+public domain. See the CREDITS file in the distribution for more information.\n\
+\n\
+SBCL is a free software system, provided as is, with absolutely no warranty.\n\
+It is mostly in the public domain, but also includes some software copyrighted\n\
+  Massachusetts Institute of Technology, 1986;\n\
+  Symbolics, Inc., 1989, 1990, 1991, 1992; and\n\
+  Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990\n\
+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 <http://sbcl.sourceforge.net/>.\n\
+", SBCL_VERSION_STRING);
 	fflush(stdout);
     }
 
@@ -245,13 +252,8 @@ More information on SBCL is available at <http://sbcl.sourceforge.net/>.
     define_var("nil", NIL, 1);
     define_var("t", T, 1);
 
-    set_lossage_handler(ldb_monitor);
+    set_lossage_handler(monitor_or_something);
 
-#if 0
-    os_init();
-    gc_init();
-    validate();
-#endif
     globals_init();
 
     initial_function = load_core_file(core);
@@ -264,24 +266,11 @@ More information on SBCL is available at <http://sbcl.sourceforge.net/>.
 #if defined GENCGC
     gencgc_pickup_dynamic();
 #else
-#if defined WANT_CGC && defined X86_CGC_ACTIVE_P
-    {
-        extern int use_cgc_p;
-        lispobj x = SymbolValue(X86_CGC_ACTIVE_P);
-        if (x != type_UnboundMarker && x != NIL) {
-	    /* Enable allocator. */
-	    use_cgc_p = 1;		
-	}
-    }
-#endif
 #endif
 
 #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();