cmucl-cvs April 2015

cmucl-cvs@common-lisp.net

3 participants
318 discussions

[git] CMU Common Lisp branch master updated. snapshot-2013-08-7-gddfb037
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via ddfb0372fb591209c4aba8ea46f94e469e0686ca (commit) from 0331b89234436da149eb5b142e206ae5af2d9c7b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ddfb0372fb591209c4aba8ea46f94e469e0686ca Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Aug 23 19:38:38 2013 -0700 Make CL:DISASSEMBLE conforming. Also update some of the implementation details of DISASSEM:DISASSEMBLE. code/exports.lisp:: * Update packages so CL:DISASSEMBLE is not DISASSEM:DISASSEMBLE. code/misc.lisp:: * Define CL:DISASSEMBLE. compiler/fndb.lisp:: * Update defknow for disassemble. compiler/disassem.lisp:: * Print of source codes uses standard I/O syntax instead of inheriting from the environment. * Add new keyword arguments to DISASSEM:DISASSEMBLE for the base, case, and radix. These default to 16, :downcase, and *print-radix*, respectively. This means disassembly now prints out all numbers in base 16 and is in lowercase. * When printing a note for an assembler routine, we don't need to print the (hex) address if *print-base* is 16. compiler/x86/insts.lisp:: * Fix some issues when in print-mem-access. * Sometimes the absolute value of the value was printed instead of the value (displaying the wrong value). * Print out the value as an unsigned in some cases instead of signed value. * Fix print-label to print addresses as unsigned integers. This fixes the issue where things like call #x-4xxxxxxx were printed. i18n/locale/cmucl.pot:: * Update because of new or changed docstrings. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index b2bdeab..9322c5d 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -1198,9 +1198,8 @@ )) (defpackage "CONDITIONS") -(intern "DISASSEMBLE" "LISP") (defpackage "DISASSEM" - (:import-from "LISP" "DISASSEMBLE") + (:shadow "DISASSEMBLE") (:export "*NOTE-COLUMN*" "*OPCODE-COLUMN-WIDTH*" "ADD-COMMENT-HOOK" "ADD-HOOK" "ADD-NOTE-HOOK" "ARG-VALUE" "CREATE-DSTATE" "DISASSEM-STATE" "DISASSEMBLE" "DISASSEMBLE-CODE-COMPONENT" diff --git a/src/code/misc.lisp b/src/code/misc.lisp index 788a912..907ce1c 100644 --- a/src/code/misc.lisp +++ b/src/code/misc.lisp @@ -259,3 +259,10 @@ loaded, ed can be used to edit a file" (declare (ignorable x)) (values)) + +(defun disassemble (object) + "Disassemble the machine code associated with OBJECT, which can be a + function, a lambda expression, or a symbol with a function definition. If + it is not already compiled, the compiler is called to produce something to + disassemble." + (disassem:disassemble object)) diff --git a/src/compiler/disassem.lisp b/src/compiler/disassem.lisp index a236592..1316aa2 100644 --- a/src/compiler/disassem.lisp +++ b/src/compiler/disassem.lisp @@ -2964,7 +2964,7 @@ (when stream (unless at-block-begin (terpri stream)) - (let ((*print-base* 10)) + (with-standard-io-syntax (pprint-logical-block (stream nil :per-line-prefix ";;; ") (format stream "[~D] " (di:code-location-form-number loc)) @@ -3304,17 +3304,36 @@ :format-arguments (list name))))) (defun disassemble (object &key (stream *standard-output*) - (use-labels t) - (backend c:*native-backend*)) + (use-labels t) + (backend c:*native-backend*) + (base 16) + (case :downcase) + (radix *print-radix*)) "Disassemble the machine code associated with OBJECT, which can be a function, a lambda expression, or a symbol with a function definition. If it is not already compiled, the compiler is called to produce something to - disassemble." + disassemble. + + :Stream stream + The dissassembly is written to this stream. + :Use-labels + Labels are generated instead of using instruction addresses. + :Base + :Case + :Radix + The disassembler uses the specified base, case, and radix when + printing the disassembled code. The default values are 16, + :downcase, and *print-radix*, respectively." (declare (type (or function symbol cons) object) (type (or (member t) stream) stream) (type (member t nil) use-labels) - (type c::backend backend)) - (let ((fun (compiled-function-or-lose object))) + (type c::backend backend) + (type (integer 2 36) base) + (type (member :upcase :downcase :capitalize) case)) + (let ((*print-base* base) + (*print-case* case) + (*print-radix* radix) + (fun (compiled-function-or-lose object))) (if (typep fun 'kernel:byte-function) (c:disassem-byte-fun fun) ;; we can't detect closures, so be careful @@ -3748,8 +3767,12 @@ symbol object that we know about.") (find-assembler-routine address)))) (unless (null name) (note #'(lambda (stream) - (if NOTE-ADDRESS-P - (format stream "#x~8,'0x: ~a" address name) + (if note-address-p + ;; No need to print out the address in hex if the + ;; print-base is already 16. + (if (= *print-base* 16) + (format stream " ~A" name) + (format stream "#x~8,'0x: ~a" address name)) (princ name stream))) dstate)) name)) diff --git a/src/compiler/fndb.lisp b/src/compiler/fndb.lisp index 052b4c1..b8645df 100644 --- a/src/compiler/fndb.lisp +++ b/src/compiler/fndb.lisp @@ -1156,9 +1156,7 @@ (:xref t)) (values (or pathname null) boolean boolean)) -(defknown disassemble ((or callable cons) - &key (:stream stream) (:backend backend) - (:use-labels t)) +(defknown disassemble ((or callable cons)) (values)) (defknown documentation (t symbol) diff --git a/src/compiler/x86/insts.lisp b/src/compiler/x86/insts.lisp index 048b9ec..c0f1034 100644 --- a/src/compiler/x86/insts.lisp +++ b/src/compiler/x86/insts.lisp @@ -433,11 +433,7 @@ (write-char #\* stream) (princ scale stream)) (when (and disp (not (zerop disp))) - (when (and (or base index)) - (write-char (if (minusp disp) #\- #\+) stream)) - (let ((unsigned-offset (if (minusp disp) - (+ #x100000000 disp) - disp))) + (let ((unsigned-offset (ldb (byte vm:word-bits 0) disp))) (or (nth-value 1 (disassem::note-code-constant-absolute unsigned-offset dstate)) @@ -448,8 +444,12 @@ (when (typep offs 'disassem::offset) (or (disassem::maybe-note-nil-indexed-symbol-slot-ref offs dstate) - (disassem::maybe-note-static-function offs dstate)))))) - (princ (abs disp) stream))) + (disassem::maybe-note-static-function offs dstate))))) + (cond ((or base index) + (write-char (if (minusp disp) #\- #\+) stream) + (princ (abs disp) stream)) + (t + (princ unsigned-offset stream)))))) (write-char #\] stream)) (defun print-imm-data (value stream dstate) @@ -457,9 +457,7 @@ (princ value stream) (when (typep offset 'disassem::offset) (or (disassem::maybe-note-nil-indexed-object offset dstate) - (let ((unsigned-offset (if (and (numberp value) (minusp value)) - (+ value #x100000000) - value))) + (let ((unsigned-offset (ldb (byte vm:word-bits 0) value))) (disassem::maybe-note-assembler-routine unsigned-offset stream dstate)) (nth-value 1 (disassem::note-code-constant-absolute offset @@ -493,7 +491,10 @@ (defun print-label (value stream dstate) (declare (ignore dstate)) - (disassem:princ16 value stream)) + (princ (if (and (numberp value) (minusp value)) + (ldb (byte vm:word-bits 0) value) + value) + stream)) ;;; Returns either an integer, meaning a register, or a list of ;;; (BASE-REG OFFSET INDEX-REG INDEX-SCALE), where any component diff --git a/src/i18n/locale/cmucl.pot b/src/i18n/locale/cmucl.pot index ff7b7cf..397fa4e 100644 --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -5607,6 +5607,16 @@ msgid "" " loaded, ed can be used to edit a file" msgstr "" +#: src/code/misc.lisp +msgid "" +"Disassemble the machine code associated with OBJECT, which can be a\n" +" function, a lambda expression, or a symbol with a function definition. " +"If\n" +" it is not already compiled, the compiler is called to produce something " +"to\n" +" disassemble." +msgstr "" + #: src/code/extensions.lisp msgid "" "This function can be used as the default value for keyword arguments that\n" @@ -17133,7 +17143,18 @@ msgid "" "If\n" " it is not already compiled, the compiler is called to produce something " "to\n" -" disassemble." +" disassemble.\n" +"\n" +" :Stream stream\n" +" The dissassembly is written to this stream.\n" +" :Use-labels\n" +" Labels are generated instead of using instruction addresses.\n" +" :Base\n" +" :Case\n" +" :Radix\n" +" The disassembler uses the specified base, case, and radix when\n" +" printing the disassembled code. The default values are 16,\n" +" :downcase, and *print-radix*, respectively." msgstr "" #: src/compiler/disassem.lisp ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 3 +-- src/code/misc.lisp | 7 +++++++ src/compiler/disassem.lisp | 39 +++++++++++++++++++++++++++++++-------- src/compiler/fndb.lisp | 4 +--- src/compiler/x86/insts.lisp | 23 ++++++++++++----------- src/i18n/locale/cmucl.pot | 23 ++++++++++++++++++++++- 6 files changed, 74 insertions(+), 25 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp annotated tag snapshot-2013-06 created. snapshot-2013-06
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The annotated tag, snapshot-2013-06 has been created at 5bb85899559aa56dff922bcc67cc65cef79364e4 (tag) tagging faf5cd6df3c8fd377891082e2f3bbcbada81e1d6 (commit) replaces snapshot-2013-05 tagged by Raymond Toy on Sat Jun 1 06:34:52 2013 -0700 - Log ----------------------------------------------------------------- Snapshot 2013-06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (Darwin) iEYEABECAAYFAlGp+HwACgkQJ5IjUmgZO7K6NQCgq70jgG6j8OQHpW3/K2kOTQdF BoMAn2YuGpubnd1qy1IDYgmKoepc4jy6 =gVMY -----END PGP SIGNATURE----- Raymond Toy (21): Wrap exports in eval-when. Wrap exports in eval-when for ppc as was done for sparc and add Wrap exports in eval-when for x86 as was done for sparc and add Forgot to commit changes to code/x86-vm.lisp to: Fix ticket:81 and fix ticket:83. Update. Don't reverse surrogate pairs in strings; it's not allowed by the Fix ticket:82: If the form numbers are too large to be encoded, don't Regenerated from current sources. Update to ASDF 3.0.1. Fix typo. Remove all the extensions to string-upcase and friends. The extended Import many unicode symbols from LISP into the UNICODE package. Update. Use BYTE-BASH-COPY in COPY-SEQ on strings. Update. Use BYTE-BASH-COPY too when CONCATENATE'ing simple-strings. Minor corrections for the usage message. Update piglatin translations using the latest pot files. Regenerated from sparc build. Regenerated after sparc build. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-10-gd9fb490
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp branch rtoy-lisp-trig updated. snapshot-2013-12-a-13-g5b9111e
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-lisp-trig has been updated via 5b9111e975748929ddcdd9052c5b5ec8138dcca5 (commit) via 0bd9e773136b7b827f711f51500fdca4122adf73 (commit) from 1ae2d46cf3e9776ff35c6d6eddf3d73f6b0b66a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5b9111e975748929ddcdd9052c5b5ec8138dcca5 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Dec 17 20:09:42 2013 -0800 Need to build e_rem_pio2.c on sparc now. diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index f8f7524..c4a8ed6 100644 --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -56,6 +56,6 @@ ASSEM_SRC = sparc-assem.S ARCH_SRC = sparc-arch.c DEPEND=$(CC) -OS_SRC = solaris-os.c os-common.c undefineds.c elf.c k_rem_pio2.c +OS_SRC = solaris-os.c os-common.c undefineds.c elf.c e_rem_pio2.c k_rem_pio2.c OS_LIBS= -lsocket -lnsl -ldl EXEC_FINAL_OBJ = exec-final.o commit 0bd9e773136b7b827f711f51500fdca4122adf73 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Dec 17 20:09:15 2013 -0800 Add some comments and remove unneeded package qualifiers. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 4dc7773..4ccf80a 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -242,15 +242,17 @@ (optimize (speed 3) (safety 0))) (let ((ix (ldb (byte 31 0) (kernel:double-float-high-bits x)))) (when (< ix #x3e400000) + ;; |x| < 2^-27 + ;; Signal inexact if x /= 0 (if (zerop (truncate x)) (return-from kernel-sin x) (return-from kernel-sin x))) - (let* ((s1 -1.66666666666666324348d-01) - (s2 8.33333333332248946124d-03) - (s3 -1.98412698298579493134d-04) - (s4 2.75573137070700676789d-06) - (s5 -2.50507602534068634195d-08) - (s6 1.58969099521155010221d-10) + (let* ((s1 -1.66666666666666324348d-01) ; #xBFC55555 #x55555549 + (s2 8.33333333332248946124d-03) ; #x3F811111 #x1110F8A6 + (s3 -1.98412698298579493134d-04) ; #xBF2A01A0 #x19C161D5 + (s4 2.75573137070700676789d-06) ; #x3EC71DE3 #x57B1FE7D + (s5 -2.50507602534068634195d-08) ; #xBE5AE5E6 #x8A2B9CEB + (s6 1.58969099521155010221d-10) ; #x3DE5D93A #x5ACFD57C (z (* x x)) (v (* z x)) (r (+ s2 @@ -338,13 +340,15 @@ (- (* z r) (* x y))))) (t + ;; qx = 0.28125 if |x| > 0.78125, else x/4 dropping the + ;; least significant 32 bits. (let* ((qx (if (> ix #x3fe90000) 0.28125d0 ;; x/4, exactly, and also dropping the ;; least significant 32 bits of the - ;; fraction. (Why?) - (kernel:make-double-float (- ix #x00200000) - 0))) + ;; fraction. + (make-double-float (- ix #x00200000) + 0))) (hz (- (* 0.5 z) qx)) (a (- 1 qx))) (- a (- hz (- (* z r) @@ -419,7 +423,8 @@ (when (zerop (truncate x)) (cond ((zerop (logior (logior ix (kernel:double-float-low-bits x)) (+ iy 1))) - ;; x = 0 and iy = -1 (cot) + ;; x = 0 (because hi and low bits are 0) and iy = -1 + ;; (cot) (return-from kernel-tan (/ (abs x)))) ((= iy 1) (return-from kernel-tan x)) @@ -429,10 +434,10 @@ (let ((a 0d0) (tt 0d0)) (setf w (+ x y)) - (setf z (kernel:make-double-float (kernel:double-float-high-bits w) 0)) + (setf z (make-double-float (double-float-high-bits w) 0)) (setf v (- y (- z x))) (setf a (/ -1 w)) - (setf tt (kernel:make-double-float (kernel:double-float-high-bits a) 0)) + (setf tt (make-double-float (double-float-high-bits a) 0)) (setf s (+ 1 (* tt z))) (return-from kernel-tan (+ tt (* a (+ s (* tt v)))))))))) @@ -441,10 +446,13 @@ (when (minusp hx) (setf x (- x)) (setf y (- y))) + ;; The two constants below are such that pi/4 + pi/4_lo is pi/4 + ;; to twice the accuracy of a double float. + ;; ;; z = pi/4-x - (setf z (- (kernel:make-double-float #x3FE921FB #x54442D18) x)) - ;; w = pi/4_lo - y - (setf w (- (kernel:make-double-float #x3C81A626 #x33145C07) y)) + (setf z (- (make-double-float #x3FE921FB #x54442D18) x)) + ;; w = pi/4_lo - y. + (setf w (- (make-double-float #x3C81A626 #x33145C07) y)) (setf x (+ z w)) (setf y 0d0)) (setf z (* x x)) ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 38 +++++++++++++++++++++++--------------- src/lisp/Config.sparc_common | 2 +- 2 files changed, 24 insertions(+), 16 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-08-37-g98d3b69
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-04-14-ga923563
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp annotated tag snapshot-2014-06 created. snapshot-2014-06
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The annotated tag, snapshot-2014-06 has been created at 949b28e7f829c8ffb3f9ff17948fe68eff932af3 (tag) tagging 19d7d37b313c6c252653a6f39f7fbc9c344469f3 (commit) replaces snapshot-2014-05 tagged by Raymond Toy on Tue Jun 17 20:35:46 2014 -0700 - Log ----------------------------------------------------------------- Snapshot 2014-06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlOhCRwACgkQJ5IjUmgZO7JhWgCfWVTkYzTVT6RecNb0APSblXMg Qa4An00FWaMj7LCbq5KGRx/GM54DJlbN =LSWN -----END PGP SIGNATURE----- Raymond Toy (11): Update to ASDF 3.1.2. Unuse the "UNIX" package from "VM". Oops. Really remove UNIX from the VM package. Oops. Need to add the package prefix for sigcontext. Use %make-double-double-float directly for the double-double constants Fix bug in printing most-negative-fixnum Fix up some comments, and add a few more. Update machine translations. Fix ticket:98 Regenerate. Update for snapshot. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-04-9-g497b9b2
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-06-2-gd671c35
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. begin-x87-removal-1-ga746e02
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via a746e0218269ff24d8d88e5edfd01b284558d33b (commit) from 28740a75c3a9948d9a6fea93f4fffde1453ea665 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a746e0218269ff24d8d88e5edfd01b284558d33b Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Mar 30 09:42:19 2014 -0700 Remove support for x87 cores from build scripts. * Command-line options allowing building for x87 are gone. * Don't try to install x86f fasls. diff --git a/bin/build-all.sh b/bin/build-all.sh index 6313062..289e90a 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -10,7 +10,6 @@ usage () echo "" echo "Build all variants of cmucl for a specific architecture." echo "This means build the unicode and non-unicode variants." - echo "For x86 architectures, the x87 and sse2 cores are also built." echo "This script basically automates calling build.sh for all the" echo "variants, using the most common options. If there are special" echo "requirements, then you must use build.sh itself instead of this" @@ -89,15 +88,13 @@ buildx86 () if [ -n "$OLD8" ]; then # Build non-unicode versions set -x - $BINDIR/build.sh -f x87 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLD8" - $BINDIR/build.sh -f sse2 -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLD8" + $BINDIR/build.sh -b ${BASE}-8bit $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLD8" set +x fi # Build the unicode versions if [ -n "$OLDLISP" ]; then set -x - $BINDIR/build.sh -f x87 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLDLISP" - $BINDIR/build.sh -f sse2 -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLDLISP" + $BINDIR/build.sh -b ${BASE} $bootfiles ${VERSION:+-v "$VERSION"} -C "${CREATE_OPT}" ${UPDATE_TRANS} ${UPDATE_POT} ${RECOMPILEC} ${GIT_FILE_COMMENT} -o "$OLDLISP" set +x fi } diff --git a/bin/build.sh b/bin/build.sh index 9309e63..e0274ba 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -87,7 +87,6 @@ usage () echo ' -C [l m] Create the build directories. The args are what' echo ' you would give to create-target.sh for the lisp' echo ' and motif variant.' - echo ' -f mode FPU mode: x87, sse2, or auto. Default is auto' echo ' -P On the last build, do NOT generate cmucl.pot and do NOT update' echo ' the translations.' echo " -? This help message" @@ -155,7 +154,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh" BUILD_POT="yes" UPDATE_TRANS= -while getopts "123PRGo:b:v:uB:C:Ui:f:w:O:?" arg +while getopts "123PRGo:b:v:uB:C:Ui:w:O:?" arg do case $arg in 1) ENABLE2="no" ;; @@ -169,7 +168,6 @@ do CREATE_DIRS=yes ;; B) bootfiles="$bootfiles $OPTARG" ;; i) INTERACTIVE_BUILD="$OPTARG" ;; - f) FPU_MODE="-fpu $OPTARG" ;; P) BUILD_POT=no ;; w) BUILDWORLD="$OPTARG" ;; U) UPDATE_TRANS="yes";; @@ -218,13 +216,13 @@ MAKE_TARGET=all export INTERACTIVE BUILD=1 -OLDLISP="$OLDLISP $OLDLISPFLAGS $FPU_MODE" +OLDLISP="$OLDLISP $OLDLISPFLAGS" buildit bootfiles= TARGET=$BASE-3 -OLDLISP="${BASE}-2/lisp/lisp $OLDLISPFLAGS $FPU_MODE" +OLDLISP="${BASE}-2/lisp/lisp $OLDLISPFLAGS" ENABLE=$ENABLE3 BUILD=2 @@ -235,7 +233,7 @@ buildit TARGET=$BASE-4 CLEAN_FLAGS="-K all" -OLDLISP="${BASE}-3/lisp/lisp $OLDLISPFLAGS $FPU_MODE" +OLDLISP="${BASE}-3/lisp/lisp $OLDLISPFLAGS" ENABLE=$ENABLE4 if [ "${BUILD_POT}" = "yes" ]; then @@ -253,7 +251,7 @@ buildit # Asdf and friends are part of the base install, so we need to build # them now. -$TARGET/lisp/lisp $FPU_MODE -noinit -nositeinit -batch "$@" << EOF || exit 3 +$TARGET/lisp/lisp -noinit -nositeinit -batch "$@" << EOF || exit 3 (in-package :cl-user) (setf (ext:search-list "target:") '("$TARGET/" "src/")) @@ -267,8 +265,8 @@ EOF if [ "$SKIPUTILS" = "no" ]; then - OLDLISP="${BASE}-4/lisp/lisp $OLDLISPFLAGS $FPU_MODE" - time $TOOLDIR/build-utils.sh $TARGET $FPU_MODE + OLDLISP="${BASE}-4/lisp/lisp $OLDLISPFLAGS" + time $TOOLDIR/build-utils.sh $TARGET fi build_finished=`date` diff --git a/bin/make-extra-dist.sh b/bin/make-extra-dist.sh index 3f84608..8e49b2b 100755 --- a/bin/make-extra-dist.sh +++ b/bin/make-extra-dist.sh @@ -33,7 +33,7 @@ ARCH=$3 OS=$4 case $ARCH in - x86*) FASL="x86f sse2f" ;; + x86*) FASL="sse2f" ;; sparc*) FASL=sparcf ;; alpha*) FASL=axpf ;; ppc*) FASL=ppcf ;; diff --git a/bin/make-main-dist.sh b/bin/make-main-dist.sh index e52ca3f..e282996 100755 --- a/bin/make-main-dist.sh +++ b/bin/make-main-dist.sh @@ -36,11 +36,11 @@ VERSION=$2 ARCH=$3 OS=$4 -# Core file to look for. For x86, we have two core files to include. +# Core file to look for. CORE=lisp.core case $ARCH in - x86*) FASL=x86f - CORE="lisp-*.core" ;; + x86*) FASL=sse2f + CORE="lisp-sse2.core" ;; sparc*) FASL=sparcf ;; alpha*) FASL=axpf ;; ppc*) FASL=ppcf ;; @@ -119,10 +119,6 @@ install ${GROUP} ${OWNER} -m 0755 src/tools/sample-wrapper $DESTDIR/lib/cmucl/ for f in gray-streams gray-compat simple-streams iodefs do install ${GROUP} ${OWNER} -m 0644 $TARGET/pcl/$f-library.$FASL $DESTDIR/lib/cmucl/lib/subsystems/ - if [ "$FASL" = "x86f" ]; then - # For x87, we want both x86f and sse2f - install ${GROUP} ${OWNER} -m 0644 $TARGET/pcl/$f-library.sse2f $DESTDIR/lib/cmucl/lib/subsystems/ - fi done for f in src/pcl/simple-streams/external-formats/*.lisp src/pcl/simple-streams/external-formats/aliases src/i18n/unidata.bin @@ -135,10 +131,6 @@ for f in asdf defsystem do install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/contrib/$f install ${GROUP} ${OWNER} -m 0644 $TARGET/contrib/$f/$f.$FASL $DESTDIR/lib/cmucl/lib/contrib/$f - if [ "$FASL" = "x86f" ]; then - # For x87, we want both x86f and sse2f - install ${GROUP} ${OWNER} -m 0644 $TARGET/contrib/$f/$f.sse2f $DESTDIR/lib/cmucl/lib/contrib/$f - fi done # Copy the source files for asdf and defsystem ----------------------------------------------------------------------- Summary of changes: bin/build-all.sh | 7 ++----- bin/build.sh | 16 +++++++--------- bin/make-extra-dist.sh | 2 +- bin/make-main-dist.sh | 14 +++----------- 4 files changed, 13 insertions(+), 26 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

← Newer
1
...
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs April 2015