X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=aa54b85b757f37575542bf1ca20992c64511c730;hb=7f0f521aa3f6b45259c5dfd5f7f11adcd1a7cac6;hp=a170ddf963dfb97c630f9c09535e52dabefa52fd;hpb=99bcb3a92b44ce343586f8bd7c717d665f31f4ad;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index a170ddf..aa54b85 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,19 +53,21 @@
 #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)
+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
  * Lisp land.) */
-void sigint_init(void)
+void
+sigint_init(void)
 {
+    SHOW("entering sigint_init()");
     install_handler(SIGINT, sigint_handler);
+    SHOW("leaving sigint_init()");
 }
 
 /*
@@ -209,24 +216,24 @@ 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 " SBCL_VERSION_STRING ", 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 on SBCL is available at <http://sbcl.sourceforge.net/>.\n\
 ");
 	fflush(stdout);
     }
@@ -241,7 +248,7 @@ 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();
@@ -254,21 +261,12 @@ More information on SBCL is available at <http://sbcl.sourceforge.net/>.
     if (initial_function == NIL) {
 	lose("couldn't find initial function");
     }
+    SHOW("freeing core");
     free(core);
 
 #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
@@ -285,17 +283,20 @@ More information on SBCL is available at <http://sbcl.sourceforge.net/>.
 
 #ifdef PSEUDO_ATOMIC_ATOMIC
     /* Turn on pseudo atomic for when we call into Lisp. */
+    SHOW("turning on pseudo atomic");
     SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1));
     SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0));
 #endif
 
     /* Convert remaining argv values to something that Lisp can grok. */
+    SHOW("setting POSIX-ARGV symbol value");
     SetSymbolValue(POSIX_ARGV, alloc_string_list(argv));
 
     /* Install a handler to pick off SIGINT until the Lisp system gets
      * far enough along to install its own handler. */
     sigint_init();
 
+    FSHOW((stderr, "/funcalling initial_function=0x%lx\n", initial_function));
     funcall0(initial_function);
 
     /* initial_function() is not supposed to return. */