Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/compiler/sparc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13722/src/compiler/sparc

Modified Files:
	array.lisp 
Log Message:
0.8.16.25:
	Merge the rest of character_branch under #!+sb-unicode
	... untested with #!+sb-unicode, but it seems to work OK without.
		One more build/test cycle to go.

	This patch brought to you by --ifdef


Index: array.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/sparc/array.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- array.lisp	27 Oct 2004 16:40:01 -0000	1.8
+++ array.lisp	2 Nov 2004 08:37:55 -0000	1.9
@@ -12,7 +12,6 @@
 (in-package "SB!VM")
 
 ;;;; allocator for the array header.
-
 (define-vop (make-array-header)
   (:translate make-array-header)
   (:policy :fast-safe)
@@ -36,7 +35,6 @@
       (inst srl ndescr ndescr n-fixnum-tag-bits)
       (storew ndescr header 0 other-pointer-lowtag))
     (move result header)))
-
 
 ;;;; Additional accessors and setters for the array header.
 (define-vop (%array-dimension word-index-ref)
@@ -84,7 +82,6 @@
 ;;; Variants built on top of word-index-ref, etc.  I.e. those vectors whos
 ;;; elements are represented in integer registers and are built out of
 ;;; 8, 16, or 32 bit elements.
-
 (macrolet ((def-data-vector-frobs (type variant element-type &rest scs)
   `(progn
      (define-vop (,(symbolicate "DATA-VECTOR-REF/" (string type))
@@ -109,6 +106,9 @@
 
   (def-data-vector-frobs simple-base-string byte-index
     character character-reg)
+  #!+sb-unicode
+  (def-data-vector-frobs simple-character-string word-index
+    character character-reg)
   (def-data-vector-frobs simple-vector word-index
     * descriptor-reg any-reg)
 
@@ -607,70 +607,55 @@
 
 ;;; These VOPs are used for implementing float slots in structures (whose raw
 ;;; data is an unsigned-32 vector.
-;;;
 (define-vop (raw-ref-single data-vector-ref/simple-array-single-float)
   (:translate %raw-ref-single)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 (define-vop (raw-set-single data-vector-set/simple-array-single-float)
   (:translate %raw-set-single)
   (:arg-types sb!c::raw-vector positive-fixnum single-float))
-;;;
 (define-vop (raw-ref-double data-vector-ref/simple-array-double-float)
   (:translate %raw-ref-double)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 (define-vop (raw-set-double data-vector-set/simple-array-double-float)
   (:translate %raw-set-double)
   (:arg-types sb!c::raw-vector positive-fixnum double-float))
-;;;
 #!+long-float
 (define-vop (raw-ref-long data-vector-ref/simple-array-long-float)
   (:translate %raw-ref-long)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 #!+long-float
 (define-vop (raw-set-double data-vector-set/simple-array-long-float)
   (:translate %raw-set-long)
   (:arg-types sb!c::raw-vector positive-fixnum long-float))
-
 (define-vop (raw-ref-complex-single
 	     data-vector-ref/simple-array-complex-single-float)
   (:translate %raw-ref-complex-single)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 (define-vop (raw-set-complex-single
 	     data-vector-set/simple-array-complex-single-float)
   (:translate %raw-set-complex-single)
   (:arg-types sb!c::raw-vector positive-fixnum complex-single-float))
-;;;
 (define-vop (raw-ref-complex-double
 	     data-vector-ref/simple-array-complex-double-float)
   (:translate %raw-ref-complex-double)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 (define-vop (raw-set-complex-double
 	     data-vector-set/simple-array-complex-double-float)
   (:translate %raw-set-complex-double)
   (:arg-types sb!c::raw-vector positive-fixnum complex-double-float))
-;;;
 #!+long-float
 (define-vop (raw-ref-complex-long
 	     data-vector-ref/simple-array-complex-long-float)
   (:translate %raw-ref-complex-long)
   (:arg-types sb!c::raw-vector positive-fixnum))
-;;;
 #!+long-float
 (define-vop (raw-set-complex-long
 	     data-vector-set/simple-array-complex-long-float)
   (:translate %raw-set-complex-long)
   (:arg-types sb!c::raw-vector positive-fixnum complex-long-float))
 
-
 ;;; These vops are useful for accessing the bits of a vector irrespective of
 ;;; what type of vector it is.
-;;; 
-
 (define-vop (raw-bits word-index-ref)
   (:note "raw-bits VOP")
   (:translate %raw-bits)