0.9.2.40:

[sbcl.git] / src / compiler / generic / primtype.lisp

diff --git a/src/compiler/generic/primtype.lisp b/src/compiler/generic/primtype.lisp
index d11bcf6..836a5bd 100644 (file)
--- a/src/compiler/generic/primtype.lisp
+++ b/src/compiler/generic/primtype.lisp
@@ -41,8 +41,7 @@
   :type (unsigned-byte 64))
 (!def-primitive-type fixnum (any-reg signed-reg)
   :type (signed-byte #.(1+ sb!vm:n-positive-fixnum-bits)))
-;; x86-64 needs a signed-byte-32 for proper handling of c-call return values.
-#!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 32) '(and) '(or x86-64))
+#!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 32) '(and) '(or))
 (!def-primitive-type signed-byte-32 (signed-reg descriptor-reg)
   :type (signed-byte 32))
 #!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
@@ -53,16 +52,19 @@
 
 (/show0 "primtype.lisp 53")
 (!def-primitive-type-alias tagged-num (:or positive-fixnum fixnum))
-(!def-primitive-type-alias unsigned-num 
-  #!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
-  (:or unsigned-byte-64 unsigned-byte-63 positive-fixnum)
-  #!-#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
-  (:or unsigned-byte-32 unsigned-byte-31 positive-fixnum))
-(!def-primitive-type-alias signed-num 
-  #!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
-  (:or signed-byte-64 fixnum unsigned-byte-63 positive-fixnum)
-  #!-#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
-  (:or signed-byte-32 fixnum unsigned-byte-31 positive-fixnum))
+(progn
+  (!def-primitive-type-alias unsigned-num #1=
+    #!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
+    (:or unsigned-byte-64 unsigned-byte-63 positive-fixnum)
+    #!-#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
+    (:or unsigned-byte-32 unsigned-byte-31 positive-fixnum))
+  (!def-primitive-type-alias signed-num #2=
+    #!+#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
+    (:or signed-byte-64 fixnum unsigned-byte-63 positive-fixnum)
+    #!-#.(cl:if (cl:= sb!vm::n-machine-word-bits 64) '(and) '(or))
+    (:or signed-byte-32 fixnum unsigned-byte-31 positive-fixnum))
+  (!def-primitive-type-alias untagged-num
+    (:or . #.(print (union (cdr '#1#) (cdr '#2#))))))
 
 ;;; other primitive immediate types
 (/show0 "primtype.lisp 68")