X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=efefc8e11abf05a733a9f0f55317d9a776fa9ca9;hb=683874b497a99cd2c11b6c5d9b47e2785b1ede5f;hp=3b36bf87c878adfc2798c5f856e6e824cddc3f4d;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git
diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 3b36bf8..efefc8e 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -48,18 +48,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", *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()");
}
/*
@@ -75,6 +78,7 @@ successful_malloc(size_t size)
} else {
return result;
}
+ return (void *) NULL; /* dummy value: return something ... */
}
char *
@@ -111,7 +115,7 @@ int
main(int argc, char *argv[], char *envp[])
{
/* the name of the core file we're to execute. Note that this is
- * a malloc'ed string which must be freed eventually. */
+ * a malloc'ed string which should be freed eventually. */
char *core = 0;
/* other command line options */
@@ -120,7 +124,11 @@ main(int argc, char *argv[], char *envp[])
lispobj initial_function;
+ /* KLUDGE: os_vm_page_size is set by os_init(), and on some
+ * systems (e.g. Alpha) arch_init() needs need os_vm_page_size, so
+ * it must follow os_init(). -- WHN 2000-01-26 */
os_init();
+ arch_init();
gc_init();
validate();
@@ -185,7 +193,9 @@ main(int argc, char *argv[], char *envp[])
char *sbcl_home = getenv("SBCL_HOME");
if (sbcl_home) {
char *lookhere;
- asprintf(&lookhere, "%s/sbcl.core", sbcl_home);
+ lookhere = (char *) calloc(strlen("/sbcl.core") + strlen(sbcl_home) + 1,
+ sizeof(char));
+ sprintf(lookhere, "%s/sbcl.core", sbcl_home);
core = copied_existing_filename_or_null(lookhere);
free(lookhere);
} else {
@@ -204,20 +214,19 @@ main(int argc, char *argv[], char *envp[])
"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 material created at Carnegie Mellon University, and material
-contributed by volunteers since its release into the public domain, CMU CL
-contained, and SBCL contains, material copyrighted by
- Massachusetts Institute of Technology, 1986;
- Symbolics, Inc., 1989, 1990, 1991, 1992; and
- Xerox Corporation, 1985, 1986, 1987, 1988, 1989, 1990.
-More information about the origin of SBCL is available in the CREDITS file
-in the distribution.
+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 public domain software, but also includes some software from
-MIT, Symbolics, and Xerox, used under BSD-style licenses which allow copying
-only under certain conditions. More information about copying SBCL is
-available in the COPYING file in the distribution.
+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 .
");
@@ -234,7 +243,7 @@ More information on SBCL is available at .
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();
@@ -247,21 +256,12 @@ More information on SBCL is available at .
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
@@ -278,19 +278,24 @@ More information on SBCL is available at .
#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. */
lose("Lisp initial_function gave up control.");
+ return 0; /* dummy value: return something */
}
+