Changeset 10363

Timestamp:

Aug 6, 2008, 12:54:33 AM (11 years ago)

Author:

rme

Message:

Port r10361, more or less.

(update set-nargs, fixnum->char; new nref-bitvector-flags,
misc-ref-c-bit-fixnum, misc-ref-c-bit-flags, code-char->char)

File:

• trunk/source/compiler/X86/X8632/x8632-vinsns.lisp (modified) (4 diffs)

trunk/source/compiler/X86/X8632/x8632-vinsns.lisp

@@ -231 +231 @@
 (define-x8632-vinsn set-nargs (()
                                ((n :u16const)))
-  ((:pred < n 32)
-   (xorl (:%l x8632::nargs) (:%l x8632::nargs))
-   ((:pred > n 0)
-    (addl (:$b (:apply ash n x8632::fixnumshift)) (:%l x8632::nargs))))
-  ((:pred >= n 32)
+  ((:pred = n 0)
+   (xorl (:%l x8632::nargs) (:%l x8632::nargs)))
+  ((:not (:pred = n 0))
    (movl (:$l (:apply ash n x8632::fixnumshift)) (:%l x8632::nargs))))
 
@@ -2887 +2885 @@
   (imull (:$b x8632::fixnumone) (:%l bitnum) (:%l dest)))
 
+(define-x8632-vinsn nref-bit-vector-flags (()
+                                           ((bitnum :s32)
+                                            (bitvector :lisp))
+                                           ())
+  (btl (:%l bitnum) (:@ x8632::misc-data-offset (:%l bitvector))))
+
+(define-x8632-vinsn misc-ref-c-bit-fixnum (((dest :imm))
+                                           ((src :lisp)
+                                            (idx :u32const))
+                                           ((temp :u8)))
+  (btl (:$ub (:apply logand 31 idx))
+       (:@ (:apply + x8632::misc-data-offset (:apply ash (:apply ash idx -5) x8632::word-shift)) (:%l src)))
+  (setc (:%b temp))
+  (movzbl (:%b temp) (:%l temp))
+  (imull (:$b x8632::fixnumone) (:%l temp) (:%l dest)))
+
+(define-x8632-vinsn misc-ref-c-bit-flags (()
+                                          ((src :lisp)
+                                           (idx :u64const)))
+  (btl (:$ub (:apply logand 31 idx))
+       (:@ (:apply + x8632::misc-data-offset (:apply ash (:apply ash idx -5) x8632::word-shift)) (:%l src))))
+
 (define-x8632-vinsn set-macptr-address (()
                                         ((addr :address)
@@ -3501 +3521 @@
                                   ((temp :u32)))
   (movl (:%l src) (:%l temp))
-  (sarl (:$ub (+ x8632::fixnumshift 11)) (:%l temp))
+  (sarl (:$ub (+ x8632::fixnumshift 1)) (:%l temp))
+  (cmpl (:$l (ash #xfffe -1)) (:%l temp))
+  (je :bad-if-eq)
+  (sarl (:$ub (- 11 1)) (:%l temp))
   (cmpl (:$b (ash #xd800 -11))(:%l temp))
+  :bad-if-eq
   (movl (:$l x8632::nil-value) (:%l temp))
   (cmovel (:%l temp) (:%l dest))
@@ -3511 +3535 @@
    (movl (:%l src) (:%l dest)))
   (shll (:$ub (- x8632::charcode-shift x8632::fixnumshift)) (:%l dest))
-  ((:pred <= x8632::subtag-character #x7f)
-   (addl (:$b x8632::subtag-character) (:%l dest)))
-  ((:pred > x8632::subtag-character #x7f)
-   (addl (:$l x8632::subtag-character) (:%l dest)))
+  (addl (:$b x8632::subtag-character) (:%l dest))
+  :done)
+
+;;; src is known to be a code for which CODE-CHAR returns non-nil.
+(define-x8632-vinsn code-char->char (((dest :lisp))
+                                     ((src :imm))
+                                     ())
+  ((:not (:pred =
+                (:apply %hard-regspec-value dest)
+                (:apply %hard-regspec-value src)))
+   (movl (:%l src) (:%l dest)))
+  (shll (:$ub (- x8632::charcode-shift x8632::fixnumshift)) (:%l dest))
+  (addl (:$b x8632::subtag-character) (:%l dest))
   :done)