cmucl-cvs December 2016

cmucl-cvs@common-lisp.net

1 participants
59 discussions

[Git][cmucl/cmucl][sparc64-dev] Tell assembler we're using %g2 and %g3
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: e333d847 by Raymond Toy at 2016-12-27T22:31:44-08:00 Tell assembler we're using %g2 and %g3 Assembler errors out if we don't tell it we're using %g2 and %g3 in the code. - - - - - 1 changed file: - src/lisp/sparc64-assem.S Changes: ===================================== src/lisp/sparc64-assem.S ===================================== --- a/src/lisp/sparc64-assem.S +++ b/src/lisp/sparc64-assem.S @@ -36,6 +36,14 @@ #else #define FRAMESIZE (SA(MINFRAME)) #endif + +/* + * Tell assembler we're using %g2 and %g3 here. + */ + .register %g2, #scratch + .register %g3, #scratch + + .seg "text" .global call_into_lisp FUNCDEF(call_into_lisp) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/e333d8472738fed095b4f19d9…

1 0

[Git][cmucl/cmucl][sparc64-dev] 7 commits: Add -i option to enable interactive builds
by Raymond Toy 28 Dec '16

28 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: fac1b87e by Raymond Toy at 2016-12-27T22:10:59-08:00 Add -i option to enable interactive builds This enables interactive builds when compiling the cross-compiler. This causes the build to be more verbose and to stop if there is a fatal error when compiling the cross-copmiler. - - - - - a50a215c by Raymond Toy at 2016-12-27T22:13:24-08:00 Set word-bits to 64 for 64-bit sparc Also hardwire the value of double-float-digits to 53 instead of trying to compute it from word-bits. This is actually independent of word-bits. - - - - - 8c57220e by Raymond Toy at 2016-12-27T22:14:44-08:00 Disable truncate-by-mult vops. These cause errors and aren't needed; they're just speed optimizations that aren't needed right now. - - - - - 32b18ac1 by Raymond Toy at 2016-12-27T22:18:16-08:00 Update maybe-byte-swap for 32 and 64 bit architectures maybe-byte-swap can handle either 32-bit or 64-bit architectures. Added maybe-byte-swap-32 and maybe-byte-swap-64 to handle these cases. For do-cold-fixup use maybe-byte-swap-32. (Might need further work? I think the fixups are currently limited to 32-bit values at most. Certainly sethi is.) - - - - - a43234fc by Raymond Toy at 2016-12-27T22:19:29-08:00 Leave map_failed as a 32-bit value for now for sparc64 The mmap stuff needs to be redone for 64-bit, but we don't need mmap for cmucl core anyway. - - - - - 244822ba by Raymond Toy at 2016-12-27T22:21:48-08:00 Don't flame out when changing constants Stolen from cross-x86-amd64 so that defconstant doesn't flame out when changing the value of a defconstant. Also, don't frob old-vm:word-bits with a new value. Not sure this is needed, but it gets rid of a problem when compiling. (Why does the old-vm stuff leak into the new vm anyway?) - - - - - 6e22a43c by Raymond Toy at 2016-12-27T22:23:31-08:00 Compile 64-bit code. Use -m64 to get 64-bit code. I think this also implies abs44 addressing (code+data+bss size). - - - - - 7 changed files: - bin/cross-build-world.sh - src/code/unix.lisp - src/compiler/generic/new-genesis.lisp - src/compiler/sparc64/arith.lisp - src/compiler/sparc64/parms.lisp - src/lisp/Config.sparc64_sunc - src/tools/cross-scripts/cross-x86-sparc64.lisp Changes: ===================================== bin/cross-build-world.sh ===================================== --- a/bin/cross-build-world.sh +++ b/bin/cross-build-world.sh @@ -1,19 +1,21 @@ #!/bin/sh usage() { - echo "cross-build-world.sh [-crlX] [-B file] [-G Gnumake] target-dir cross-dir cross-compiler-script [build-binary [flags]]" + echo "cross-build-world.sh [-crlXi] [-B file] [-G Gnumake] target-dir cross-dir cross-compiler-script [build-binary [flags]]" echo " -c Clean target and cross directories before compiling" echo " -r Recompile lisp runtime" echo " -l Load cross-compiled kernel to make a new lisp kernel" echo " -B file Use this as the cross bootstrap file." echo " -G make Specifies the name of GNU make" echo " -X (break) before quitting the cross compilation (for debugging)" + echo " -i Interactive compile when compiling cross-compiler" } MAKE=make BREAK="" +INTERACTIVE=nil -while getopts "crlXB:G:" arg +while getopts "crlXiB:G:" arg do case $arg in c) CLEAN_DIR=yes ;; @@ -22,6 +24,7 @@ do B) BOOTSTRAP=$OPTARG ;; G) MAKE=$OPTARG ;; X) BREAK="(break)" ;; + i) INTERACTIVE=t ;; h | \?) usage; exit 1 ;; esac done @@ -98,7 +101,7 @@ $LISP "$@" -noinit -nositeinit <<EOF (load "target:tools/setup" :if-source-newer :load-source) (comf "target:tools/setup" :load t) -(setq *gc-verbose* nil *interactive* nil) +(setq *gc-verbose* nil *interactive* ${INTERACTIVE}) (load "$SCRIPT") ===================================== src/code/unix.lisp ===================================== --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -2501,7 +2501,10 @@ (defconstant ms_invalidate 2) ;; The return value from mmap that means mmap failed. -(defconstant map_failed (int-sap (1- (ash 1 vm:word-bits)))) +(defconstant map_failed + #-sparc64 (int-sap (1- (ash 1 vm:word-bits))) + #+sparc64 (ldb (byte 32 0) -1) + ) (defun unix-mmap (addr length prot flags fd offset) (declare (type (or null system-area-pointer) addr) @@ -2522,11 +2525,13 @@ (values nil (unix-errno)) (values result 0)))) +#-sparc64 (defun unix-munmap (addr length) (declare (type system-area-pointer addr) (type (unsigned-byte 32) length)) (syscall ("munmap" system-area-pointer size-t) t addr length)) +#-sparc64 (defun unix-mprotect (addr length prot) (declare (type system-area-pointer addr) (type (unsigned-byte 32) length) @@ -2534,6 +2539,7 @@ (syscall ("mprotect" system-area-pointer size-t int) t addr length prot)) +#-sparc64 (defun unix-msync (addr length flags) (declare (type system-area-pointer addr) (type (unsigned-byte 32) length) ===================================== src/compiler/generic/new-genesis.lisp ===================================== --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -290,17 +290,36 @@ ;; TODO: make this work for 64-bit (defun maybe-byte-swap (word) + (ecase vm:word-bits + (32 (maybe-byte-swap-32 word)) + (64 (maybe-byte-swap-64 word)))) + +(defun maybe-byte-swap-32 (word) (if (eq (c:backend-byte-order c:*native-backend*) (c:backend-byte-order c:*backend*)) word (locally (declare (type (unsigned-byte 32) word)) - (assert (= vm:word-bits 32)) (assert (= vm:byte-bits 8)) (logior (ash (ldb (byte 8 0) word) 24) (ash (ldb (byte 8 8) word) 16) (ash (ldb (byte 8 16) word) 8) (ldb (byte 8 24) word))))) +(defun maybe-byte-swap-64 (word) + (if (eq (c:backend-byte-order c:*native-backend*) + (c:backend-byte-order c:*backend*)) + word + (locally (declare (type (unsigned-byte 64) word)) + (assert (= vm:byte-bits 8)) + (logior (ash (ldb (byte 8 0) word) 56) + (ash (ldb (byte 8 8) word) 48) + (ash (ldb (byte 8 16) word) 40) + (ash (ldb (byte 8 24) word) 32) + (ash (ldb (byte 8 32) word) 24) + (ash (ldb (byte 8 40) word) 16) + (ash (ldb (byte 8 48) word) 8) + (ldb (byte 8 56) word))))) + (defun maybe-byte-swap-short (short) (if (eq (c:backend-byte-order c:*native-backend*) (c:backend-byte-order c:*backend*)) @@ -2275,7 +2294,7 @@ (ldb (byte 16 0) value)))))) ((#.c:sparc-fasl-file-implementation #.c:sparc64-fasl-file-implementation) - (let ((inst (maybe-byte-swap (sap-ref-32 sap 0)))) + (let ((inst (maybe-byte-swap-32 (sap-ref-32 sap 0)))) (ecase kind (:call (error "Can't deal with call fixups yet.")) @@ -2290,7 +2309,7 @@ (byte 10 0) inst)))) (setf (sap-ref-32 sap 0) - (maybe-byte-swap inst)))) + (maybe-byte-swap-32 inst)))) ((#.c:rt-fasl-file-implementation #.c:rt-afpa-fasl-file-implementation) (ecase kind ===================================== src/compiler/sparc64/arith.lisp ===================================== --- a/src/compiler/sparc64/arith.lisp +++ b/src/compiler/sparc64/arith.lisp @@ -1567,6 +1567,7 @@ ;; ;; See generic/vm-tran.lisp for the algorithm. +#+nil (define-vop (signed-truncate-by-mult fast-signed-binop) (:translate truncate) (:args (x :scs (signed-reg))) @@ -1612,6 +1613,7 @@ (unless (location= quo q) (move quo q))))) +#+nil (define-vop (unsigned-truncate-by-mult fast-signed-binop) (:translate truncate) (:args (x :scs (unsigned-reg))) ===================================== src/compiler/sparc64/parms.lisp ===================================== --- a/src/compiler/sparc64/parms.lisp +++ b/src/compiler/sparc64/parms.lisp @@ -92,7 +92,7 @@ (eval-when (compile load eval) -(defconstant word-bits 32 +(defconstant word-bits 64 "Number of bits per word where a word holds one lisp descriptor.") (defconstant byte-bits 8 @@ -163,7 +163,7 @@ (+ (byte-size single-float-significand-byte) 1)) (defconstant double-float-digits - (+ (byte-size double-float-significand-byte) word-bits 1)) + 53) (defconstant long-float-digits (+ (byte-size long-float-significand-byte) word-bits 1)) ===================================== src/lisp/Config.sparc64_sunc ===================================== --- a/src/lisp/Config.sparc64_sunc +++ b/src/lisp/Config.sparc64_sunc @@ -20,8 +20,8 @@ include Config.sparc_common ifdef FEATURE_SPARC_V9 # For SunStudio 11, use -xarch=v8plus. For SunStudio 12, that is # deprecated; use -m32 -xarch=sparc. -CC_V8PLUS = -xarch=sparc -AS_V8PLUS = -xarch=sparc +CC_V8PLUS = -m64 +AS_V8PLUS = -m64 endif ASSEM_SRC = sparc64-assem.S ===================================== 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 @@ -1,6 +1,19 @@ ;;; Cross-compile script to build a sparc core using x86 as the ;;; compiling system. This needs work! +(in-package "LISP") +(defun c::%%defconstant (name value doc source-location) + (when doc + (setf (documentation name 'variable) doc)) + (when (boundp name) + (unless (equalp (symbol-value name) value) + (warn "Constant ~S being redefined." name))) + (setf (symbol-value name) value) + (setf (info variable kind name) :constant) + (clear-info variable constant-value name) + (set-defvar-source-location name source-location) + name) + (in-package :cl-user) ;;; Rename the X86 package and backend so that new-backend does the @@ -191,7 +204,7 @@ :vm)))) syms)))) (frob OLD-VM:BYTE-BITS - OLD-VM:WORD-BITS + ;;OLD-VM:WORD-BITS OLD-VM:CHAR-BITS OLD-VM:CHAR-BYTES OLD-VM:LOWTAG-BITS View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/1b987a649d4cbeae93a764a9…

1 0

[Git][cmucl/cmucl][sparc64-dev] Use the default version if possible
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch sparc64-dev at cmucl / cmucl Commits: 1b987a64 by Raymond Toy at 2016-12-27T11:43:32-08:00 Use the default version if possible If -V isn't given, try to use the default, if possible. - - - - - 1 changed file: - bin/make-dist.sh Changes: ===================================== bin/make-dist.sh ===================================== --- a/bin/make-dist.sh +++ b/bin/make-dist.sh @@ -130,10 +130,15 @@ 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 +if [ -z "$VERSION" ]; then + # If a default version exists, use it. Otherwise this is an + # error---at least one of these must not be empty. + if [ -z "${DEFAULT_VERSION}" ]; then + echo "Version (-V) must be specified because default version cannot be determined." + usage + else + VERSION=${DEFAULT_VERSION} + fi fi if [ ! -d "$1" ] View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/1b987a649d4cbeae93a764a99…

1 0

[Git][cmucl/cmucl][master] 3 commits: Replace version arch os args with switches
by Raymond Toy 27 Dec '16

27 Dec '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 96739d95 by Raymond Toy at 2016-12-27T11:37:31-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. - - - - - 54eceec9 by Raymond Toy at 2016-12-27T11:38:10-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. - - - - - f6a7beae by Raymond Toy at 2016-12-27T11:42:52-08:00 Use the default version if possible If -V isn't given, try to use the default, if possible. - - - - - 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,23 @@ 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. 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 + DEFAULT_VERSION=`expr "${GIT_HASH}" : "snapshot-$.*$"` +fi + +if expr "X${GIT_HASH}" : 'X[0-9][0-9][a-f]' > /dev/null; then + DEFAULT_VERSION="${GIT_HASH}" +fi + +while getopts "G:O:I:M:bghSA:o:V:?" arg do case $arg in G) GROUP=$OPTARG ;; @@ -100,46 +116,28 @@ 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 +# Directory is required; exit if not given +if [ $# -lt 1 ]; then + usage +fi -if [ -n "${INSTALL_DIR}" ]; then - # Doing direct installation - if [ $# -lt 1 ]; then +if [ -z "$VERSION" ]; then + # If a default version exists, use it. Otherwise this is an + # error---at least one of these must not be empty. + if [ -z "${DEFAULT_VERSION}" ]; then + echo "Version (-V) must be specified because default version cannot be determined." 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 + VERSION=${DEFAULT_VERSION} fi fi @@ -167,6 +165,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/compare/2b0b4aaf2b48969906d3a474…

1 0

[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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs December 2016