diff options
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/Makefile.in | 8 | ||||
| -rw-r--r-- | src/interp/daase.lisp | 1 | ||||
| -rw-r--r-- | src/interp/sys-driver.boot | 18 |
3 files changed, 13 insertions, 14 deletions
diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 056fa8d5..fab50106 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -198,18 +198,14 @@ makeint.lisp: Makefile @ echo '#+:gcl (si::gbc-time 0)' >> makeint.lisp @ echo '#+:GCL (si::gbc t)' >> makeint.lisp -${SAVESYS}: database.date \ - $(axiom_targetdir)/algebra/exposed.$(FASLEXT) \ - $(axiom_target_datadir)/msgs/s2-us.msgs \ - $(OBJS) makeint.$(LNKEXT) +${SAVESYS}: database.date $(axiom_target_datadir)/msgs/s2-us.msgs $(OBJS) $(DRIVER) --execpath=$(BOOTSYS) \ --syslib=$(axiom_target_libdir) \ --system="$(AXIOM)/" --system-algebra \ --sysdb="$(axiom_src_datadir)/algebra/" \ --prologue="(pushnew :open-axiom-basic-system *features*)" \ --make --output=$@ --main="BOOT::|systemMain|" \ - --load-directory=. $(OBJS) makeint.$(LNKEXT) - @ echo 6 $@ created + --load-directory=. $(OBJS) $(mkdir_p) $(axiom_target_bindir) .PHONY: all-axiomsys diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp index 086f5810..74b6ba9c 100644 --- a/src/interp/daase.lisp +++ b/src/interp/daase.lisp @@ -349,7 +349,6 @@ (close *category-stream*) (close *browse-stream*)) - (defun |fillDatabasesInCore| nil "set all -hash* to clean values. used to clean up core before saving system" (setq *hascategory-hash* (make-hash-table :test #'equal)) diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index 37023295..f101bf6d 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -178,7 +178,7 @@ restart() == ++ line compiler, the script executor, etc. Mess with care. initializeGlobalState() == REROOT() - have_to := $StandardLinking or not %basicSystemIsComplete() + init? := $StandardLinking or not %algebraSystemIsComplete() -- 0. Global variables. $inLispVM := false @@ -195,12 +195,13 @@ initializeGlobalState() == setCompilerOptimizations(getOptionValue "optimize" or $defaultOptimizationLevel) GCMSG(NIL) - if have_to then + if init? then $superHash := hashTable 'EQUAL initNewWorld() -- 1. Macros. - if have_to then buildHtMacroTable() + if init? then + buildHtMacroTable() -- 2. History if $verbose and $displayStartMsgs then @@ -210,7 +211,7 @@ initializeGlobalState() == -- 3. Databases if $verbose and $displayStartMsgs then sayKeyedMsg("S2IZ0053",['"database"]) - if have_to then + if init? then fillDatabasesInCore() mkLowerCaseConTable() else @@ -220,24 +221,27 @@ initializeGlobalState() == if $verbose and $displayStartMsgs then sayKeyedMsg("S2IZ0053",['"constructors"]) loadExposureGroupData() - if have_to then makeConstructorsAutoLoad() + if init? then + makeConstructorsAutoLoad() -- 5. Rule sets. if not $ruleSetsInitialized then initializeRuleSets() -- 6. Interpreter - if have_to then + if init? then if $verbose and $displayStartMsgs then sayKeyedMsg("S2IZ0053",['"interpreter"]) initializeTimedNames($interpreterTimedNames,$interpreterTimedClasses) + + if init? then statisticsInitialization() initializeSystemCommands() $InteractiveFrame := makeInitialModemapFrame() initializeInterpreterFrameRing() -- 7. Etc. - if have_to and functionp 'addtopath then + if init? and functionp 'addtopath then addtopath strconc(systemRootDirectory(),'"bin") -- Take off |