Changeset 9462

Timestamp:

May 12, 2008, 7:10:44 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

x862-get-bit: don't use with-add'l-imm-reg before using vinsn
mem-ref-bit-fixnum (which will mark/unmark a temp reg as unboxed
by itself.)

Location:

branches/ia32/compiler/X86

Files:

• X8632/x8632-vinsns.lisp (modified) (2 diffs)
• x862.lisp (modified) (1 diff)

branches/ia32/compiler/X86/X8632/x8632-vinsns.lisp

@@ -3556 +3556 @@
                                         ((src :address)
                                          (offset :lisp))
-                                        ((temp :u32)))
+                                        ((temp :lisp)))
+  ;; (mark-as-imm temp)
+  (btrl (:$ub (:apply %hard-regspec-value temp))
+        (:@ (:%seg :rcontext) x8632::tcr.node-regs-mask))
   (movl (:%l offset) (:%l temp))
   (shrl (:$ub (+ 5 x8632::fixnumshift)) (:%l temp))
@@ -3566 +3569 @@
   (movl (:$l x8632::fixnumone) (:%l temp))
   (leal (:@ (- x8632::fixnumone) (:%l temp)) (:%l dest))
-  (cmovbl (:%l temp) (:%l dest)))
+  (cmovbl (:%l temp) (:%l dest))
+  ;; (mark-as-node temp)
+  (xorl (:%l temp) (:%l temp))
+  (btsl (:$ub (:apply %hard-regspec-value temp))
+        (:@ (:%seg :rcontext) x8632::tcr.node-regs-mask)))
 
 (define-x8632-subprim-call-vinsn (progvsave) .SPprogvsave)

branches/ia32/compiler/X86/x862.lisp

@@ -7916 +7916 @@
           (x862-two-targeted-reg-forms seg ptr src-reg offset ($ *x862-arg-z*))
           (if (node-reg-p vreg)
-            (with-additional-imm-reg (*x862-arg-z*)
-              (! mem-ref-bit-fixnum vreg src-reg ($ *x862-arg-z*)))
+            (! mem-ref-bit-fixnum vreg src-reg ($ *x862-arg-z*))
             (with-imm-target ()           ;OK if src-reg & dest overlap
                 (dest :u8)