Changeset 13841

Timestamp:

Jun 15, 2010, 6:53:05 PM (14 years ago)

Author:

Gary Byers

Message:

Use PPC32 version of %TYPE-OF on ARM, too.

File:

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

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

@@ -398 +398 @@
                                    (return))))))))))))))
 
-#+ppc32-target
+#+(or ppc32-target arm-target)
 (progn
 (defparameter *nodeheader-types*
@@ -475 +475 @@
   (let* ((typecode (typecode thing)))
     (declare (fixnum typecode))
-    (if (= typecode ppc32::tag-fixnum)
+    (if (= typecode target::tag-fixnum)
       'fixnum
-      (if (= typecode ppc32::tag-list)
+      (if (= typecode target::tag-list)
         (if thing 'cons 'null)
-        (if (= typecode ppc32::tag-imm)
+        (if (= typecode target::tag-imm)
           (if (base-char-p thing)
             'base-char
             'immediate)
-          (if (= typecode ppc32::subtag-macptr)
+          (if (= typecode target::subtag-macptr)
             (if (classp thing)
               (class-name thing)
               'macptr)
-            (let* ((tag-type (logand typecode ppc32::full-tag-mask))
-                   (tag-val (ash typecode (- ppc32::ntagbits))))
+            (let* ((tag-type (logand typecode target::full-tag-mask))
+                   (tag-val (ash typecode (- target::ntagbits))))
               (declare (fixnum tag-type tag-val))
-              (if (/= tag-type ppc32::fulltag-nodeheader)
+              (if (/= tag-type target::fulltag-nodeheader)
                 (%svref *immheader-types* tag-val)
                 (let ((type (%svref *nodeheader-types* tag-val)))
@@ -512 +512 @@
                           'compiled-function)))
                     (if (eq type 'lock)
-                      (or (uvref thing ppc32::lock.kind-cell)
+                      (or (uvref thing target::lock.kind-cell)
                           type)
                       type)))))))))))
 
-);#+ppc32-target
+);#+(or ppc32-target arm-target)
 
 #+ppc64-target