Changeset 13912

Timestamp:

Jul 2, 2010, 9:48:50 PM (14 years ago)

Author:

Gary Byers

Message:

More ARM conditionalization.

File:

• branches/arm/lib/nfcomp.lisp (modified) (4 diffs)

branches/arm/lib/nfcomp.lisp

@@ -1072 +1072 @@
   (unless (memq lfun refs)
     (let* ((lfv (function-to-function-vector lfun))
-           (start #+ppc-target 0 #+x86-target (%function-code-words lfun))
+           (start #-x86-target 0 #+x86-target (%function-code-words lfun))
            (refs (cons lfun refs)))
       (declare (dynamic-extent refs))
@@ -1220 +1220 @@
         ((#.x8664::fulltag-imm-0
           #.x8664::fulltag-imm-1))
+        #+arm-target
+        (#.arm::tag-imm)
         (t
          (if
@@ -1234 +1236 @@
                                  (ash 1 x8664::fulltag-immheader-1)
                                  (ash 1 x8664::fulltag-immheader-2))))
+           #+arm-target
+           (= (the fixnum (logand type-code arm::fulltagmask)) arm::fulltag-immheader)
            (case type-code
              (#.target::subtag-dead-macptr (fasl-unknown exp))
@@ -1252 +1256 @@
              (#+ppc-target #.target::subtag-symbol
               #+x8632-target #.target::subtag-symbol
-              #+x8664-target #.target::tag-symbol (fasl-scan-symbol exp))
+              #+x8664-target #.target::tag-symbol
+              #+arm-target #.target::subtag-symbol (fasl-scan-symbol exp))
              ((#.target::subtag-instance #.target::subtag-struct)
               (fasl-scan-user-form exp))