Index: /trunk/ccl/level-0/l0-float.lisp
===================================================================
--- /trunk/ccl/level-0/l0-float.lisp	(revision 391)
+++ /trunk/ccl/level-0/l0-float.lisp	(revision 392)
@@ -344,6 +344,6 @@
     ; maybe do usual first, catching error
     (if (not (or (bignump num)(bignump den)))
-      (with-stack-short-floats ((fnum num)
-				(fden den))       
+      (ppc32::with-stack-short-floats ((fnum num)
+				       (fden den))       
         (%short-float/-2! fnum fden result))
       (let* ((numlen (integer-length num))
@@ -355,6 +355,6 @@
                  #|(not (minusp exp))|# 
                  (<= (abs exp) IEEE-single-float-mantissa-width))
-          (with-stack-short-floats ((fnum num)
-				    (fden den))
+          (ppc32::with-stack-short-floats ((fnum num)
+					   (fden den))
             (%short-float/-2! fnum fden result))
           (if (> exp IEEE-single-float-mantissa-width)
@@ -386,5 +386,5 @@
 
 
-
+#+ppc32-target
 (defun %short-float (number &optional result)
   (number-case number
@@ -399,4 +399,13 @@
     (ratio
      (%short-float-ratio number result))))
+
+#+ppc64-target
+(defun %short-float (number)
+  (number-case number
+    (short-float number)
+    (double-float (%double-float->short-float number))
+    (fixnum (%fixnum-sfloat number))
+    (bignum (%bignum-sfloat number))
+    (ratio (%short-float-ratio number))))
 
 
@@ -508,5 +517,5 @@
     (if (typep x 'double-float)
       (%double-float-sin! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
         (%single-float-sin! sx (%make-sfloat))))))
 
@@ -519,5 +528,5 @@
     (if (typep x 'double-float)
       (%double-float-cos! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
         (%single-float-cos! sx (%make-sfloat))))))
 
@@ -527,5 +536,5 @@
     (if (typep x 'double-float)
       (%double-float-tan! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
         (%single-float-tan! sx (%make-sfloat))))))
 
@@ -540,5 +549,5 @@
                                  (dx x))
         (%df-atan2 dy dx))
-      (with-stack-short-floats ((sy y)
+      (ppc32::with-stack-short-floats ((sy y)
                                 (sx x))
         (%sf-atan2 sy sx)))
@@ -549,5 +558,5 @@
       (if (typep y 'double-float)
         (%double-float-atan! y (%make-dfloat))
-        (with-stack-short-floats ((sy y))
+        (ppc32::with-stack-short-floats ((sy y))
           (%single-float-atan! sy (%make-sfloat)))))))
 
@@ -585,5 +594,5 @@
          (%double-float-log! dx (%make-dfloat)))))
     (t
-     (with-stack-short-floats ((sx x))
+     (ppc32::with-stack-short-floats ((sx x))
        (if (minusp x)
          (complex (%single-float-log! (%%short-float-abs sx sx) (%make-sfloat))
@@ -597,5 +606,5 @@
     (complex (* (exp (realpart x)) (cis (imagpart x))))
     (double-float (%double-float-exp! x (%make-dfloat)))
-    (t (with-stack-short-floats ((sx x))
+    (t (ppc32::with-stack-short-floats ((sx x))
          (%single-float-exp! sx (%make-sfloat))))))
 
@@ -614,5 +623,5 @@
                                       (e1 e))
              (%double-float-expt! b1 e1 (%make-dfloat)))
-           (with-stack-short-floats ((b1 b)
+           (ppc32::with-stack-short-floats ((b1 b)
                                      (e1 e))
              (%single-float-expt! b1 e1 (%make-sfloat)))))
@@ -635,5 +644,5 @@
                           (* (setq b (isqrt d)) b)))))
          (/ a b))          
-        (t (with-stack-short-floats ((f1))
+        (t (ppc32::with-stack-short-floats ((f1))
              (fsqrt (%short-float x f1))))))
 
@@ -677,5 +686,5 @@
         (%double-float-acos! x (%make-sfloat))
         (- double-float-half-pi (asin x))))
-    (with-stack-short-floats ((sx x))
+    (ppc32::with-stack-short-floats ((sx x))
       (locally
           (declare (type short-float sx))
Index: /trunk/ccl/level-0/l0-numbers.lisp
===================================================================
--- /trunk/ccl/level-0/l0-numbers.lisp	(revision 391)
+++ /trunk/ccl/level-0/l0-numbers.lisp	(revision 392)
@@ -424,5 +424,5 @@
   (if (and (eq int 0)(= sfloat 0.0s0))
     0
-    (with-stack-short-floats ((tem int))
+    (ppc32::with-stack-short-floats ((tem int))
       (if (= tem sfloat)
         0
@@ -988,5 +988,5 @@
                      (%double-float--2 fnum (%double-float*-2! (%double-float res f2) ,divisor f2))))))
        (truncate-rat-sfloat (number divisor)
-         `(with-stack-short-floats ((fnum ,number)
+         `(ppc32::with-stack-short-floats ((fnum ,number)
                                     (f2))
            (let ((res (%unary-truncate (%short-float/-2! fnum ,divisor f2))))
@@ -1028,5 +1028,5 @@
                      (number-case divisor
                        (short-float
-                        (with-stack-short-floats ((f2))
+                        (ppc32::with-stack-short-floats ((f2))
                           (let ((res (%unary-truncate (%short-float/-2! number divisor f2))))
                             (values res 
@@ -1035,5 +1035,5 @@
                                      (%short-float*-2! (%short-float res f2) divisor f2))))))
                        ((fixnum bignum ratio)
-                        (with-stack-short-floats ((fdiv divisor)
+                        (ppc32::with-stack-short-floats ((fdiv divisor)
                                                   (f2))
                           (let ((res (%unary-truncate (%short-float/-2! number fdiv f2))))
@@ -1085,5 +1085,5 @@
          (%unary-truncate (%double-float/-2! fnum ,divisor f2))))
      (truncate-rat-sfloat (number divisor)
-       `(with-stack-short-floats ((fnum ,number)
+       `(ppc32::with-stack-short-floats ((fnum ,number)
                                       (f2))
          (%unary-truncate (%short-float/-2! fnum ,divisor f2)))))
@@ -1139,10 +1139,10 @@
                     (number-case divisor
                       ((fixnum bignum ratio)
-                       (with-stack-short-floats ((fdiv divisor)
+                       (ppc32::with-stack-short-floats ((fdiv divisor)
                                                  (f2))
                          (let ((res (%unary-truncate (%short-float/-2! number fdiv f2))))
                            RES)))
                       (short-float
-                       (with-stack-short-floats ((ddiv divisor)
+                       (ppc32::with-stack-short-floats ((ddiv divisor)
                                                       (f2))
                          (%unary-truncate (%short-float/-2! number ddiv f2))))
Index: /trunk/ccl/level-1/l1-numbers.lisp
===================================================================
--- /trunk/ccl/level-1/l1-numbers.lisp	(revision 391)
+++ /trunk/ccl/level-1/l1-numbers.lisp	(revision 392)
@@ -431,5 +431,5 @@
 (defun %single-float-expt! (b e result)
   (declare (single-float b e result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float temp (#_powf b e))
     (%sf-check-exception-2 'expt b e (%ffi-exception-status))
@@ -456,5 +456,5 @@
 (defun %single-float-sin! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_sinf n))
     (%sf-check-exception-1 'sin n (%ffi-exception-status))
@@ -479,5 +479,5 @@
 (defun %single-float-cos! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_cosf n))
     (%sf-check-exception-1 'cos n (%ffi-exception-status))
@@ -502,5 +502,5 @@
 (defun %single-float-acos! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_acosf n))
     (%sf-check-exception-1 'acos n (%ffi-exception-status))
@@ -525,5 +525,5 @@
 (defun %single-float-asin! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_asinf n))
     (%sf-check-exception-1 'asin n (%ffi-exception-status))
@@ -548,5 +548,5 @@
 (defun %single-float-cosh! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_coshf n))
     (%sf-check-exception-1 'cosh n (%ffi-exception-status))
@@ -571,5 +571,5 @@
 (defun %single-float-log! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_logf n))
     (%sf-check-exception-1 'log n (%ffi-exception-status))
@@ -594,5 +594,5 @@
 (defun %single-float-tan! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_tanf n))
     (%sf-check-exception-1 'tan n (%ffi-exception-status))
@@ -618,5 +618,5 @@
 (defun %single-float-atan! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_atanf n))
     (%sf-check-exception-1 'atan n (%ffi-exception-status))
@@ -642,5 +642,5 @@
 (defun %single-float-atan2! (x y result)
   (declare (single-float x y result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_atan2f x y))
     (%sf-check-exception-2 'atan2 x y (%ffi-exception-status))
@@ -666,5 +666,5 @@
 (defun %single-float-exp! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_expf n))
     (%sf-check-exception-1 'exp n (%ffi-exception-status))
@@ -689,5 +689,5 @@
 (defun %single-float-sinh! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_sinhf n))
     (%sf-check-exception-1 'sinh n (%ffi-exception-status))
@@ -715,5 +715,5 @@
 (defun %single-float-tanh! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_tanhf n))
     (%sf-check-exception-1 'tanh n (%ffi-exception-status))
@@ -739,5 +739,5 @@
 (defun %single-float-asinh! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_asinhf n))
     (%sf-check-exception-1 'asinh n (%ffi-exception-status))
@@ -763,5 +763,5 @@
 (defun %single-float-acosh! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_acoshf n))
     (%sf-check-exception-1 'acosh n (%ffi-exception-status))
@@ -786,5 +786,5 @@
 (defun %single-float-atanh! (n result)
   (declare (single-float n result)) 
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_atanhf n))
     (%sf-check-exception-1 'atanh n (%ffi-exception-status))
@@ -809,5 +809,5 @@
 (defun %single-float-sqrt! (n result)
   (declare (single-float n result))
-  (with-stack-short-floats ((temp))
+  (ppc32::with-stack-short-floats ((temp))
     (%setf-short-float TEMP (#_sqrtf n))
     (%sf-check-exception-1 'sqrt n (%ffi-exception-status))
Index: /trunk/ccl/lib/numbers.lisp
===================================================================
--- /trunk/ccl/lib/numbers.lisp	(revision 391)
+++ /trunk/ccl/lib/numbers.lisp	(revision 392)
@@ -591,5 +591,5 @@
     (if (typep x 'double-float)
       (%double-float-sinh! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
 	(%single-float-sinh! sx (%make-sfloat))))))
 
@@ -600,5 +600,5 @@
     (if (typep x 'double-float)
       (%double-float-cosh! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
 	(%single-float-cosh! sx (%make-sfloat))))))
 
@@ -608,5 +608,5 @@
     (if (typep x 'double-float)
       (%double-float-tanh! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
 	(%single-float-tanh! sx (%make-sfloat))))))
 
@@ -616,5 +616,5 @@
     (if (typep x 'double-float)
       (%double-float-asinh! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
 	(%single-float-asinh! sx (%make-sfloat))))))
 
@@ -623,5 +623,5 @@
     (if (typep x 'double-float)
       (%double-float-acosh! x (%make-dfloat))
-      (with-stack-short-floats ((sx x))
+      (ppc32::with-stack-short-floats ((sx x))
 	(%single-float-acosh! sx (%make-sfloat))))
     (* 2 (log (+ (sqrt (/ (1+ x) 2)) (sqrt (/ (1- x) 2)))))))