diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 39 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 2 |
3 files changed, 24 insertions, 22 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 26cf911a..dc0bba38 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2008-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/strap: Update cached Lisp translation. + * lisp/core.lisp.in (linkset-from-if): Fix typo. + +2008-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * algebra/strap: New. Sequester cached Lisp translation of algebra bootstrap domains here. diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp index bb3e1a70..4d1f7fb2 100644 --- a/src/boot/strap/translator.clisp +++ b/src/boot/strap/translator.clisp @@ -82,6 +82,13 @@ (REALLYPRETTYPRINT |init| |stream|))))) (#0# NIL))))) +(DEFUN |genOptimizeOptions| (|stream|) + (DECLARE (SPECIAL |$LispOptimizeOptions|)) + (REALLYPRETTYPRINT + (LIST 'PROCLAIM + (LIST 'QUOTE (CONS 'OPTIMIZE |$LispOptimizeOptions|))) + |stream|)) + (DEFPARAMETER |$translatingOldBoot| NIL) (DEFUN |AxiomCore|::|%sysInit| () @@ -134,6 +141,7 @@ (SETQ |$GenVarCounter| 0) (|shoeOpenOutputFile| |stream| |outfn| (PROGN + (|genOptimizeOptions| |stream|) (LET ((|bfVar#5| |lines|) (|line| NIL)) (LOOP (COND @@ -173,6 +181,7 @@ (SETQ |$GenVarCounter| 0) (|shoeOpenOutputFile| |stream| |outfn| (PROGN + (|genOptimizeOptions| |stream|) (LET ((|bfVar#6| |lines|) (|line| NIL)) (LOOP (COND @@ -1697,7 +1706,7 @@ (COND (|out| (CONCAT (|shoeRemoveStringIfNec| |$effectiveFaslType| |out|) - ".clisp")) + "clisp")) ('T (|defaultBootToLispFile| |file|))))))) (DEFUN |translateBootFile| (|progname| |options| |file|) @@ -1735,35 +1744,23 @@ (|associateRequestWithFileType| (|Option| "compile") "boot" #'|compileBootHandler|)) -(DEFUN |systemRootDirectory| () - (PROG (|dir|) - (DECLARE (SPECIAL |$systemInstallationDirectory|)) - (RETURN - (COND - ((SETQ |dir| (ASSOC (|Option| "system") (|%systemOptions|))) - (|ensureTrailingSlash| (CDR |dir|))) - ('T |$systemInstallationDirectory|))))) - -(DEFUN |systemLibraryDirectory| () - (PROG (|dir|) - (RETURN - (COND - ((SETQ |dir| (ASSOC (|Option| '|syslib|) (|%systemOptions|))) - (|ensureTrailingSlash| (CDR |dir|))) - ('T (CONCAT (|systemRootDirectory|) "lib/")))))) - (DEFUN |loadNativeModule| (|m|) (COND ((|%hasFeature| :SBCL) (FUNCALL (|bfColonColon| 'SB-ALIEN 'LOAD-SHARED-OBJECT) |m|)) ((|%hasFeature| :CLISP) (EVAL (LIST (|bfColonColon| 'FFI 'DEFAULT-FOREIGN-LIBRARY) |m|))) + ((|%hasFeature| :ECL) + (EVAL (LIST (|bfColonColon| 'FFI 'LOAD-FOREIGN-LIBRARY) |m|))) ('T (|coreError| "don't know how to load a dynamically linked module")))) (DEFUN |loadSystemRuntimeCore| () (DECLARE (SPECIAL |$NativeModuleExt|)) - (|loadNativeModule| - (CONCAT (|systemLibraryDirectory|) "libopen-axiom-core" - |$NativeModuleExt|))) + (COND + ((OR (|%hasFeature| :ECL) (|%hasFeature| :GCL)) NIL) + ('T + (|loadNativeModule| + (CONCAT (|systemLibraryDirectory|) "libopen-axiom-core" + |$NativeModuleExt|))))) diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index bfa3aad9..c3008c95 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -242,7 +242,7 @@ (concatenate 'string (|systemRootDirectory|) subdir)) ;; Like linkset-from when `feature' in on the features list. -(defun linkset-from-if (dir pred) +(defun linkset-from-if (dir feature) (if (member feature *features*) (linkset-from (system-subdirectory dir)) nil)) |