Changeset 5177

Timestamp:

Sep 8, 2006, 5:52:38 PM (18 years ago)

Author:

Gary Byers

Message:

FIXNUM->CHAR returns NIL for values in the surrogate-pairs range.
(There are other things that it could plausibly return NIL for.)

File:

• trunk/ccl/compiler/X86/X8664/x8664-vinsns.lisp (modified) (1 diff)

trunk/ccl/compiler/X86/X8664/x8664-vinsns.lisp

@@ -3091 +3091 @@
 (define-x8664-vinsn fixnum->char (((dest :lisp))
                                   ((src :imm))
-                                  ())
-  (movq (:%q src) (:%q dest))
-  (shlq (:$ub (- x8664::charcode-shift x8664::fixnumshift)) (:%q dest))
-  (movb (:$b x8664::subtag-character) (:%b dest)))
+                                  ((temp :u32)))
+  (movl (:%l src) (:%l temp))
+  (sarl (:$ub (+ x8664::fixnumshift 11)) (:%l temp))
+  (cmpl (:$b (ash #xd800 -11))(:%l temp))
+  (movl (:$l x8664::nil-value) (:%l temp))
+  (cmovel (:%l temp) (:%l dest))
+  (je :done)
+  ((:not (:pred =
+                (:apply %hard-regspec-value dest)
+                (:apply %hard-regspec-value src)))
+   (movl (:%l src) (:%l dest)))
+  (shll (:$ub (- x8664::charcode-shift x8664::fixnumshift)) (:%l dest))
+  (addb (:$b x8664::subtag-character) (:%b dest))
+  :done)