Changeset 7338

Timestamp:

Oct 1, 2007, 8:18:21 PM (12 years ago)

Author:

rme

Message:

Conditionalize for X8632

Location:

branches/ia32

Files:

• compiler/nxenv.lisp (modified) (1 diff)
• level-0/l0-array.lisp (modified) (3 diffs)

branches/ia32/compiler/nxenv.lisp

@@ -27 +27 @@
 
 #+ppc-target (require "PPCENV")
+#+x8632-target (require "X8632ENV")
 #+x8664-target (require "X8664ENV")
 

branches/ia32/level-0/l0-array.lisp

@@ -104 +104 @@
      unused))
 
+#+x8632-target
+(defconstant x8632::*immheader-array-types*
+  '#(short-float
+     (unsigned-byte 32)
+     (signed-byte 32)
+     fixnum
+     character
+     (unsigned-byte 8)
+     (signed-byte 8)
+     unused
+     (unsigned-byte 16)
+     (signed-byte 16)
+     double-float
+     bit))
+
 #+x8664-target
 (progn
@@ -183 +198 @@
              #+ppc64-target
              (ash (the fixnum (logand subtag #x7f)) (- ppc64::nlowtagbits)))
+      #+x8632-target
+      (svref x8632::*immheader-array-types*
+             (ash (the fixnum (- subtag x8632::min-cl-ivector-subtag))
+                  (- x8632::ntagbits)))
       #+x8664-target
       (let* ((class (logand subtag x8664::fulltagmask))
@@ -714 +733 @@
     (ash (the fixnum (+ 7 total-bits)) -3)))
 
+#+x8632-target
+(defun subtag-bytes (subtag element-count)
+  (declare (fixnum subtag element-count))
+  (unless (= #.x8632::fulltag-immheader (logand subtag #.x8632::fulltagmask))
+    (error "Not an ivector subtag: ~s" subtag))
+  (let* ((element-bit-shift
+          (if (<= subtag x8632::max-32-bit-ivector-subtag)
+            5
+            (if (<= subtag x8632::max-8-bit-ivector-subtag)
+              3
+              (if (<= subtag x8632::max-16-bit-ivector-subtag)
+                4
+                (if (= subtag x8632::subtag-double-float-vector)
+                  6
+                  0)))))
+         (total-bits (ash element-count element-bit-shift)))
+    (ash (+ 7 total-bits) -3)))
+
 #+x8664-target
 (defun subtag-bytes (subtag element-count)