Changeset 5063

Timestamp:

Sep 2, 2006, 9:55:07 AM (18 years ago)

Author:

Gary Byers

Message:

%CSTR-POINTER and %CSTR-SEGMENT-POINTER: don't assume 8-bit chars.

File:

• trunk/ccl/level-0/l0-aprims.lisp (modified) (2 diffs)

trunk/ccl/level-0/l0-aprims.lisp

@@ -59 +59 @@
   (multiple-value-bind (s o n) (dereference-base-string string)
     (declare (fixnum o n))
-    (%copy-ivector-to-ptr s o pointer 0 n)
+    (do* ((i 0 (1+ i))
+          (o o (1+ o)))
+         ((= i n))
+      (declare (fixnum i o))
+      (setf (%get-unsigned-byte pointer i)
+            (logand #xff (char-code (schar s o)))))
     (setf (%get-byte pointer n) 0))
   nil)
@@ -68 +73 @@
     (multiple-value-bind (s o) (dereference-base-string string)
       (declare (fixnum o))
-      (%copy-ivector-to-ptr s (the fixnum (+ o start)) pointer 0 n)
+          (do* ((i 0 (1+ i))
+          (o (the fixnum (+ o start)) (1+ o)))
+         ((= i n))
+      (declare (fixnum i o))
+      (setf (%get-unsigned-byte pointer i)
+            (logand #xff (char-code (schar s o)))))
     (setf (%get-byte pointer n) 0)
     nil)))