- cmucl-cvs - mailman3.common-lisp.net

[Git][cmucl/cmucl] Pushed new tag sparc64-dev-checkpoint-2
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed new tag sparc64-dev-checkpoint-2 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][sparc64-dev] Make sure version is specified.
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 50f850e4 by Raymond Toy at 2016-12-27T10:57:52-08:00 Make sure version is specified. The version must either be computed using the defaults or must be given by the -V option. Otherwise make-main-dist doesn't know what to do without a version. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== --- a/bin/make-dist.sh +++ b/bin/make-dist.sh @@ -93,15 +93,17 @@ def_arch_os () { # Figure out the architecture and OS in case options aren't given def_arch_os -# Choose a version based on the git hash as the default version. +# Choose a version based on the git hash as the default version. We +# only compute a default if the git hash looks like a snapshot +# ("snapshot-yyyy-mm") or a release number.. GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` + DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` fi if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - VERSION="${GIT_HASH}" + DEFAULT_VERSION="${GIT_HASH}" fi while getopts "G:O:I:M:bghSA:o:V:?" arg @@ -128,6 +130,12 @@ if [ $# -lt 1 ]; then usage fi +# Either VERSION or DEFAULT_VERSION must be non-empty +if [ -z "$VERSION" -a -z "${DEFAULT_VERSION}" ]; then + echo "Version (-V) must be specified because default version cannot be determined." + usage +fi + if [ ! -d "$1" ] then echo "$1 isn't a directory" @@ -152,6 +160,7 @@ if [ -n "$INSTALL_DIR" ]; then VERSION="today" fi +echo cmucl-$VERSION-$ARCH-$OS ROOT=`dirname $0` # If no compression options given, default to bzip View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/50f850e408d6749ff3f986d09…

1 0

[Git][cmucl/cmucl][sparc64-dev] Replace version arch os args with switches
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 2e5a64c1 by Raymond Toy at 2016-12-27T10:50:00-08:00 Replace version arch os args with switches The positional version, arch, and os args are now commandline switches. This allows the user to specify arch and os names, for example, without specifying a version. This allows the version to be defaulted. Previously, the version had to be specified if arch or os were desired. The original default values are used if these options aren't given. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== --- a/bin/make-dist.sh +++ b/bin/make-dist.sh @@ -12,7 +12,7 @@ # $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/make-dist.sh,v 1.20 2011/04/11 16:34:49 rtoy Exp $ usage() { - echo "make-dist.sh: [-hbg] [-G group] [-O owner] [-I destdir] [-M mandir] dir [version arch os]" + echo "make-dist.sh: [-hbg] [-G group] [-O owner] [-I destdir] [-M mandir] [-A arch] [-V version] [-o OS] dir" echo " -h This help" echo " -b Use bzip2 compression" echo " -g Use gzip compression" @@ -24,10 +24,10 @@ usage() { echo " The compressed tar file is named cmucl-src-<VERSION>.tar.<ext>" echo " If -I is also given, the -S means that the sources are " echo " installed in the <destdir>/src" + echo " -A arch Architecture (x86, sparc, ppc, etc.)" + echo " -o OS OS (linux, solaris10, etc.)" + echo " -V version Version (usually date and/or other version info)" echo " dir Directory where the build is located" - echo " version Version (usually date and/or other version info)" - echo " arch Architecture (x86, sparc, etc.)" - echo " os OS (linux, solaris8, etc.)" echo "" echo "If the -I option is given, directly install all of the files to the" echo "specified directory. Otherwise, Make a CMUCL distribution consisting" @@ -57,7 +57,7 @@ def_arch_os () { SunOS) case `uname -m` in sun*) - ARCH=sparcv9 ;; + ARCH=sparc ;; i*) ARCH=x86 ;; esac @@ -90,7 +90,21 @@ def_arch_os () { esac } -while getopts "G:O:I:M:bghS?" arg +# Figure out the architecture and OS in case options aren't given +def_arch_os + +# Choose a version based on the git hash as the default version. +GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" + +if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then + VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` +fi + +if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then + VERSION="${GIT_HASH}" +fi + +while getopts "G:O:I:M:bghSA:o:V:?" arg do case $arg in G) GROUP=$OPTARG ;; @@ -100,47 +114,18 @@ do b) ENABLE_BZIP=-b ;; g) ENABLE_GZIP=-g ;; S) MAKE_SRC_DIST=yes ;; + A) ARCH=$OPTARG ;; + o) OS=$OPTARG ;; + V) VERSION=$OPTARG ;; h | \?) usage; exit 1 ;; esac done shift `expr $OPTIND - 1` -# Figure out the architecture and OS -ARCH= -OS= - -# Figure out the architecture and OS -def_arch_os - -if [ -n "${INSTALL_DIR}" ]; then - # Doing direct installation - if [ $# -lt 1 ]; then - usage - else - def_arch_os - fi -elif [ $# -lt 2 ]; then - # Version not specified so choose a version based on the git hash. - GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" - - if expr "X${GIT_HASH}" : 'Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then - VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` - fi - - if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then - VERSION="${GIT_HASH}" - fi - - echo "Defaulting version to $VERSION" -else - VERSION="$2" - if [ $# -eq 3 ]; then - ARCH=$3 - elif [ $# -eq 4 ]; then - ARCH=$3 - OS=$4 - fi +# Directory is required; exit if not given +if [ $# -lt 1 ]; then + usage fi if [ ! -d "$1" ] View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/2e5a64c10f75627c6479a9fc6…

1 0

[Git][cmucl/cmucl][sparc64-dev] Support sparc64
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: a77be97e by Raymond Toy at 2016-12-27T10:02:48-08:00 Support sparc64 When ARCH is sparc64, set fasl type to sparc64f so we copy all of the appropriate fasls for the installation. - - - - - 2 changed files: - bin/make-extra-dist.sh - bin/make-main-dist.sh Changes: ===================================== bin/make-extra-dist.sh ===================================== --- a/bin/make-extra-dist.sh +++ b/bin/make-extra-dist.sh @@ -34,6 +34,7 @@ OS=$4 case $ARCH in x86*) FASL="sse2f" ;; + sparc64) FASL=sparc64f ;; sparc*) FASL=sparcf ;; alpha*) FASL=axpf ;; ppc*) FASL=ppcf ;; ===================================== bin/make-main-dist.sh ===================================== --- a/bin/make-main-dist.sh +++ b/bin/make-main-dist.sh @@ -41,6 +41,7 @@ CORE=lisp.core case $ARCH in x86*) FASL=sse2f CORE="lisp-sse2.core" ;; + sparc64) FASL=sparc64f ;; sparc*) FASL=sparcf ;; alpha*) FASL=axpf ;; ppc*) FASL=ppcf ;; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/a77be97eca3c369a51f96270a…

1 0

[Git][cmucl/cmucl][sparc64-dev] Set new fasl file implementation and type for sparc64
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: d05213db by Raymond Toy at 2016-12-26T20:58:18-08:00 Set new fasl file implementation and type for sparc64 Define and set sparc64-fasl-file-implementation for sparc64, and set the fasl file type to "sparc64f" to distinguish this from sparc (32-bit). Also cleaned up parms.lisp a little since sparc64 is always svr4. - - - - - 3 changed files: - src/compiler/generic/new-genesis.lisp - src/compiler/generic/vm-macs.lisp - src/compiler/sparc64/parms.lisp Changes: ===================================== src/compiler/generic/new-genesis.lisp ===================================== --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -2273,7 +2273,8 @@ (setf (sap-ref-16 sap 0) (maybe-byte-swap-short (ldb (byte 16 0) value)))))) - (#.c:sparc-fasl-file-implementation + ((#.c:sparc-fasl-file-implementation + #.c:sparc64-fasl-file-implementation) (let ((inst (maybe-byte-swap (sap-ref-32 sap 0)))) (ecase kind (:call ===================================== src/compiler/generic/vm-macs.lisp ===================================== --- a/src/compiler/generic/vm-macs.lisp +++ b/src/compiler/generic/vm-macs.lisp @@ -238,14 +238,15 @@ alpha-fasl-file-implementation sgi-fasl-file-implementation ppc-fasl-file-implementation - amd64-fasl-file-implementation)) + amd64-fasl-file-implementation + sparc64-fasl-file-implementation)) ;;; Constants for the different implementations. These are all defined in ;;; one place to make sure they are all unique. (defparameter fasl-file-implementations '(nil "Pmax" "Sparc" "RT" "RT/AFPA" "x86" "HPPA" - "Big-endian byte-code" "Little-endian byte-code" "Alpha" "SGI" "PPC" "AMD64")) + "Big-endian byte-code" "Little-endian byte-code" "Alpha" "SGI" "PPC" "AMD64" "SPARC64")) (defconstant pmax-fasl-file-implementation 1) (defconstant sparc-fasl-file-implementation 2) (defconstant rt-fasl-file-implementation 3) @@ -258,6 +259,7 @@ (defconstant sgi-fasl-file-implementation 10) (defconstant ppc-fasl-file-implementation 11) (defconstant amd64-fasl-file-implementation 12) +(defconstant sparc64-fasl-file-implementation 13) ;;; The maximum number of SCs in any implementation. (defconstant sc-number-limit 32) ===================================== src/compiler/sparc64/parms.lisp ===================================== --- a/src/compiler/sparc64/parms.lisp +++ b/src/compiler/sparc64/parms.lisp @@ -34,13 +34,10 @@ (setf (backend-name *target-backend*) "SPARC") #+svr4 (setf (backend-version *target-backend*) - #-sparc-v9 "SPARCstation/Solaris 2.x" - #+sparc-v9 "UltraSPARC/Solaris") -#-svr4 -(setf (backend-version *target-backend*) "SPARCstation/Sun 4") -(setf (backend-fasl-file-type *target-backend*) "sparcf") + "UltraSPARC/Solaris") +(setf (backend-fasl-file-type *target-backend*) "sparc64f") (setf (backend-fasl-file-implementation *target-backend*) - sparc-fasl-file-implementation) + sparc64-fasl-file-implementation) (setf (backend-fasl-file-version *target-backend*) byte-fasl-file-version) (setf (backend-register-save-penalty *target-backend*) 3) (setf (backend-byte-order *target-backend*) :big-endian) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d05213db2201790a2e5827a50…

1 0

[Git][cmucl/cmucl][sparc64-dev] Need to remove sparc64f files too
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 35f7f7c1 by Raymond Toy at 2016-12-26T20:40:42-08:00 Need to remove sparc64f files too - - - - - 1 changed file: - bin/clean-target.sh Changes: ===================================== bin/clean-target.sh ===================================== --- a/bin/clean-target.sh +++ b/bin/clean-target.sh @@ -64,6 +64,7 @@ find $TARGET -name "*.bytef" -o -name "*.lbytef" -o -name "*.assem" -o \ -name "*.sgif" -o \ -name "*.ppcf" -o \ -name "*.sparcf" -o \ + -name "*.sparc64f" -o \ -name "*.x86f" -o \ -name "*.sse2f" $CORE | $GREP $PATTERN | xargs rm 2> /dev/null View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/35f7f7c128cbb8b651abaac49…

1 0

[Git][cmucl/cmucl] Pushed new tag sparc64-dev-checkpoint-1
by Raymond Toy 26 Dec '16

26 Dec '16

Raymond Toy pushed new tag sparc64-dev-checkpoint-1 at cmucl / cmucl

1 0

[Git][cmucl/cmucl][sparc64-dev] Set textdomain to cmucl-sparc64-vm
by Raymond Toy 26 Dec '16

26 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 5a47f5b4 by Raymond Toy at 2016-12-26T09:01:45-08:00 Set textdomain to cmucl-sparc64-vm Prevents updating the cmucl-sparc-vm pot with the new file names. - - - - - 17 changed files: - src/compiler/sparc64/alloc.lisp - src/compiler/sparc64/arith.lisp - src/compiler/sparc64/array.lisp - src/compiler/sparc64/c-call.lisp - src/compiler/sparc64/c-callback.lisp - src/compiler/sparc64/call.lisp - src/compiler/sparc64/cell.lisp - src/compiler/sparc64/char.lisp - src/compiler/sparc64/debug.lisp - src/compiler/sparc64/float.lisp - src/compiler/sparc64/insts.lisp - src/compiler/sparc64/macros.lisp - src/compiler/sparc64/move.lisp - src/compiler/sparc64/parms.lisp - src/compiler/sparc64/sap.lisp - src/compiler/sparc64/static-fn.lisp - src/compiler/sparc64/system.lisp Changes: ===================================== src/compiler/sparc64/alloc.lisp ===================================== --- a/src/compiler/sparc64/alloc.lisp +++ b/src/compiler/sparc64/alloc.lisp @@ -15,7 +15,7 @@ ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Dynamic-Extent. ===================================== src/compiler/sparc64/arith.lisp ===================================== --- a/src/compiler/sparc64/arith.lisp +++ b/src/compiler/sparc64/arith.lisp @@ -18,7 +18,7 @@ ;;; Enhancements/debugging by Raymond Toy 1999, 2000 (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Unary operations. ===================================== src/compiler/sparc64/array.lisp ===================================== --- a/src/compiler/sparc64/array.lisp +++ b/src/compiler/sparc64/array.lisp @@ -16,7 +16,7 @@ ;;; Complex-float and long-float support by Douglas Crosher 1998. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Allocator for the array header. ===================================== src/compiler/sparc64/c-call.lisp ===================================== --- a/src/compiler/sparc64/c-call.lisp +++ b/src/compiler/sparc64/c-call.lisp @@ -15,7 +15,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (use-package "ALIEN") (use-package "ALIEN-INTERNALS") ===================================== src/compiler/sparc64/c-callback.lisp ===================================== --- a/src/compiler/sparc64/c-callback.lisp +++ b/src/compiler/sparc64/c-callback.lisp @@ -8,7 +8,7 @@ "$Header: src/compiler/sparc/c-callback.lisp $") (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (use-package "ALIEN") (use-package "ALIEN-INTERNALS") ===================================== src/compiler/sparc64/call.lisp ===================================== --- a/src/compiler/sparc64/call.lisp +++ b/src/compiler/sparc64/call.lisp @@ -14,7 +14,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Interfaces to IR2 conversion: ===================================== src/compiler/sparc64/cell.lisp ===================================== --- a/src/compiler/sparc64/cell.lisp +++ b/src/compiler/sparc64/cell.lisp @@ -18,7 +18,7 @@ ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Data object ref/set stuff. ===================================== src/compiler/sparc64/char.lisp ===================================== --- a/src/compiler/sparc64/char.lisp +++ b/src/compiler/sparc64/char.lisp @@ -16,7 +16,7 @@ ;;; And then to the SPARC by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ===================================== src/compiler/sparc64/debug.lisp ===================================== --- a/src/compiler/sparc64/debug.lisp +++ b/src/compiler/sparc64/debug.lisp @@ -14,7 +14,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (defknown di::current-sp () system-area-pointer (movable flushable)) (defknown di::current-fp () system-area-pointer (movable flushable)) ===================================== src/compiler/sparc64/float.lisp ===================================== --- a/src/compiler/sparc64/float.lisp +++ b/src/compiler/sparc64/float.lisp @@ -16,7 +16,7 @@ ;;; Complex-float and long-float support by Douglas Crosher 1998. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Move functions: ===================================== src/compiler/sparc64/insts.lisp ===================================== --- a/src/compiler/sparc64/insts.lisp +++ b/src/compiler/sparc64/insts.lisp @@ -14,7 +14,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (use-package "NEW-ASSEM") (use-package "EXT") ===================================== src/compiler/sparc64/macros.lisp ===================================== --- a/src/compiler/sparc64/macros.lisp +++ b/src/compiler/sparc64/macros.lisp @@ -17,7 +17,7 @@ ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;; Instruction-like macros. ===================================== src/compiler/sparc64/move.lisp ===================================== --- a/src/compiler/sparc64/move.lisp +++ b/src/compiler/sparc64/move.lisp @@ -18,7 +18,7 @@ ;;; SPARC conversion by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (define-move-function (load-immediate 1) (vop x y) ===================================== src/compiler/sparc64/parms.lisp ===================================== --- a/src/compiler/sparc64/parms.lisp +++ b/src/compiler/sparc64/parms.lisp @@ -19,7 +19,7 @@ ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") (use-package "C") ===================================== src/compiler/sparc64/sap.lisp ===================================== --- a/src/compiler/sparc64/sap.lisp +++ b/src/compiler/sparc64/sap.lisp @@ -14,7 +14,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ;;;; Moves and coercions: ===================================== src/compiler/sparc64/static-fn.lisp ===================================== --- a/src/compiler/sparc64/static-fn.lisp +++ b/src/compiler/sparc64/static-fn.lisp @@ -17,7 +17,7 @@ ;;; Written by William Lott. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") ===================================== src/compiler/sparc64/system.lisp ===================================== --- a/src/compiler/sparc64/system.lisp +++ b/src/compiler/sparc64/system.lisp @@ -16,7 +16,7 @@ ;;; Mips conversion by William Lott and Christopher Hoover. ;;; (in-package "SPARC") -(intl:textdomain "cmucl-sparc-vm") +(intl:textdomain "cmucl-sparc64-vm") View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/5a47f5b42181b84efd03531f5…

1 0

[Git][cmucl/cmucl][sparc64-dev] Remove :alien-callback
by Raymond Toy 25 Dec '16

25 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: d4418c5f by Raymond Toy at 2016-12-25T08:58:58-08:00 Remove :alien-callback For some reason alien-callback.lisp causes errors when rebuilding the world using the x86 cross-compiled result. It's not needed by core cmucl so lets just not compile it all on sparc64. We'll investigate that later. Besides, the current code very likely wouldn't work correctly on sparc64 anyway. - - - - - 1 changed file: - src/tools/cross-scripts/cross-x86-sparc64.lisp Changes: ===================================== src/tools/cross-scripts/cross-x86-sparc64.lisp ===================================== --- a/src/tools/cross-scripts/cross-x86-sparc64.lisp +++ b/src/tools/cross-scripts/cross-x86-sparc64.lisp @@ -36,7 +36,10 @@ :unix ) ;; Features to remove from current *features* here - '(:sparc-v8 :sparc-v7 ; Choose only one of :sparc-v7, :sparc-v8, :sparc-v9 + '( + ;; Currently don't support alien callbacks on sparc64. + :alien-callback + :sparc-v8 :sparc-v7 ; Choose only one of :sparc-v7, :sparc-v8, :sparc-v9 ;; Other architectures we aren't using. Particularly important ;; to get rid of sse2 and x87 so we don't accidentally try to ;; compile the x87/sse2 float support on sparc, which won't work. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/d4418c5f84b5bcdb61f6bfa32…

1 0

[Git][cmucl/cmucl] Pushed new tag sparc64-dev-checkpoint-0
by Raymond Toy 24 Dec '16

24 Dec '16

Raymond Toy pushed new tag sparc64-dev-checkpoint-0 at cmucl / cmucl

1 0