#endif
#ifndef SBCL_HOME
-#define SBCL_HOME "/opt/packages/sbcl/0.9.15.1/lib/sbcl/"
+#define SBCL_HOME "/usr/local/lib/sbcl/"
#endif
\f
return copied_string(filename);
}
}
-
-/* Convert a null-terminated array of null-terminated strings (e.g.
- * argv or envp) into a Lisp list of Lisp base-strings. */
-static lispobj
-alloc_base_string_list(char *array_ptr[])
-{
- if (*array_ptr) {
- return alloc_cons(alloc_base_string(*array_ptr),
- alloc_base_string_list(1 + array_ptr));
- } else {
- return NIL;
- }
-}
\f
/* miscellaneous chattiness */
print_help()
{
puts(
-"SBCL is a Common Lisp programming environment. Ordinarily you shouldn't\n\
-need command line options when you invoke it interactively: you can just\n\
-start it and work with the customary Lisp READ-EVAL-PRINT loop.\n\
+"Usage: sbcl [runtime-options] [toplevel-options] [user-options]\n\
+Common runtime options:\n\
+ --help Print this message and exit.\n\
+ --version Print version information and exit.\n\
+ --core <filename> Use the specified core file instead of the default.\n\
+ --dynamic-space-size <MiB> Size of reserved dynamic space in megabytes.\n\
+ --control-stack-size <MiB> Size of reserved control stack in megabytes.\n\
\n\
-One option idiom which is sometimes useful interactively (e.g. when\n\
-exercising a test case for a bug report) is\n\
- sbcl --no-sysinit --no-userinit\n\
-to keep SBCL from reading any initialization files at startup. And some\n\
-people like to suppress the default startup message:\n\
- sbcl --noinform\n\
+Common toplevel options:\n\
+ --sysinit <filename> System-wide init-file to use instead of default.\n\
+ --userinit <filename> Per-user init-file to use instead of default.\n\
+ --no-sysinit Inhibit processing of any system-wide init-file.\n\
+ --no-userinit Inhibit processing of any per-user init-file.\n\
\n\
-Other options can be useful when you're running SBCL noninteractively,\n\
-e.g. from a script, or if you have a strange system configuration, so\n\
-that SBCL can't by default find one of the files it needs. For\n\
-information on such options, see the sbcl(1) man page.\n\
+User options are not processed by SBCL. All runtime options must\n\
+appear before toplevel options, and all toplevel options must\n\
+appear before user options.\n\
\n\
-More information on SBCL can be found on its man page, or at\n\
-<http://sbcl.sf.net/>.\n");
+For more information please refer to the SBCL User Manual, which\n\
+should be installed along with SBCL, and is also available from the\n\
+website <http://www.sbcl.org/>.\n");
}
void
char *stem = "/sbcl.core";
char *core;
- if(!sbcl_home) sbcl_home = SBCL_HOME;
+ if (!(sbcl_home && *sbcl_home)) sbcl_home = SBCL_HOME;
lookhere = (char *) calloc(strlen(sbcl_home) +
strlen(stem) +
1,
return core;
}
- \f
+char **posix_argv;
+char *core_string;
+
+\f
int
main(int argc, char *argv[], char *envp[])
{
boolean end_runtime_options = 0;
lispobj initial_function;
+ const char *sbcl_home = getenv("SBCL_HOME");
interrupt_init();
block_blockable_signals();
setlocale(LC_ALL, "");
- /* 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(argv, envp);
- arch_init();
- gc_init();
- validate();
-
/* Parse our part of the command line (aka "runtime options"),
* stripping out those options that we handle. */
{
/* As in "--help" case, I think this is expected. */
print_version();
exit(0);
+ } else if (0 == strcmp(arg, "--dynamic-space-size")) {
+ ++argi;
+ if (argi >= argc)
+ lose("missing argument for --dynamic-space-size");
+ errno = 0;
+ dynamic_space_size = strtol(argv[argi++], 0, 0) << 20;
+ if (errno)
+ lose("argument to --dynamic-space-size is not a number");
+ } else if (0 == strcmp(arg, "--control-stack-size")) {
+ ++argi;
+ if (argi >= argc)
+ lose("missing argument for --control-stack-size");
+ errno = 0;
+ thread_control_stack_size = strtol(argv[argi++], 0, 0) << 20;
+ if (errno)
+ lose("argument to --dynamic-space-size is not a number");
} else if (0 == strcmp(arg, "--debug-environment")) {
int n = 0;
printf("; Commandline arguments:\n");
}
}
+ /* Align down to multiple of page_table page size, and to the appropriate
+ * stack alignment. */
+ dynamic_space_size &= ~(PAGE_BYTES-1);
+ thread_control_stack_size &= ~(CONTROL_STACK_ALIGNMENT_BYTES-1);
+
+ /* 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(argv, envp);
+ arch_init();
+ gc_init();
+ validate();
+
/* If no core file was specified, look for one. */
if (!core) {
char *runtime_path = os_get_runtime_executable_path();
}
}
- /* Make sure that SBCL_HOME is set, unless loading an embedded core. */
- if (!getenv("SBCL_HOME") && embedded_core_offset == 0) {
+ /* Make sure that SBCL_HOME is set and not the empty string,
+ unless loading an embedded core. */
+ if (!(sbcl_home && *sbcl_home) && embedded_core_offset == 0) {
char *envstring, *copied_core, *dir;
char *stem = "SBCL_HOME=";
copied_core = copied_string(core);
free(copied_core);
}
- if (!noinform) {
+ if (!noinform && embedded_core_offset == 0) {
print_banner();
fflush(stdout);
}
wos_install_interrupt_handlers(&exception_frame);
#endif
- /* Pass core filename into Lisp */
- SetSymbolValue(CORE_STRING, alloc_base_string(core),0);
- SHOW("freeing core");
- free(core);
-
- /* Convert remaining argv values to something that Lisp can grok. */
- SHOW("setting POSIX-ARGV symbol value");
- SetSymbolValue(POSIX_ARGV, alloc_base_string_list(sbcl_argv),0);
- free(sbcl_argv);
+ /* Pass core filename and the processed argv into Lisp. They'll
+ * need to be processed further there, to do locale conversion.
+ */
+ core_string = core;
+ posix_argv = sbcl_argv;
FSHOW((stderr, "/funcalling initial_function=0x%lx\n",
(unsigned long)initial_function));
projects / sbcl.git / blobdiff