0.8.16.25:

[sbcl.git] / src / compiler / generic / early-objdef.lisp

diff --git a/src/compiler/generic/early-objdef.lisp b/src/compiler/generic/early-objdef.lisp
index 2b1cff0..e182880 100644 (file)
--- a/src/compiler/generic/early-objdef.lisp
+++ b/src/compiler/generic/early-objdef.lisp
@@ -43,7 +43,7 @@
   ;; The EVAL-WHEN is necessary (at least for Lispworks), because the
   ;; second DEFENUM uses the value of OTHER-IMMEDIATE-0-LOWTAG, which is
   ;; defined in the first DEFENUM. -- AL 20000216
-  #!+x86-64
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
   (defenum (:suffix -lowtag)
     even-fixnum
     instance-pointer
@@ -57,7 +57,7 @@
     pad3 pad4 pad5
     other-immediate-3
     other-pointer)
-  #!-x86-64
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   (defenum (:suffix -lowtag)
     even-fixnum
     instance-pointer
@@ -110,8 +110,15 @@
 ;;;
 ;;; rather than two separate tests and jumps 
 (defenum (:suffix -widetag
+          ;; The first widetag must be greater than SB!VM:LOWTAG-LIMIT
+          ;; otherwise code in generic/early-type-vops will suffer
+          ;; a long, horrible death.  --njf, 2004-08-09
          :start (+ (ash 1 n-lowtag-bits) other-immediate-0-lowtag)
          :step 4)
+  ;; NOTE: the binary numbers off to the side are only valid for 32-bit
+  ;; ports; add #x1000 if you want to know the values for 64-bit ports.
+  ;; And note that the numbers get a little scrambled further down.
+  ;;   --njf, 2004-08-09
   bignum                            ; 00001010
   ratio                             ; 00001110
   single-float                      ; 00010010
@@ -129,7 +136,7 @@
   return-pc-header                  ; 00110110
   value-cell-header                 ; 00111010
   symbol-header                     ; 00111110
-  base-char                         ; 01000010
+  character                         ; 01000010
   sap                               ; 01000110
   unbound-marker                    ; 01001010
   weak-pointer                      ; 01001110
@@ -146,8 +153,10 @@
   unused07                          ; 01110110
   unused08                          ; 01111010
   unused09                          ; 01111110
-  
+
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   unused10                          ; 10000010
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   unused11                          ; 10000110
 
   simple-array-unsigned-byte-2      ; 10001010
@@ -158,15 +167,28 @@
   simple-array-unsigned-byte-16     ; 10011110
   simple-array-nil                  ; 10100010
   simple-base-string                ; 10100110
+  #!+sb-unicode simple-character-string
   simple-bit-vector                 ; 10101010
   simple-vector                     ; 10101110
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   simple-array-unsigned-byte-29     ; 10110010
   simple-array-unsigned-byte-31     ; 10110110
   simple-array-unsigned-byte-32     ; 10111010
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  simple-array-unsigned-byte-60
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  simple-array-unsigned-byte-63
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  simple-array-unsigned-byte-64
   simple-array-signed-byte-8        ; 10111110
   simple-array-signed-byte-16       ; 11000010
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   simple-array-signed-byte-30       ; 11000110
   simple-array-signed-byte-32       ; 11001010
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  simple-array-signed-byte-61
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  simple-array-signed-byte-64
   simple-array-single-float         ; 11001110
   simple-array-double-float         ; 11010010
   simple-array-complex-single-float ; 11010110
@@ -174,12 +196,18 @@
   simple-array                      ; 11011110
   complex-vector-nil                ; 11100010
   complex-base-string               ; 11100110
+  #!+sb-unicode complex-character-string
   complex-bit-vector                ; 11101010
   complex-vector                    ; 11101110
   complex-array                     ; 11110010
 
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   unused12                          ; 11110110
+  #!+(and #.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
+          (not sb-unicode))
   unused13                          ; 11111010
+  #!+(and #.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
+          (not sb-unicode))
   unused14                          ; 11111110
 )