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

[git] CMU Common Lisp annotated tag last-x87-snapshot created. begin-x87-removal
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, last-x87-snapshot has been created at 31e30f113bfab62e182cc725b29aca91f64e820d (tag) tagging 28740a75c3a9948d9a6fea93f4fffde1453ea665 (commit) replaces snapshot-2014-03 tagged by Raymond Toy on Sun Mar 30 09:11:05 2014 -0700 - Log ----------------------------------------------------------------- This is the last x87 snapshot. Support for x87 is being removed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlM4Qi4ACgkQJ5IjUmgZO7L4kgCgqYhLsOcBnFx39+0Vizq8fRVT suQAnj9nTGBy1rIOHP2xQzysEEgw7O5A =+BEk -----END PGP SIGNATURE----- Raymond Toy (13): Revert change for ticket 92. Add double-double-float-positive-infinity and Return the correct values for (log -0w0) and (log 0w0). Previously we Add unicode tests, based on the tests in src/i18n/tests. Remove these test files since they've been migrated to lisp-unit. First cut at adding PCL tests. Fix typos in eval-when cases. Add comments. Copy the PCL tests here, changing the package from PCL-TEST to Remove the tests and just use mk-defsystem to load the separate PCL Add comments. Note that this can't be run from a build; you have to Update from commit logs. Note dropping of x87 support after this snapshot. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-08-44-gac320f2
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 ac320f2c22d0532b7920257f0487c449028c81fc (commit) from 458231d178c7c98798c653f574b6aab839637bc1 (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 ac320f2c22d0532b7920257f0487c449028c81fc Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Sep 1 16:09:44 2014 -0700 Update from the commit logs. diff --git a/src/general-info/release-20f.txt b/src/general-info/release-20f.txt index 14c64b8..64e93a1 100644 --- a/src/general-info/release-20f.txt +++ b/src/general-info/release-20f.txt @@ -68,6 +68,26 @@ New in this release: FLOAT-SIGNALING-NAN-P. * Changed the printer to print "Signaling" instead of "Trapping" when printing a signaling NaN. + * Various issues with the switch to using fdlibm have been + fixed. The issues were mostly not signaling floating-point + exceptions in places where they were expected. + * Restore the x87 FPU support on Linux; these are required because + foreign functions and libraries can still use x87 even if cmucl + itself does not. This is not required on Darwin because x87 is + not used there. + * On the ppc port, handle FP exceptions a bit better by not + failing if cmucl is unable to interpret the instruction that + caused the exception. + * FLOAT-TRAPPING-NAN-P is deprecated and is replaced by + FLOAT-SIGNALING-NAN-P. These kinds of numbers are called + signaling NaNs, not trapping NaNs. + * Microoptimization for sparc in converting a double-float to a + 32-bit signed integer. + * The compiler can now derive the type of ROUND. (But more work is + needed.) + * Fix an issue with multi-processing destroy-process doesn't take + effect for a schedulable processbecause it has no run-reason + and/or arrest-reason. * ANSI compliance fixes: * The values on the branch cuts for the inverse trig and @@ -120,6 +140,7 @@ New in this release: * Ticket #105 fixed. * Ticket #101 fixed. * Ticket #106 fixed. + * Ticket #100 fixed. * Other changes: ----------------------------------------------------------------------- Summary of changes: src/general-info/release-20f.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2014-06-15-g4649f97
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 4649f97b516a36cb6c2a3b1bec99cccd086cbd59 (commit) from 731988d4e4ad9fb62bbf4aeae8e200644ac3113c (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 4649f97b516a36cb6c2a3b1bec99cccd086cbd59 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Jul 22 18:44:52 2014 -0700 Add rest of fdblim trig functios so that sincos is consistent with sin and cos. Just like on darwin/x86. diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index 9738f9b..d9d1bfd 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -74,12 +74,22 @@ OS_LIBS = -lSystem -lc -lm e_rem_pio2.o : e_rem_pio2.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< -OS_SRC += k_sin.c k_cos.c sincos.c +OS_SRC += k_sin.c k_cos.c k_tan.c s_sin.c s_cos.c s_tan.c sincos.c k_sin.o : k_sin.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< k_cos.o : k_cos.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< +k_tan.o : k_tan.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< + +s_sin.o : s_sin.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< +s_cos.o : s_cos.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< +s_tan.o : s_tan.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< + sincos.o : sincos.c $(CC) -c $(CFLAGS) $(CPPFLAGS) $(CC_REM_PIO2) $< ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.ppc_darwin | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) hooks/post-receive -- CMU Common Lisp

1 0

[git] CMU Common Lisp branch master updated. snapshot-2013-04-17-ge6aeed9
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 e6aeed9a036e71f217f5de8db8e497ec4a606253 (commit) from b50c602af76f80570156f402568fa24f144849d5 (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 e6aeed9a036e71f217f5de8db8e497ec4a606253 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat May 4 12:38:30 2013 -0700 Don't set CC. The default is good enough and we'll use either gcc on older systems or clang on newer ones. diff --git a/src/lisp/Config.x86_darwin b/src/lisp/Config.x86_darwin index e9ffbe5..39c09bd 100644 --- a/src/lisp/Config.x86_darwin +++ b/src/lisp/Config.x86_darwin @@ -2,9 +2,6 @@ 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 @@ -20,5 +17,3 @@ OS_LINK_FLAGS = -m32 $(MIN_VER) OS_LIBS = EXEC_FINAL_OBJ = exec-final.o - - ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.x86_darwin | 5 ----- 1 file changed, 5 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[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