Changeset 15097

Timestamp:

Nov 29, 2011, 10:03:03 AM (13 years ago)

Author:

Gary Byers

Message:

MISC-REF-C-BIT, MISC-REF-C-BIT-FIXNUM: repeat after me: "this is the
easy case, and remembering to shift a constant word index left 2 bits
isn't rocket science."

Export TARGET-FASL-VERSION and note that fact.

Location:

trunk/source

Files:

• compiler/ARM/arm-vinsns.lisp (modified) (4 diffs)
• lib/ccl-export-syms.lisp (modified) (1 diff)
• lib/nfcomp.lisp (modified) (1 diff)

trunk/source/compiler/ARM/arm-vinsns.lisp

@@ -359 +359 @@
       (idx :u32const))
      ())
-  (ldr dest (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash idx -5)))))
+  (ldr dest (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash (:apply ash idx -5) arm::word-shift)))))
   (mov dest (:lsr dest (:$ (:apply logand idx #x1f))))
   (and dest dest (:$ 1)))
@@ -368 +368 @@
       (idx :u32const))
      ((temp :u32)))
-  (ldr temp (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash idx -5)))))
+  (ldr temp (:@ v (:$ (:apply + arm::misc-data-offset (:apply ash (:apply ash idx -5) arm::word-shift)))))
   (mov temp (:ror temp (:$ (:apply logand #x1f (:apply - (:apply logand idx #x1f) arm::fixnumshift)))))
   (and dest temp (:$ arm::fixnumone)))
@@ -2032 +2032 @@
       (default :label))
      ((temp :s32)))
+  (:drain-constant-pool)
   (tst reg (:$ arm::fixnummask))
   (mov idx (:asr reg (:$  arm::fixnumshift)))
@@ -2634 +2635 @@
                                 ((tempa :u32)
                                  (tempb :u32)))
-  (mov tempb (:$ #x7f00))
+  (movw tempb (:$ #x7fff))
   (mov tempa (:lsr src (:$ (+ arm::fixnumshift 1))))
-  (orr tempb tempb (:$ #xff))
   (cmp tempa tempb)
   (mov tempa (:lsr src (:$ (+ arm::fixnumshift 11))))

trunk/source/lib/ccl-export-syms.lisp

@@ -295 +295 @@
      *always-eval-user-defvars*
      *disassemble-verbose*
+     target-fasl-version
 
                                         ;These 3 need to be set by the user in order for the correspondingly named

trunk/source/lib/nfcomp.lisp

@@ -1492 +1492 @@
       (error "~a not defined in target package ~s." name package))
     (logior #xff00 (logand #xff (symbol-value sym)))))
-  
+
+;;; This is an exported, public interface.
 (defun target-fasl-version ()
   (target-symbol-value "FASL-VERSION"))