#include <sys/stat.h>
#include <fcntl.h>
-#include "_scm.h"
+#include "libguile/_scm.h"
/* Everybody has an init function. */
-#include "alist.h"
-#include "arbiters.h"
-#include "async.h"
-#include "backtrace.h"
-#include "boolean.h"
-#include "chars.h"
-#include "continuations.h"
+#include "libguile/alist.h"
+#include "libguile/arbiters.h"
+#include "libguile/async.h"
+#include "libguile/backtrace.h"
+#include "libguile/boolean.h"
+#include "libguile/chars.h"
+#include "libguile/continuations.h"
#ifdef DEBUG_EXTENSIONS
-#include "debug.h"
+#include "libguile/debug.h"
#endif
-#include "dynl.h"
-#include "dynwind.h"
-#include "eq.h"
-#include "error.h"
-#include "eval.h"
-#include "evalext.h"
-#include "feature.h"
-#include "filesys.h"
-#include "fluids.h"
-#include "fports.h"
-#include "gc.h"
-#include "gdbint.h"
-#include "gsubr.h"
-#include "hash.h"
-#include "hashtab.h"
+#ifdef GUILE_DEBUG_MALLOC
+#include "libguile/debug-malloc.h"
+#endif
+#include "libguile/dynl.h"
+#include "libguile/dynwind.h"
+#include "libguile/environments.h"
+#include "libguile/eq.h"
+#include "libguile/error.h"
+#include "libguile/eval.h"
+#include "libguile/evalext.h"
+#include "libguile/feature.h"
+#include "libguile/filesys.h"
+#include "libguile/fluids.h"
+#include "libguile/fports.h"
+#include "libguile/gc.h"
+#include "libguile/gdbint.h"
+#include "libguile/goops.h"
+#include "libguile/gsubr.h"
+#include "libguile/hash.h"
+#include "libguile/hashtab.h"
+#include "libguile/hooks.h"
#ifdef GUILE_ISELECT
-#include "iselect.h"
+#include "libguile/iselect.h"
#endif
-#include "ioext.h"
-#include "keywords.h"
-#include "lang.h"
-#include "list.h"
-#include "load.h"
-#include "macros.h"
-#include "mallocs.h"
-#include "modules.h"
-#include "net_db.h"
-#include "numbers.h"
-#include "objects.h"
-#include "objprop.h"
-#include "options.h"
-#include "pairs.h"
-#include "ports.h"
-#include "posix.h"
+#include "libguile/ioext.h"
+#include "libguile/keywords.h"
+#include "libguile/lang.h"
+#include "libguile/list.h"
+#include "libguile/load.h"
+#include "libguile/macros.h"
+#include "libguile/mallocs.h"
+#include "libguile/modules.h"
+#include "libguile/net_db.h"
+#include "libguile/numbers.h"
+#include "libguile/objects.h"
+#include "libguile/objprop.h"
+#include "libguile/options.h"
+#include "libguile/pairs.h"
+#include "libguile/ports.h"
+#include "libguile/posix.h"
#ifdef HAVE_REGCOMP
-#include "regex-posix.h"
+#include "libguile/regex-posix.h"
#endif
-#include "print.h"
-#include "procprop.h"
-#include "procs.h"
-#include "ramap.h"
-#include "random.h"
-#include "read.h"
-#include "scmsigs.h"
-#include "script.h"
-#include "simpos.h"
-#include "smob.h"
-#include "socket.h"
-#include "sort.h"
-#include "srcprop.h"
-#include "stackchk.h"
-#include "stacks.h"
-#include "stime.h"
-#include "strings.h"
-#include "strop.h"
-#include "strorder.h"
-#include "strports.h"
-#include "struct.h"
-#include "symbols.h"
-#include "tag.h"
-#include "throw.h"
-#include "unif.h"
-#include "variable.h"
-#include "vectors.h"
-#include "version.h"
-#include "vports.h"
-#include "weaks.h"
-#include "guardians.h"
-
-#include "init.h"
+#include "libguile/print.h"
+#include "libguile/procprop.h"
+#include "libguile/procs.h"
+#include "libguile/properties.h"
+#include "libguile/ramap.h"
+#include "libguile/random.h"
+#include "libguile/read.h"
+#include "libguile/scmsigs.h"
+#include "libguile/script.h"
+#include "libguile/simpos.h"
+#include "libguile/smob.h"
+#include "libguile/socket.h"
+#include "libguile/sort.h"
+#include "libguile/srcprop.h"
+#include "libguile/stackchk.h"
+#include "libguile/stacks.h"
+#include "libguile/stime.h"
+#include "libguile/strings.h"
+#include "libguile/strop.h"
+#include "libguile/strorder.h"
+#include "libguile/strports.h"
+#include "libguile/struct.h"
+#include "libguile/symbols.h"
+#include "libguile/tag.h"
+#include "libguile/throw.h"
+#include "libguile/unif.h"
+#include "libguile/values.h"
+#include "libguile/variable.h"
+#include "libguile/vectors.h"
+#include "libguile/version.h"
+#include "libguile/vports.h"
+#include "libguile/weaks.h"
+#include "libguile/guardians.h"
+
+#include "libguile/init.h"
#ifdef HAVE_STRING_H
#include <string.h>
scm_exitval = SCM_BOOL_F; /* vestigial */
+#if SCM_DEBUG_DEPRECATED == 0
scm_top_level_lookup_closure_var = SCM_BOOL_F;
+#endif
scm_system_transformer = SCM_BOOL_F;
scm_root->fluids = scm_make_initial_fluids ();
/* Create an object to hold the root continuation.
*/
- SCM_NEWCELL (scm_rootcont);
- SCM_SETJMPBUF (scm_rootcont, scm_must_malloc ((long) sizeof (scm_contregs),
- "continuation"));
- SCM_SETCAR (scm_rootcont, scm_tc7_contin);
- SCM_SEQ (scm_rootcont) = 0;
- /* The root continuation if further initialized by restart_stack. */
+ {
+ scm_contregs *contregs = scm_must_malloc (sizeof (scm_contregs),
+ "continuation");
+ contregs->num_stack_items = 0;
+ contregs->seq = 0;
+ SCM_NEWSMOB (scm_rootcont, scm_tc16_continuation, contregs);
+ }
+ /* The root continuation is further initialized by restart_stack. */
/* Create the look-aside stack for variables that are shared between
* captured continuations.
}
}
-#ifdef GUILE_NEW_GC_SCHEME
-/* Get an integer from an environment variable. */
-static int
-scm_i_getenv_int (const char *var, int def)
-{
- char *end, *val = getenv (var);
- long res;
- if (!val)
- return def;
- res = strtol (val, &end, 10);
- if (end == val)
- return def;
- return res;
-}
-#endif /* GUILE_DEBUG */
-
\f
/* The main init code. */
};
-static void scm_boot_guile_1(SCM_STACKITEM *base, struct main_func_closure *closure);
+static void scm_init_guile_1 (SCM_STACKITEM *base);
+static void scm_boot_guile_1 (SCM_STACKITEM *base,
+ struct main_func_closure *closure);
static SCM invoke_main_func(void *body_data);
scm_boot_guile_1 (&dummy, &c);
}
+void
+scm_init_guile ()
+{
+ scm_init_guile_1 ((SCM_STACKITEM *)scm_get_stack_base ());
+}
-/* Record here whether SCM_BOOT_GUILE_1 has already been called. This
- variable is now here and not inside SCM_BOOT_GUILE_1 so that one
- can tweak it. This is necessary for unexec to work. (Hey, "1-live"
- is the name of a local radiostation...) */
-
-int scm_boot_guile_1_live = 0;
+int scm_initialized_p = 0;
static void
-scm_boot_guile_1 (SCM_STACKITEM *base, struct main_func_closure *closure)
+scm_init_guile_1 (SCM_STACKITEM *base)
{
- static int initialized = 0;
- /* static int live = 0; */
- setjmp_type setjmp_val;
+ if (scm_initialized_p)
+ return;
- /* This function is not re-entrant. */
- if (scm_boot_guile_1_live)
- abort ();
-
- scm_boot_guile_1_live = 1;
+ if (base == NULL)
+ {
+ fprintf (stderr, "cannot determine stack base!\n");
+ abort ();
+ }
scm_ints_disabled = 1;
scm_block_gc = 1;
- if (initialized)
- {
- restart_stack (base);
- }
- else
- {
- scm_ports_prehistory ();
- scm_smob_prehistory ();
- scm_tables_prehistory ();
-#if defined (GUILE_NEW_GC_SCHEME)
- scm_init_storage (scm_i_getenv_int ("GUILE_INIT_SEGMENT_SIZE_1", 0),
- scm_i_getenv_int ("GUILE_GC_TRIGGER_1", 0),
- scm_i_getenv_int ("GUILE_INIT_SEGMENT_SIZE_2", 0),
- scm_i_getenv_int ("GUILE_GC_TRIGGER_2", 0),
- scm_i_getenv_int ("GUILE_MAX_SEGMENT_SIZE", 0));
-#else
- scm_init_storage (0, 0);
+ scm_ports_prehistory ();
+ scm_smob_prehistory ();
+ scm_tables_prehistory ();
+#ifdef GUILE_DEBUG_MALLOC
+ scm_debug_malloc_prehistory ();
#endif
- scm_init_subr_table ();
- scm_init_root ();
+ scm_init_storage ();
+ scm_struct_prehistory (); /* requires storage */
+ scm_symbols_prehistory (); /* requires storage */
+ scm_weaks_prehistory (); /* requires storage */
+ scm_init_subr_table ();
+ scm_environments_prehistory (); /* create the root environment */
+ scm_init_continuations ();
+ scm_init_root (); /* requires continuations */
#ifdef USE_THREADS
- scm_init_threads (base);
+ scm_init_threads (base);
+#endif
+ start_stack (base);
+ scm_init_gsubr ();
+ scm_init_procprop ();
+ scm_init_environments ();
+ scm_init_feature ();
+ scm_init_alist ();
+ scm_init_arbiters ();
+ scm_init_async ();
+ scm_init_boolean ();
+ scm_init_chars ();
+#ifdef GUILE_DEBUG_MALLOC
+ scm_init_debug_malloc ();
#endif
- start_stack (base);
- scm_init_gsubr ();
- scm_init_feature ();
- scm_init_alist ();
- scm_init_arbiters ();
- scm_init_async ();
- scm_init_boolean ();
- scm_init_chars ();
- scm_init_continuations ();
- scm_init_dynwind ();
- scm_init_eq ();
- scm_init_error ();
- scm_init_fluids ();
- scm_init_backtrace (); /* Requires fluids */
- scm_init_fports ();
- scm_init_gc ();
- scm_init_gdbint ();
- scm_init_hash ();
- scm_init_hashtab ();
+ scm_init_dynwind ();
+ scm_init_eq ();
+ scm_init_error ();
+ scm_init_fluids ();
+ scm_init_backtrace (); /* Requires fluids */
+ scm_init_fports ();
+ scm_init_gdbint ();
+ scm_init_hash ();
+ scm_init_hashtab ();
+ scm_init_objprop ();
+ scm_init_properties ();
+ scm_init_hooks (); /* Requires objprop until hook names are removed */
+ scm_init_gc (); /* Requires hooks, async */
#ifdef GUILE_ISELECT
- scm_init_iselect ();
+ scm_init_iselect ();
#endif
- scm_init_ioext ();
- scm_init_keywords ();
- scm_init_list ();
- scm_init_macros ();
- scm_init_mallocs ();
- scm_init_modules ();
- scm_init_numbers ();
- scm_init_objprop ();
- scm_init_options ();
- scm_init_pairs ();
- scm_init_ports ();
+ scm_init_ioext ();
+ scm_init_keywords ();
+ scm_init_list ();
+ scm_init_macros ();
+ scm_init_mallocs ();
+ scm_init_modules ();
+ scm_init_numbers ();
+ scm_init_options ();
+ scm_init_pairs ();
+ scm_init_ports ();
#ifdef HAVE_POSIX
- scm_init_filesys ();
- scm_init_posix ();
+ scm_init_filesys ();
+ scm_init_posix ();
#endif
#ifdef HAVE_REGCOMP
- scm_init_regex_posix ();
+ scm_init_regex_posix ();
#endif
- scm_init_procs ();
- scm_init_procprop ();
- scm_init_scmsigs ();
+ scm_init_procs ();
+ scm_init_scmsigs ();
#ifdef HAVE_NETWORKING
- scm_init_net_db ();
- scm_init_socket ();
+ scm_init_net_db ();
+ scm_init_socket ();
#endif
- scm_init_sort ();
+ scm_init_sort ();
#ifdef DEBUG_EXTENSIONS
- scm_init_srcprop ();
+ scm_init_srcprop ();
#endif
- scm_init_stackchk ();
- scm_init_struct (); /* Requires struct */
- scm_init_stacks ();
- scm_init_strports ();
- scm_init_symbols ();
- scm_init_tag ();
- scm_init_load ();
- scm_init_objects (); /* Requires struct */
- scm_init_print (); /* Requires struct */
- scm_init_read ();
- scm_init_stime ();
- scm_init_strings ();
- scm_init_strorder ();
- scm_init_strop ();
- scm_init_throw ();
- scm_init_variable ();
- scm_init_vectors ();
- scm_init_version ();
- scm_init_weaks ();
- scm_init_guardian ();
- scm_init_vports ();
- scm_init_eval ();
- scm_init_evalext ();
+ scm_init_stackchk ();
+ scm_init_struct ();
+ scm_init_stacks (); /* Requires struct */
+ scm_init_strports ();
+ scm_init_symbols ();
+ scm_init_tag ();
+ scm_init_values (); /* Requires struct */
+ scm_init_load ();
+ scm_init_objects (); /* Requires struct */
+ scm_init_print (); /* Requires struct */
+ scm_init_read ();
+ scm_init_stime ();
+ scm_init_strings ();
+ scm_init_strorder ();
+ scm_init_strop ();
+ scm_init_throw ();
+ scm_init_variable ();
+ scm_init_vectors ();
+ scm_init_version ();
+ scm_init_weaks ();
+ scm_init_guardian ();
+ scm_init_vports ();
+ scm_init_eval ();
+ scm_init_evalext ();
#ifdef DEBUG_EXTENSIONS
- scm_init_debug (); /* Requires macro smobs */
+ scm_init_debug (); /* Requires macro smobs */
#endif
- scm_init_random ();
+ scm_init_random ();
#ifdef HAVE_ARRAYS
- scm_init_ramap ();
- scm_init_unif ();
+ scm_init_ramap ();
+ scm_init_unif ();
#endif
- scm_init_simpos ();
- scm_init_load_path ();
- scm_init_standard_ports ();
- scm_init_dynamic_linking ();
- scm_init_lang ();
- scm_init_script ();
- initialized = 1;
- }
+ scm_init_simpos ();
+ scm_init_load_path ();
+ scm_init_standard_ports ();
+ scm_init_dynamic_linking ();
+ scm_init_lang ();
+ scm_init_script ();
+
+ scm_init_oop_goops_goopscore_module ();
+
+ scm_initialized_p = 1;
scm_block_gc = 0; /* permit the gc to run */
/* ints still disabled */
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
#endif
- setjmp_val = setjmp (SCM_JMPBUF (scm_rootcont));
- if (!setjmp_val)
- {
- scm_set_program_arguments (closure->argc, closure->argv, 0);
- scm_internal_lazy_catch (SCM_BOOL_T, invoke_main_func, closure,
- scm_handle_by_message, 0);
- }
+ scm_load_startup_files ();
+}
+
+/* Record here whether SCM_BOOT_GUILE_1 has already been called. This
+ variable is now here and not inside SCM_BOOT_GUILE_1 so that one
+ can tweak it. This is necessary for unexec to work. (Hey, "1-live"
+ is the name of a local radiostation...) */
+
+int scm_boot_guile_1_live = 0;
+
+static void
+scm_boot_guile_1 (SCM_STACKITEM *base, struct main_func_closure *closure)
+{
+ scm_init_guile_1 (base);
+
+ /* This function is not re-entrant. */
+ if (scm_boot_guile_1_live)
+ abort ();
+
+ scm_boot_guile_1_live = 1;
+
+ scm_set_program_arguments (closure->argc, closure->argv, 0);
+ invoke_main_func (closure);
scm_restore_signals ();
exit (0);
}
-
static SCM
invoke_main_func (void *body_data)
{
struct main_func_closure *closure = (struct main_func_closure *) body_data;
- scm_load_startup_files ();
-
(*closure->main_func) (closure->closure, closure->argc, closure->argv);
/* never reached */
HCoop / bpt / guile.git / blobdiff