cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[git] CMU Common Lisp branch master updated. snapshot-2013-04-13-gc6075eb
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 c6075ebc518f26e6e23ed7899110263f0b3544de (commit) via 032d311cc2ccce34ee8ba8d83495b22fae5fdc2e (commit) via b07a82baedbf4ed761c593cbd185a97f3fed4e36 (commit) via 57bca19079022f99696307ac6f44d33de038275d (commit) from 497b9b2d466859117a71b7988dc0c6f6eaacb26b (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 c6075ebc518f26e6e23ed7899110263f0b3544de Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu May 2 21:46:02 2013 -0700 Use clang instead of gcc on Mac OSX. diff --git a/src/lisp/Config.x86_darwin b/src/lisp/Config.x86_darwin index f50a857..e9ffbe5 100644 --- a/src/lisp/Config.x86_darwin +++ b/src/lisp/Config.x86_darwin @@ -2,6 +2,9 @@ include Config.x86_common +# Use clang on darwin. +CC = clang + # Compile code that will run on OSX 10.5 (Tiger) MIN_VER = -mmacosx-version-min=10.5 commit 032d311cc2ccce34ee8ba8d83495b22fae5fdc2e Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu May 2 21:43:09 2013 -0700 Add -M option to pass args to make. diff --git a/bin/build.sh b/bin/build.sh index 496d641..fa0b3df 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -96,6 +96,7 @@ usage () echo " The flags always include -noinit -nositeinit" echo " -R Force recompiling the C runtime. Normally, just runs make to " echo " recompile anything that has changed." + echo " -M opt Additional flags to be passed to make." exit 1 } @@ -127,13 +128,17 @@ buildit () $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } if [ "$REBUILD_LISP" = "yes" ]; then - $TOOLDIR/rebuild-lisp.sh $TARGET + if [ -z $MFLAGS ]; then + $TOOLDIR/rebuild-lisp.sh $TARGET + else + $TOOLDIR/rebuild-lisp.sh -M "$MFLAGS" $TARGET + fi else # Set the LANG to C. For whatever reason, if I (rtoy) don't # do this on my openSuSE system, any messages from gcc are # basically garbled. This should be harmless on other # systems. - LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } + LANG=C $MAKE -C $TARGET/lisp $MFLAGS $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } fi if [ "$BUILD_WORLD2" = "yes" ]; @@ -152,7 +157,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh" BUILD_POT="yes" UPDATE_TRANS= -while getopts "123PRo:b:v:uB:C:Ui:f:w:O:?" arg +while getopts "123PRo:b:v:uB:C:Ui:f:w:O:M:?" arg do case $arg in 1) ENABLE2="no" ;; @@ -172,6 +177,7 @@ do U) UPDATE_TRANS="yes";; O) OLDLISPFLAGS="$OLDLISPFLAGS $OPTARG" ;; R) REBUILD_LISP="yes";; + M) MFLAGS="$OPTARG" ;; \?) usage ;; esac commit b07a82baedbf4ed761c593cbd185a97f3fed4e36 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu May 2 21:42:51 2013 -0700 Add -M option to pass extra flags to make. Use getopts to parse the options and also print slightly better error messages. diff --git a/bin/rebuild-lisp.sh b/bin/rebuild-lisp.sh index d6aa6e9..1e49d01 100755 --- a/bin/rebuild-lisp.sh +++ b/bin/rebuild-lisp.sh @@ -1,14 +1,34 @@ #!/bin/sh +while getopts "M:h?" arg +do + case $arg in + M) MFLAGS="$OPTARG" ;; + h) usage ;; + \?) usage ;; + esac +done + +usage() +{ + echo "rebuild.-lisp.sh [-h?] [-M opts] target-directory" + echo " -h this help" + echo " -? this help" + echo " -M opts Options to pass to make" + +} + +shift `expr $OPTIND - 1` + if [ "$1" = "" ] then - echo "Usage: $0 target-directory" + usage exit 1 fi if [ ! -d "$1" ] then - echo "$1 isn't a directory" + echo "$1" must be a directory. exit 2 fi @@ -23,4 +43,4 @@ fi export MAKE -${MAKE} -C $TARGET/lisp clean && ${MAKE} -C $TARGET/lisp +${MAKE} -C $TARGET/lisp $MFLAGS clean && ${MAKE} -C $TARGET/lisp $MFLAGS commit 57bca19079022f99696307ac6f44d33de038275d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu May 2 20:15:57 2013 -0700 Include interr.h (and os.h) to get rid of a compiler warning about utf16_output being undeclared. diff --git a/src/lisp/print.c b/src/lisp/print.c index b4758d8..1898fee 100644 --- a/src/lisp/print.c +++ b/src/lisp/print.c @@ -11,6 +11,8 @@ #include "print.h" #include "lisp.h" #include "internals.h" +#include "os.h" +#include "interr.h" #include "monitor.h" #include "vars.h" #include "os.h" ----------------------------------------------------------------------- Summary of changes: bin/build.sh | 12 +++++++++--- bin/rebuild-lisp.sh | 26 +++++++++++++++++++++++--- src/lisp/Config.x86_darwin | 3 +++ src/lisp/print.c | 2 ++ 4 files changed, 37 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

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

08 Apr '15

1 0

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

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. 20e-3-g622b5df
by rtoy＠common-lisp.net 08 Apr '15

08 Apr '15

1 0

[git] CMU Common Lisp annotated tag snapshot-2013-07 created. snapshot-2013-07
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-07 has been created at f301f9439d696cdf8a78e81051aa8b1fe102423f (tag) tagging bb56dbb6572939222d731530c3045b4a87ee7f51 (commit) replaces snapshot-2013-06 tagged by Raymond Toy on Thu Jul 4 11:54:53 2013 -0700 - Log ----------------------------------------------------------------- Snapshot 2013-07 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlHVxQQACgkQJ5IjUmgZO7KWkACfQ5iLHsrs+dIPdupOMBKg2f8Y WvcAnjkqAU9PBgbA5Z/QYAZ1Se4G8H4w =Aai3 -----END PGP SIGNATURE----- Raymond Toy (5): Initialize some variables to get rid of some clang warnings. Add a herald for defsystem. Fix some compiler warnings about unused variables or variables that Update to asdf 3.0.2. Update from logs. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

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

08 Apr '15

1 0

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

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-07-2-g02e58f6
by cshapiro＠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 02e58f652b6626d5b71f84def88cd8cd2a25bffd (commit) from f36a31aaf95b60e2cc210648d951b41d3112a73a (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 02e58f652b6626d5b71f84def88cd8cd2a25bffd Author: Carl Shapiro <cshapiro(a)common-lisp.net> Date: Wed Jul 31 23:12:00 2013 -0700 Improve and clean-up some move VOPs. * Remove the name dependence on EAX in move-to-word/integer. * Change move-from-signed to do a fixnum check using one branch instead of two. * Remove move-from-signed and move-from-unsigned assembly routines and the commented out code that refers to them. diff --git a/src/assembly/x86/alloc.lisp b/src/assembly/x86/alloc.lisp index 32ec7af..2a90fe9 100644 --- a/src/assembly/x86/alloc.lisp +++ b/src/assembly/x86/alloc.lisp @@ -1,4 +1,4 @@ -;;; -*- Mode: LISP; Syntax: Common-Lisp; Base: 10; Package: x86 -*- +;;; -*- Package: X86 -*- ;;; ;;; ********************************************************************** ;;; This code was written as part of the CMU Common Lisp project at @@ -17,58 +17,7 @@ ;;; ;;; Debugged by Paul F. Werkowski -- Spring 1995. ;;; -(in-package :x86) - -;;;; From from signed/unsigned +(in-package "X86") -#+assembler ; we don't want a vop for this one. -(define-assembly-routine - (move-from-signed) - ((:temp eax unsigned-reg eax-offset) - (:temp ebx unsigned-reg ebx-offset)) - (inst mov ebx eax) - (inst shl ebx 1) - (inst jmp :o bignum) - (inst shl ebx 1) - (inst jmp :o bignum) - (inst ret) - BIGNUM - - (with-fixed-allocation (ebx bignum-type (+ bignum-digits-offset 1)) - (storew eax ebx bignum-digits-offset other-pointer-type)) - - (inst ret)) - -#+assembler ; we don't want a vop for this one either. -(define-assembly-routine - (move-from-unsigned) - ((:temp eax unsigned-reg eax-offset) - (:temp ebx unsigned-reg ebx-offset)) - - (inst test eax #xe0000000) - (inst jmp :nz bignum) - ;; Fixnum - (inst mov ebx eax) - (inst shl ebx 2) - (inst ret) - - BIGNUM - ;;; Note: On the mips port space for a two word bignum is always - ;;; allocated and the header size is set to either one or two words - ;;; as appropriate. On the mips port this is faster, and smaller - ;;; inline, but produces more garbage. The inline x86 version uses - ;;; the same approach, but here we save garbage and allocate the - ;;; smallest possible bignum. - (inst jmp :ns one-word-bignum) - (inst mov ebx eax) - - ;; Two word bignum - (with-fixed-allocation (ebx bignum-type (+ bignum-digits-offset 2)) - (storew eax ebx bignum-digits-offset other-pointer-type)) - (inst ret) - - ONE-WORD-BIGNUM - (with-fixed-allocation (ebx bignum-type (+ bignum-digits-offset 1)) - (storew eax ebx bignum-digits-offset other-pointer-type)) - (inst ret)) +;;; But we do everything inline now that we have a better pseudo-atomic. diff --git a/src/compiler/x86/move.lisp b/src/compiler/x86/move.lisp index 2ff54ee..e40d62d 100644 --- a/src/compiler/x86/move.lisp +++ b/src/compiler/x86/move.lisp @@ -232,20 +232,17 @@ ;;; Arg is a fixnum or bignum, figure out which and load if necessary. (define-vop (move-to-word/integer) - (:args (x :scs (descriptor-reg) :target eax)) + (:args (x :scs (descriptor-reg) :target y)) (:results (y :scs (signed-reg unsigned-reg))) (:note _N"integer to untagged word coercion") - (:temporary (:sc unsigned-reg :offset eax-offset - :from (:argument 0) :to (:result 0) :target y) eax) (:generator 4 - (move eax x) - (inst test al-tn 3) - (inst jmp :z fixnum) - (loadw y eax bignum-digits-offset other-pointer-type) + (inst test x 3) + (inst jmp :nz BIGNUM) + (move y x) + (inst sar y 2) (inst jmp done) - FIXNUM - (inst sar eax 2) - (move y eax) + BIGNUM + (loadw y x bignum-digits-offset other-pointer-type) DONE)) ;;; (define-move-vop move-to-word/integer :move @@ -278,45 +275,30 @@ ;;; Result may be a bignum, so we have to check. Use a worst-case cost to make ;;; sure people know they may be number consing. ;;; -#+nil (define-vop (move-from-signed) - (:args (x :scs (signed-reg unsigned-reg) :target eax)) - (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 0)) eax) - (:temporary (:sc unsigned-reg :offset ebx-offset :to (:result 0) :target y) - ebx) - (:temporary (:sc unsigned-reg :offset ecx-offset - :from (:argument 0) :to (:result 0)) ecx) - (:ignore ecx) + (:args (x :scs (signed-reg unsigned-reg) :to :save)) + (:temporary (:sc unsigned-reg) temp) (:results (y :scs (any-reg descriptor-reg))) (:note _N"signed word to integer coercion") - (:generator 20 - (move eax x) - (inst call (make-fixup 'move-from-signed :assembly-routine)) - (move y ebx))) -;;; -;;; Faster inline version, -(define-vop (move-from-signed) - (:args (x :scs (signed-reg unsigned-reg) :to :result)) - (:results (y :scs (any-reg descriptor-reg) :from :argument)) - (:note _N"signed word to integer coercion") (:node-var node) (:generator 20 - (assert (not (location= x y))) - (let ((bignum (gen-label)) - (done (gen-label))) - (inst mov y x) - (inst shl y 1) - (inst jmp :o bignum) - (inst shl y 1) - (inst jmp :o bignum) - (emit-label done) - - (assemble (*elsewhere*) - (emit-label bignum) - (with-fixed-allocation - (y bignum-type (+ bignum-digits-offset 1) node) - (storew x y bignum-digits-offset other-pointer-type)) - (inst jmp done))))) + (assert (not (location= x y))) + (assert (not (location= x temp))) + (assert (not (location= y temp))) + (let ((bignum (gen-label)) + (done (gen-label))) + (inst lea temp (make-ea :dword :base x :disp #x20000000)) + (inst cmp temp #x40000000) + (inst jmp :nb bignum) + (inst lea y (make-ea :dword :index x :scale 4)) + (emit-label done) + + (assemble (*elsewhere*) + (emit-label bignum) + (with-fixed-allocation (y bignum-type + (+ bignum-digits-offset 1) node) + (storew x y bignum-digits-offset other-pointer-type)) + (inst jmp done))))) ;;; (define-move-vop move-from-signed :move (signed-reg) (descriptor-reg)) @@ -325,23 +307,6 @@ ;;; Check for fixnum, and possibly allocate one or two word bignum result. Use ;;; a worst-case cost to make sure people know they may be number consing. ;;; -#+nil -(define-vop (move-from-unsigned) - (:args (x :scs (signed-reg unsigned-reg) :target eax)) - (:temporary (:sc unsigned-reg :offset eax-offset :from (:argument 0)) eax) - (:temporary (:sc unsigned-reg :offset ebx-offset :to (:result 0) :target y) - ebx) - (:temporary (:sc unsigned-reg :offset ecx-offset - :from (:argument 0) :to (:result 0)) ecx) - (:ignore ecx) - (:results (y :scs (any-reg descriptor-reg))) - (:note _N"unsigned word to integer coercion") - (:generator 20 - (move eax x) - (inst call (make-fixup 'move-from-unsigned :assembly-routine)) - (move y ebx))) -;;; -;;; Faster inline version. (define-vop (move-from-unsigned) (:args (x :scs (signed-reg unsigned-reg) :to :save)) (:temporary (:sc unsigned-reg) alloc) ----------------------------------------------------------------------- Summary of changes: src/assembly/x86/alloc.lisp | 57 ++-------------------------- src/compiler/x86/move.lisp | 87 +++++++++++++------------------------------ 2 files changed, 29 insertions(+), 115 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

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

08 Apr '15

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-75-g6b52c89
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 6b52c890ac41ba5deedd8b6ebaf33d4955fcfbd9 (commit) via 6f434b0e3a56af69c1e32eefc158cc74c5464da3 (commit) from fdc6db4b7af14ce1ceb6e38e92135335a4921fa3 (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 6b52c890ac41ba5deedd8b6ebaf33d4955fcfbd9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 16:59:44 2014 -0700 Use fdlibm atan2. diff --git a/src/code/irrat.lisp b/src/code/irrat.lisp index 4ea134e..5f24bf9 100644 --- a/src/code/irrat.lisp +++ b/src/code/irrat.lisp @@ -68,7 +68,7 @@ (def-math-rtn ("fdlibm_cos" %cos) 1) (def-math-rtn ("fdlibm_tan" %tan) 1) (def-math-rtn ("fdlibm_atan" %atan) 1) -(def-math-rtn "atan2" 2) +(def-math-rtn ("__ieee754_atan2" %atan2) 2) (def-math-rtn ("__ieee754_asin" %asin) 1) (def-math-rtn ("__ieee754_acos" %acos) 1) (def-math-rtn ("__ieee754_sinh" %sinh) 1) commit 6f434b0e3a56af69c1e32eefc158cc74c5464da3 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 16:59:14 2014 -0700 Compile the fdlibm atan2. . diff --git a/src/lisp/Config.x86_darwin b/src/lisp/Config.x86_darwin index d260368..a76280d 100644 --- a/src/lisp/Config.x86_darwin +++ b/src/lisp/Config.x86_darwin @@ -22,7 +22,8 @@ OS_SRC += k_sin.c k_cos.c k_tan.c s_sin.c s_cos.c s_tan.c sincos.c \ s_log1p.c s_expm1.c e_pow.c e_exp.c e_log.c \ e_acos.c e_asin.c s_atan.c \ e_cosh.c e_sinh.c s_tanh.c \ - e_acosh.c s_asinh.c e_atanh.c + e_acosh.c s_asinh.c e_atanh.c \ + e_atan2.c k_sin.o : k_sin.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< @@ -72,3 +73,6 @@ e_asinh.o : s_asinh.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< e_atanh.o : e_atanh.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< + +e_atan2.o : e_atan2.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< ----------------------------------------------------------------------- Summary of changes: src/code/irrat.lisp | 2 +- src/lisp/Config.x86_darwin | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs