Changeset 5182

Timestamp:

Sep 8, 2006, 9:38:26 PM (18 years ago)

Author:

Gary Byers

Message:

FIXNUM->CHAR: return NIL for surrogate pairs.

Location:

trunk/ccl/compiler/PPC

Files:

• PPC32/ppc32-vinsns.lisp (modified) (1 diff)
• PPC64/ppc64-vinsns.lisp (modified) (1 diff)

trunk/ccl/compiler/PPC/PPC32/ppc32-vinsns.lisp

@@ -2330 +2330 @@
 (define-ppc32-vinsn fixnum->char (((dest :lisp))
                                   ((src :imm))
-                                  ())
+                                  ((temp :u32)
+                                   (crf0 (:crf 0))))
+  (srwi temp src (+ ppc32::fixnumshift 11))
+  (cmpwi temp 27)
   (slwi dest src (- ppc32::charcode-shift ppc32::fixnumshift))
-  (addi dest dest ppc32::subtag-character))
+  (bne+ :ok)
+  (li dest ppc32::nil-value)
+  (b :done)
+  :ok
+  (addi dest dest ppc32::subtag-character)
+  :done)
 
 

trunk/ccl/compiler/PPC/PPC64/ppc64-vinsns.lisp

@@ -2319 +2319 @@
 (define-ppc64-vinsn fixnum->char (((dest :lisp))
                                   ((src :imm))
-                                  ())
+                                  ((temp :u64)
+                                   (crf0 (:crf 0))))
+  (srdi temp src (+ ppc64::fixnumshift 11))
+  (cmpdi temp 27)
   (sldi dest src (- ppc64::charcode-shift ppc64::fixnumshift))
-  (addi dest dest ppc64::subtag-character))
+  (bne+ :ok)
+  (li dest ppc64::nil-value)
+  (b :done)
+  :ok
+  (addi dest dest ppc64::subtag-character)
+  :done)
 
 (define-ppc64-vinsn u32->char (((dest :lisp))