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

[git] CMU Common Lisp branch master updated. snapshot-2014-06-64-g6ea8fc6
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 6ea8fc645c5c60634e864a2741ee897b93a4ef5f (commit) via 917655e7117a29aef38412f3d4eadaae159bebce (commit) from f399fc8dab36676d617b1fa7e1e2c70bc5ddbffa (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 6ea8fc645c5c60634e864a2741ee897b93a4ef5f Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 15:12:40 2014 -0700 Add parens around && expressions to silence a clang warning. diff --git a/src/lisp/e_cosh.c b/src/lisp/e_cosh.c index f33ec02..f022ec0 100644 --- a/src/lisp/e_cosh.c +++ b/src/lisp/e_cosh.c @@ -80,7 +80,7 @@ static double one = 1.0, half=0.5, huge = 1.0e300; /* |x| in [log(maxdouble), overflowthresold] */ lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x); if (ix<0x408633CE || - (ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d)) { + ((ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d))) { w = __ieee754_exp(half*fabs(x)); t = half*w; return t*w; diff --git a/src/lisp/e_sinh.c b/src/lisp/e_sinh.c index 16671a9..8444741 100644 --- a/src/lisp/e_sinh.c +++ b/src/lisp/e_sinh.c @@ -73,7 +73,7 @@ static double one = 1.0, shuge = 1.0e307; /* |x| in [log(maxdouble), overflowthresold] */ lx = *( (((*(unsigned*)&one)>>29)) + (unsigned*)&x); - if (ix<0x408633CE || (ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d)) { + if (ix<0x408633CE || ((ix==0x408633ce)&&(lx<=(unsigned)0x8fb9f87d))) { w = __ieee754_exp(0.5*fabs(x)); t = h*w; return t*w; commit 917655e7117a29aef38412f3d4eadaae159bebce Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Aug 2 14:46:44 2014 -0700 Use unions to access the high and low parts of a double and update routine names. * fdlibm.h: * Correct the names for sin, cos, and tan; they have fdlibm_ prefix. * Declare fdlibm_expm1 and __ieee754_exp. * e_cosh.c: * Use unions * Call fdlibm_expm1 instead of expm1. * e_sinh.c: * Use unions * Call fdlibm_expm1 instead of expm1. * s_tanh.c: * Use unions * Call fdlibm_expm1 instead of expm1. diff --git a/src/lisp/e_cosh.c b/src/lisp/e_cosh.c index 204017d..f33ec02 100644 --- a/src/lisp/e_cosh.c +++ b/src/lisp/e_cosh.c @@ -50,9 +50,11 @@ static double one = 1.0, half=0.5, huge = 1.0e300; double t,w; int ix; unsigned lx; + union { int i[2]; double d; } ux; /* High word of |x|. */ - ix = __HI(x); + ux.d = x; + ix = ux.i[HIWORD]; ix &= 0x7fffffff; /* x is INF or NaN */ @@ -60,7 +62,7 @@ static double one = 1.0, half=0.5, huge = 1.0e300; /* |x| in [0,0.5*ln2], return 1+expm1(|x|)^2/(2*exp(|x|)) */ if(ix<0x3fd62e43) { - t = expm1(fabs(x)); + t = fdlibm_expm1(fabs(x)); w = one+t; if (ix<0x3c800000) return w; /* cosh(tiny) = 1 */ return one+(t*t)/(w+w); diff --git a/src/lisp/e_sinh.c b/src/lisp/e_sinh.c index 8af8a11..16671a9 100644 --- a/src/lisp/e_sinh.c +++ b/src/lisp/e_sinh.c @@ -47,9 +47,11 @@ static double one = 1.0, shuge = 1.0e307; double t,w,h; int ix,jx; unsigned lx; + union { int i[2]; double d; } ux; /* High word of |x|. */ - jx = __HI(x); + ux.d = x; + jx = ux.i[HIWORD]; ix = jx&0x7fffffff; /* x is INF or NaN */ @@ -61,7 +63,7 @@ static double one = 1.0, shuge = 1.0e307; if (ix < 0x40360000) { /* |x|<22 */ if (ix<0x3e300000) /* |x|<2**-28 */ if(shuge+x>one) return x;/* sinh(tiny) = tiny with inexact */ - t = expm1(fabs(x)); + t = fdlibm_expm1(fabs(x)); if(ix<0x3ff00000) return h*(2.0*t-t*t/(t+one)); return h*(t+t/(t+one)); } diff --git a/src/lisp/fdlibm.h b/src/lisp/fdlibm.h index 180137b..325d7d4 100644 --- a/src/lisp/fdlibm.h +++ b/src/lisp/fdlibm.h @@ -48,8 +48,11 @@ extern int __kernel_rem_pio2(double*,double*,int,int,int,const int*); extern double __kernel_sin(double x, double y, int iy); extern double __kernel_cos(double x, double y); extern double __kernel_tan(double x, double y, int iy); -extern double sin(double x); -extern double cos(double x); -extern double tan(double x); +extern double fdlibm_sin(double x); +extern double fdlibm_cos(double x); +extern double fdlibm_tan(double x); +extern double fdlibm_expm1(double x); +extern double __ieee754_exp(double x); + #endif diff --git a/src/lisp/s_tanh.c b/src/lisp/s_tanh.c index 7d77c2e..6b77004 100644 --- a/src/lisp/s_tanh.c +++ b/src/lisp/s_tanh.c @@ -44,17 +44,19 @@ static double one=1.0, two=2.0, tiny = 1.0e-300; #endif #ifdef __STDC__ - double tanh(double x) + double fdlibm_tanh(double x) #else - double tanh(x) + double fdlibm_tanh(x) double x; #endif { double t,z; int jx,ix; + union { int i[2]; double d; } ux; /* High word of |x|. */ - jx = __HI(x); + ux.d = x; + jx = ux.i[HIWORD]; ix = jx&0x7fffffff; /* x is INF or NaN */ @@ -68,10 +70,10 @@ static double one=1.0, two=2.0, tiny = 1.0e-300; if (ix<0x3c800000) /* |x|<2**-55 */ return x*(one+x); /* tanh(small) = small */ if (ix>=0x3ff00000) { /* |x|>=1 */ - t = expm1(two*fabs(x)); + t = fdlibm_expm1(two*fabs(x)); z = one - two/(t+two); } else { - t = expm1(-two*fabs(x)); + t = fdlibm_expm1(-two*fabs(x)); z= -t/(t+two); } /* |x| > 22, return +-1 */ ----------------------------------------------------------------------- Summary of changes: src/lisp/e_cosh.c | 8 +++++--- src/lisp/e_sinh.c | 8 +++++--- src/lisp/fdlibm.h | 9 ++++++--- src/lisp/s_tanh.c | 12 +++++++----- 4 files changed, 23 insertions(+), 14 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. begin-x87-removal-5-g1dbe0c4
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 1dbe0c4b5e5e05cc6a9377bc3c6505a9a3e60efc (commit) via 29359293d89d79c7c0099917c93c98258fae12d1 (commit) from 0592141ab9256ca0382a501b418523194ed66e3c (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 1dbe0c4b5e5e05cc6a9377bc3c6505a9a3e60efc Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Apr 6 08:16:07 2014 -0700 Remove commented-out stuff and clean up comments. diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp index 93f1072..4b4e69b 100644 --- a/src/compiler/x86/c-call.lisp +++ b/src/compiler/x86/c-call.lisp @@ -111,12 +111,14 @@ (declare (ignore type)) (let ((num-results (result-state-num-results state))) (setf (result-state-num-results state) (1+ num-results)) + ;; The XMM registers start at 8. (my-make-wired-tn 'double-float 'double-reg (+ num-results 8)))) (def-alien-type-method (single-float :result-tn) (type state) (declare (ignore type)) (let ((num-results (result-state-num-results state))) (setf (result-state-num-results state) (1+ num-results)) + ;; The XMM registers start at 8. (my-make-wired-tn 'single-float 'single-reg (+ num-results 8)))) (def-alien-type-method (values :result-tn) (type state) diff --git a/src/compiler/x86/sse2-c-call.lisp b/src/compiler/x86/sse2-c-call.lisp index 641f0cb..edd226b 100644 --- a/src/compiler/x86/sse2-c-call.lisp +++ b/src/compiler/x86/sse2-c-call.lisp @@ -44,11 +44,12 @@ (:generator 0 (cond ((policy node (> space speed)) (move eax function) - ;; call_into_c has arranged for the result to be in ST(0) - ;; (aka fr0), so there's nothing we need to do now. The - ;; compiler will move fr0 to the appropriate XMM register. (inst call (make-fixup (extern-alien-name "call_into_c") :foreign)) (when (and results (location= (tn-ref-tn results) xmm0-tn)) + ;; If there is a float result from the foreign call, + ;; call_into_c has arranged for the result to be in XMM0, + ;; as a double. If we wanted a single float, do the + ;; conversion here. (sc-case (tn-ref-tn results) (single-reg (inst cvtsd2ss xmm0-tn xmm0-tn)) @@ -57,42 +58,21 @@ ;; the result as a double. )))) (t - ;; Setup the NPX for C; all the FP registers need to be - ;; empty; pop them all. - #+nil - (dotimes (i 8) - (fp-pop)) - (inst call function) ;; To give the debugger a clue. XX not really internal-error? (note-this-location vop :internal-error) - ;; Restore the NPX for lisp; insure no regs are empty. But - ;; we only do 7 registers here. - #+nil - (dotimes (i 7) - (inst fldz)) - - (cond ((and results - (location= (tn-ref-tn results) xmm0-tn)) - ;; If there's a float result, it would have been - ;; returned in fr0, which is now in fr7, thanks to - ;; the fldz's above. Swap fr7 with fr0. The - ;; compiler will arrange to move fr0 to the - ;; appropriate XMM register. - #+nil - (inst fxch fr7-tn) - (sc-case (tn-ref-tn results) - (single-reg - (inst fstp (ea-for-sf-stack temp-single)) - (inst movss xmm0-tn (ea-for-sf-stack temp-single))) - (double-reg - (inst fstpd (ea-for-df-stack temp-double)) - (inst movsd xmm0-tn (ea-for-df-stack temp-double))))) - (t - ;; Fill up the last x87 register - #+nil - (inst fldz))))))) + (when (and results + (location= (tn-ref-tn results) xmm0-tn)) + ;; If there's a float result, it would have been returned + ;; in fr0 according to the ABI. We want it in xmm0. + (sc-case (tn-ref-tn results) + (single-reg + (inst fstp (ea-for-sf-stack temp-single)) + (inst movss xmm0-tn (ea-for-sf-stack temp-single))) + (double-reg + (inst fstpd (ea-for-df-stack temp-double)) + (inst movsd xmm0-tn (ea-for-df-stack temp-double))))))))) (define-vop (alloc-number-stack-space) (:info amount) diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index a0222c5..b01fa5f 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -98,17 +98,6 @@ FUNCDEF(call_into_c) /* Save the return lisp address in ebx */ popl %ebx -#if 0 -/* Setup the NPX for C */ - fstp %st(0) - fstp %st(0) - fstp %st(0) - fstp %st(0) - fstp %st(0) - fstp %st(0) - fstp %st(0) - fstp %st(0) -#endif call *%eax # normal callout using Lisp stack movl %eax,%ecx # remember integer return value @@ -121,17 +110,6 @@ FUNCDEF(call_into_c) jne Lfp_rtn_value /* The return value is in eax, or eax,edx? */ -#if 0 -/* Setup the NPX stack for lisp */ - fldz # insure no regs are empty - fldz - fldz - fldz - fldz - fldz - fldz - fldz -#endif no_fldz: /* Restore the return value */ movl %ecx,%eax # maybe return value @@ -141,18 +119,13 @@ no_fldz: jmp *%ebx Lfp_rtn_value: -#if 0 -/* The return result is in st(0) */ -/* Setup the NPX stack for lisp, placing the result in st(0) */ - fldz # insure no regs are empty - fldz - fldz - fldz - fldz - fldz - fldz - fxch %st(7) # move the result back to st(0) -#endif + +/* + * The float result is in st(0). We want it in xmm0. For + * consistency, save st(0) out as a double and load it into xmm0 as a + * double. The call-out vop will arrange to convert it to a single-float + * if necessary. + */ subl $8, %esp # Space for a double float fstpl 0(%esp) movsd 0(%esp), %xmm0 @@ -208,17 +181,6 @@ x87_save: fldcw (%esp) # Recover modes popl %eax npx_save_done: -#if 0 - /* Is this still necessary with sse2? */ - fldz # insure no FP regs are empty - fldz - fldz - fldz - fldz - fldz - fldz - fldz -#endif /* Save C regs: ebx esi edi */ pushl %ebx pushl %esi commit 29359293d89d79c7c0099917c93c98258fae12d1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Apr 5 14:46:17 2014 -0700 Simplify call-out for sse2. For sse2, we don't need to do the fldz/fstp dance when doing a foreign function call. A cross-compile is needed! * src/bootfiles/20e/boot-2014-04-cross-x86.lisp: * Cross-compile script to enable these changes. * src/compiler/x86/c-call.lisp: * Make the float result tn be xmm registers, not x87 fpu registers. * src/compiler/x86/sse2-c-call.lisp: * Simplify call-out not to use fldz/fstp except for the minimum required for the 32-bit ABI. * src/lisp/x86-assem.S * Comment out the fstp/fldz insts that aren't needed for SSE2. diff --git a/src/bootfiles/20e/boot-2014-04-cross-x86.lisp b/src/bootfiles/20e/boot-2014-04-cross-x86.lisp new file mode 100644 index 0000000..7bfecf8 --- /dev/null +++ b/src/bootfiles/20e/boot-2014-04-cross-x86.lisp @@ -0,0 +1,8 @@ +;; Cross-compile script needed for updating the SSE2 call-out VOP and +;; x86 call_into_c. In both places, we remove the need to do the fldz +;; and fstp dance to set up the FPU for C and Lisp. SSE2 doesn't use +;; the FPU. + +#+x86 +(load "target:tools/cross-scripts/cross-x86-x86.lisp") + diff --git a/src/compiler/x86/c-call.lisp b/src/compiler/x86/c-call.lisp index 4554a0e..93f1072 100644 --- a/src/compiler/x86/c-call.lisp +++ b/src/compiler/x86/c-call.lisp @@ -111,13 +111,13 @@ (declare (ignore type)) (let ((num-results (result-state-num-results state))) (setf (result-state-num-results state) (1+ num-results)) - (my-make-wired-tn 'double-float 'double-reg (* num-results 2)))) + (my-make-wired-tn 'double-float 'double-reg (+ num-results 8)))) (def-alien-type-method (single-float :result-tn) (type state) (declare (ignore type)) (let ((num-results (result-state-num-results state))) (setf (result-state-num-results state) (1+ num-results)) - (my-make-wired-tn 'single-float 'single-reg (* num-results 2)))) + (my-make-wired-tn 'single-float 'single-reg (+ num-results 8)))) (def-alien-type-method (values :result-tn) (type state) (let ((values (alien-values-type-values type))) diff --git a/src/compiler/x86/sse2-c-call.lisp b/src/compiler/x86/sse2-c-call.lisp index a5bd80f..641f0cb 100644 --- a/src/compiler/x86/sse2-c-call.lisp +++ b/src/compiler/x86/sse2-c-call.lisp @@ -34,6 +34,8 @@ :from :eval :to :result) ecx) (:temporary (:sc unsigned-reg :offset edx-offset :from :eval :to :result) edx) + (:temporary (:sc single-stack) temp-single) + (:temporary (:sc double-stack) temp-double) (:node-var node) (:vop-var vop) (:save-p t) @@ -45,10 +47,19 @@ ;; call_into_c has arranged for the result to be in ST(0) ;; (aka fr0), so there's nothing we need to do now. The ;; compiler will move fr0 to the appropriate XMM register. - (inst call (make-fixup (extern-alien-name "call_into_c") :foreign))) + (inst call (make-fixup (extern-alien-name "call_into_c") :foreign)) + (when (and results (location= (tn-ref-tn results) xmm0-tn)) + (sc-case (tn-ref-tn results) + (single-reg + (inst cvtsd2ss xmm0-tn xmm0-tn)) + (double-reg + ;; Nothing needed for double because call_into_c saved + ;; the result as a double. + )))) (t ;; Setup the NPX for C; all the FP registers need to be ;; empty; pop them all. + #+nil (dotimes (i 8) (fp-pop)) @@ -58,19 +69,29 @@ ;; Restore the NPX for lisp; insure no regs are empty. But ;; we only do 7 registers here. + #+nil (dotimes (i 7) (inst fldz)) (cond ((and results - (location= (tn-ref-tn results) fr0-tn)) + (location= (tn-ref-tn results) xmm0-tn)) ;; If there's a float result, it would have been ;; returned in fr0, which is now in fr7, thanks to ;; the fldz's above. Swap fr7 with fr0. The ;; compiler will arrange to move fr0 to the ;; appropriate XMM register. - (inst fxch fr7-tn)) + #+nil + (inst fxch fr7-tn) + (sc-case (tn-ref-tn results) + (single-reg + (inst fstp (ea-for-sf-stack temp-single)) + (inst movss xmm0-tn (ea-for-sf-stack temp-single))) + (double-reg + (inst fstpd (ea-for-df-stack temp-double)) + (inst movsd xmm0-tn (ea-for-df-stack temp-double))))) (t ;; Fill up the last x87 register + #+nil (inst fldz))))))) (define-vop (alloc-number-stack-space) diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index 57b69c0..a0222c5 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -98,6 +98,7 @@ FUNCDEF(call_into_c) /* Save the return lisp address in ebx */ popl %ebx +#if 0 /* Setup the NPX for C */ fstp %st(0) fstp %st(0) @@ -107,6 +108,7 @@ FUNCDEF(call_into_c) fstp %st(0) fstp %st(0) fstp %st(0) +#endif call *%eax # normal callout using Lisp stack movl %eax,%ecx # remember integer return value @@ -119,6 +121,7 @@ FUNCDEF(call_into_c) jne Lfp_rtn_value /* The return value is in eax, or eax,edx? */ +#if 0 /* Setup the NPX stack for lisp */ fldz # insure no regs are empty fldz @@ -128,6 +131,7 @@ FUNCDEF(call_into_c) fldz fldz fldz +#endif no_fldz: /* Restore the return value */ movl %ecx,%eax # maybe return value @@ -137,6 +141,7 @@ no_fldz: jmp *%ebx Lfp_rtn_value: +#if 0 /* The return result is in st(0) */ /* Setup the NPX stack for lisp, placing the result in st(0) */ fldz # insure no regs are empty @@ -147,6 +152,11 @@ Lfp_rtn_value: fldz fldz fxch %st(7) # move the result back to st(0) +#endif + subl $8, %esp # Space for a double float + fstpl 0(%esp) + movsd 0(%esp), %xmm0 + addl $8, %esp /* Don't need to restore eax as the result is in st(0) */ @@ -198,6 +208,7 @@ x87_save: fldcw (%esp) # Recover modes popl %eax npx_save_done: +#if 0 /* Is this still necessary with sse2? */ fldz # insure no FP regs are empty fldz @@ -207,7 +218,7 @@ npx_save_done: fldz fldz fldz - +#endif /* Save C regs: ebx esi edi */ pushl %ebx pushl %esi ----------------------------------------------------------------------- Summary of changes: src/bootfiles/20e/boot-2014-04-cross-x86.lisp | 8 ++++ src/compiler/x86/c-call.lisp | 6 ++- src/compiler/x86/sse2-c-call.lisp | 51 +++++++++++++------------ src/lisp/x86-assem.S | 49 ++++++------------------ 4 files changed, 49 insertions(+), 65 deletions(-) create mode 100644 src/bootfiles/20e/boot-2014-04-cross-x86.lisp hooks/post-receive -- CMU Common Lisp

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

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 a923563fe3475ea90faa7e8e3c378436f41daa39 (commit) from c6075ebc518f26e6e23ed7899110263f0b3544de (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 a923563fe3475ea90faa7e8e3c378436f41daa39 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat May 4 12:35:32 2013 -0700 Clean up variables. Config.sparc_common:: * Use += instead of = for CPPFLAGS and CFLAGS Config.sparc_gcc: * Move options from CC to CFLAGS. Config.sparc_gcc: * Move options from CC to CFLAGS. * Add DEPEND_FLAGS with appropriate options. diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index 16f99fb..89e2de0 100644 --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -46,10 +46,10 @@ ifdef FEATURE_UNICODE UNICODE = -DUNICODE endif -CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) +CPPFLAGS += -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) -CFLAGS = -g $(CC_V8PLUS) +CFLAGS += -g $(CC_V8PLUS) NM = $(PATH1)/solaris-nm ASSEM_SRC = sparc-assem.S diff --git a/src/lisp/Config.sparc_gcc b/src/lisp/Config.sparc_gcc index d08af18..da6d06e 100644 --- a/src/lisp/Config.sparc_gcc +++ b/src/lisp/Config.sparc_gcc @@ -24,7 +24,8 @@ endif # and SIGSEGV) to lisp properly. # -CC = gcc -O -Wall -CPP = gcc -E +CC = gcc +CPP = gcc +CFLAGS += -O -Wall DEPEND_FLAGS = -MM ASFLAGS = -g -traditional-cpp $(AS_V8PLUS) diff --git a/src/lisp/Config.sparc_sunc b/src/lisp/Config.sparc_sunc index 1072f7b..e1614e6 100644 --- a/src/lisp/Config.sparc_sunc +++ b/src/lisp/Config.sparc_sunc @@ -20,7 +20,8 @@ CC_V8PLUS = -m32 -xarch=sparc AS_V8PLUS = -m32 -xarch=sparc endif -CC = cc -xlibmieee -O -CPP = cc -E -DEPEND_FLAGS = -xM +CC = cc +CPP = cc +CFLAGS += -xlibmieee -O +DEPEND_FLAGS = -E -xM ASFLAGS = $(AS_V8PLUS) ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.sparc_common | 4 ++-- src/lisp/Config.sparc_gcc | 5 +++-- src/lisp/Config.sparc_sunc | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) hooks/post-receive -- CMU Common Lisp

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

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 497b9b2d466859117a71b7988dc0c6f6eaacb26b (commit) from 99250b40fa0b1f424a9a1f458060a16d698c71d8 (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 497b9b2d466859117a71b7988dc0c6f6eaacb26b Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu May 2 20:15:16 2013 -0700 Just remove a blank line and reformat a strangely formatted line. diff --git a/src/lisp/gencgc.c b/src/lisp/gencgc.c index 9bdc16a..708e2fa 100644 --- a/src/lisp/gencgc.c +++ b/src/lisp/gencgc.c @@ -7076,12 +7076,9 @@ verify_space(lispobj * start, size_t words) if (Pointerp(thing)) { int page_index = find_page_index((void *) thing); int to_readonly_space = (READ_ONLY_SPACE_START <= thing && - thing < - - SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); + thing < SymbolValue(READ_ONLY_SPACE_FREE_POINTER)); unsigned long to_static_space = ((unsigned long) static_space <= thing - && thing < SymbolValue(STATIC_SPACE_FREE_POINTER)); /* Does it point to the dynamic space? */ ----------------------------------------------------------------------- Summary of changes: src/lisp/gencgc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) hooks/post-receive -- CMU Common Lisp

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

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 d671c3595768543efbf2b01ddac321c9d87936af (commit) from a2579ceae31fe7072e417e51d2045f63add281c2 (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 d671c3595768543efbf2b01ddac321c9d87936af Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Jul 1 20:17:02 2013 -0700 Add a herald for defsystem. diff --git a/src/contrib/defsystem/defsystem.lisp b/src/contrib/defsystem/defsystem.lisp index 0f9be1b..198c909 100644 --- a/src/contrib/defsystem/defsystem.lisp +++ b/src/contrib/defsystem/defsystem.lisp @@ -5492,4 +5492,9 @@ nil) (format t "done.~%"))) +#+cmu +(setf (getf ext:*herald-items* :defsystem) + `(,#'(lambda (stream) + (write-string (intl:gettext " Defsystem ") stream) + (write-string *defsystem-version*)))) ;;; end of file -- defsystem.lisp -- ----------------------------------------------------------------------- Summary of changes: src/contrib/defsystem/defsystem.lisp | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- CMU Common Lisp

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

[git] CMU Common Lisp branch master updated. snapshot-2014-06-26-g13f320d
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 13f320d9568705f58010d456b957917b2d2c62c6 (commit) from 7e56a8c7ebb5b33e2d755ef725900fd4310ffc3e (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 13f320d9568705f58010d456b957917b2d2c62c6 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jul 31 15:36:12 2014 -0700 Ignore emacs ~ files and fasls. diff --git a/.gitignore b/.gitignore index 614b6ed..270ed56 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,16 @@ sparc-[234] sparc-8bit-[234] build-* +# Ignore emacs files +*~ + +# Ignore fasls +*.fasl +*.sse2f +*.x86f +*.ppcf +*.sparcf + # Ignore files generated by TeX src/docs/cmu-user/*.aux src/docs/cmu-user/*.cdx ----------------------------------------------------------------------- Summary of changes: .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp annotated tag release-20e created. release-20e
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, release-20e has been created at aae88c72564e5073fc47c26383db5ef2f7ca16a8 (tag) tagging bc828bed51339b951d84d2a264adf0221172f126 (commit) replaces snapshot-2013-09 tagged by Raymond Toy on Sat Sep 28 07:43:33 2013 -0700 - Log ----------------------------------------------------------------- Release 20e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlJG6x4ACgkQJ5IjUmgZO7I/3gCgo4r1uuBbV0u/oPD/vUmFp9s+ b+AAn0acCjDrByiqMYTeekZHl8MKIf46 =dBUk -----END PGP SIGNATURE----- Raymond Toy (9): Change Sparc default variant to sparc_sunc instead of sparc_gcc. Allow disabling the use of git for the file-comment. Set lvshort to solaris too if lisp_variant=sparc*. Support all sun4 archs, not just sun4u. (sun4v is T1). Update for new documentation. Update for release 20e. Update to date to Oct 2013, 20e. Make :plus-integer actually print + or - as documented. Update for 20e. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-09-6-gaca64f0
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 aca64f0932d5ae34c1dca7d7819dd4a6319a7a5c (commit) from 2cf92cd01a7f68639b9fc970a69547c6427dfbc4 (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 aca64f0932d5ae34c1dca7d7819dd4a6319a7a5c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Sep 21 12:07:23 2013 -0700 Update for release 20e. * src/compiler/byte-comp.lisp * Update fasl file version to 20e * bootfiles/20d/boot-20e.lisp * Use this during a normal compile to update to 20e. diff --git a/src/bootfiles/20d/boot-20e.lisp b/src/bootfiles/20d/boot-20e.lisp new file mode 100644 index 0000000..b40a118 --- /dev/null +++ b/src/bootfiles/20d/boot-20e.lisp @@ -0,0 +1,68 @@ +;;;; +;;;; Boot file for changing the fasl file version numbers to 20e. +;;;; + +(in-package :c) + +(setf lisp::*enable-package-locked-errors* nil) + +;;; +;;; Note that BYTE-FASL-FILE-VERSION is a constant. +;;; +;;; (Be sure to change BYTE-FASL-FILE-VERSION in +;;; compiler/byte-comp.lisp to the correct value too!) +;;; +#-cmu20e +(setf (symbol-value 'byte-fasl-file-version) #x20e) +#-cmu20e +(setf (backend-fasl-file-version *target-backend*) #x20e) + +;;; +;;; Don't check fasl versions in the compiling Lisp because we'll +;;; load files compiled with the new version numbers. +;;; +#-cmu20e +(setq lisp::*skip-fasl-file-version-check* t) + +;;; +;;; This is here because BYTE-FASL-FILE-VERSION is constant-folded in +;;; OPEN-FASL-FILE. To make the new version number take effect, we +;;; have to redefine the function. +;;; +#-cmu20e +(defun open-fasl-file (name where &optional byte-p) + (declare (type pathname name)) + (let* ((stream (open name :direction :output + :if-exists :new-version + :element-type '(unsigned-byte 8) + :class 'binary-text-stream)) + (res (make-fasl-file :stream stream))) + (multiple-value-bind + (version f-vers f-imp) + (if byte-p + (values "Byte code" + byte-fasl-file-version + (backend-byte-fasl-file-implementation *backend*)) + (values (backend-version *backend*) + (backend-fasl-file-version *backend*) + (backend-fasl-file-implementation *backend*))) + (format stream + "FASL FILE output from ~A.~@ + Compiled ~A on ~A~@ + Compiler ~A, Lisp ~A~@ + Targeted for ~A, FASL version ~X~%" + where + (ext:format-universal-time nil (get-universal-time)) + (machine-instance) compiler-version + (lisp-implementation-version) + version f-vers) + ;; + ;; Terminate header. + (dump-byte 255 res) + ;; + ;; Specify code format. + (dump-fop 'lisp::fop-long-code-format res) + (dump-byte f-imp res) + (dump-unsigned-32 f-vers res)) + res)) + diff --git a/src/compiler/byte-comp.lisp b/src/compiler/byte-comp.lisp index b89c70b..49810d6 100644 --- a/src/compiler/byte-comp.lisp +++ b/src/compiler/byte-comp.lisp @@ -38,7 +38,7 @@ ;; 0-9 followed by a single hex digit in the range a-f. Then the ;; version looks like a decimal number followed by a minor release ;; letter of a to f. -(defconstant byte-fasl-file-version #x20d) +(defconstant byte-fasl-file-version #x20e) (let* ((version-string (format nil "~X" byte-fasl-file-version))) ;; Add :cmu<n> to *features* ----------------------------------------------------------------------- Summary of changes: src/bootfiles/{20b/boot-20c.lisp => 20d/boot-20e.lisp} | 14 +++++++------- src/compiler/byte-comp.lisp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) copy src/bootfiles/{20b/boot-20c.lisp => 20d/boot-20e.lisp} (89%) hooks/post-receive -- CMU Common Lisp

1 0