Changeset 14062

Timestamp:

Jul 27, 2010, 10:52:51 PM (10 years ago)

Author:

gb

Message:

Fix runtime versions of REALP, NUMBERP, too.

File:

• branches/arm/level-0/l0-pred.lisp (modified) (2 diffs)

branches/arm/level-0/l0-pred.lisp

@@ -115 +115 @@
   (let* ((typecode (typecode x)))
     (declare (fixnum typecode))
-    #+(or ppc32-target x8632-target arm-target)
-    (or (= typecode target::tag-fixnum)
-        (and (>= typecode target::min-numeric-subtag)
-             (<= typecode target::max-real-subtag)))
-    #+ppc64-target
-    (if (<= typecode ppc64::subtag-double-float)
-      (logbitp (the (integer 0 #.ppc64::subtag-double-float) typecode)
-               (logior (ash 1 ppc64::tag-fixnum)
-                       (ash 1 ppc64::subtag-single-float)
-                       (ash 1 ppc64::subtag-double-float)
-                       (ash 1 ppc64::subtag-bignum)
-                       (ash 1 ppc64::subtag-ratio))))
-    #+x8664-target
-    (if (<= typecode x8664::subtag-double-float)
-      (logbitp (the (integer 0 #.x8664::subtag-double-float) typecode)
-               (logior (ash 1 x8664::tag-fixnum)
-                       (ash 1 x8664::subtag-bignum)
-                       (ash 1 x8664::tag-single-float)
-                       (ash 1 x8664::subtag-double-float)
-                       (ash 1 x8664::subtag-ratio))))))
+    (and (<= typecode target::max-real-subtag)
+         (logbitp (the (integer 0 #.target::max-real-subtag)
+                    typecode)
+                  (logior (ash 1 target::tag-fixnum)
+                          (ash 1 target::subtag-single-float)
+                          (ash 1 target::subtag-double-float)
+                          (ash 1 target::subtag-bignum)
+                          (ash 1 target::subtag-ratio))))))
+
 
 (defun complexp (x)
@@ -144 +133 @@
   (let* ((typecode (typecode x)))
     (declare (fixnum typecode))
-    #+(or ppc32-target x8632-target arm-target)
-    (or (= typecode target::tag-fixnum)
-        (and (>= typecode target::min-numeric-subtag)
-             (<= typecode target::max-numeric-subtag)))
-    #+ppc64-target
-    (if (<= typecode ppc64::subtag-double-float)
-      (logbitp (the (integer 0 #.ppc64::subtag-double-float) typecode)
-               (logior (ash 1 ppc64::tag-fixnum)
-                       (ash 1 ppc64::subtag-bignum)
-                       (ash 1 ppc64::subtag-single-float)
-                       (ash 1 ppc64::subtag-double-float)
-                       (ash 1 ppc64::subtag-ratio)
-                       (ash 1 ppc64::subtag-complex))))
-    #+x8664-target
-    (if (< typecode x8664::nbits-in-word)
-      (logbitp (the (integer 0 #.x8664::subtag-double-float) typecode)
-               (logior (ash 1 x8664::tag-fixnum)
-                       (ash 1 x8664::subtag-bignum)
-                       (ash 1 x8664::tag-single-float)
-                       (ash 1 x8664::subtag-double-float)
-                       (ash 1 x8664::subtag-ratio)
-                       (ash 1 x8664::subtag-complex))))
-    
-    ))
+    (and (<= typecode target::max-numeric-subtag)
+         (logbitp (the (integer 0 #.target::max-numeric-subtag)
+                    typecode)
+                  (logior (ash 1 target::tag-fixnum)
+                          (ash 1 target::subtag-bignum)
+                          (ash 1 target::subtag-single-float)
+                          (ash 1 target::subtag-double-float)
+                          (ash 1 target::subtag-ratio)
+                          (ash 1 target::subtag-complex))))))
 
 (defun arrayp (x)