1.0.31.21: OAOOize SAP-REF-64 and friends

Move SAP-REF-64-related transforms to saptran.lisp, since there's no reason
current and future 32-bit platforms should have to define these
individually.

diff --git a/src/compiler/hppa/sap.lisp b/src/compiler/hppa/sap.lisp
index 669041f..a99dac4 100644 (file)
--- a/src/compiler/hppa/sap.lisp
+++ b/src/compiler/hppa/sap.lisp
@@ -250,23 +250,3 @@
   (:generator 2
     (inst addi (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
                vector sap)))
-\f
-;;; Transforms for 64-bit SAP accessors.
-
-(deftransform sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ offset 4))))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (signed-sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ 4 offset))))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-signed-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))

diff --git a/src/compiler/mips/sap.lisp b/src/compiler/mips/sap.lisp
index 144e618..cdc5453 100644 (file)
--- a/src/compiler/mips/sap.lisp
+++ b/src/compiler/mips/sap.lisp
@@ -316,44 +316,3 @@
   (:generator 2
     (inst addu sap vector
           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))
-\f
-;;; Transforms for 64-bit SAP accessors.
-#!+little-endian
-(progn
-  (deftransform sap-ref-64 ((sap offset) (* *))
-    '(logior (sap-ref-32 sap offset)
-             (ash (sap-ref-32 sap (+ offset 4)) 32)))
-
-  (deftransform signed-sap-ref-64 ((sap offset) (* *))
-    '(logior (sap-ref-32 sap offset)
-             (ash (signed-sap-ref-32 sap (+ offset 4)) 32)))
-
-  (deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-    '(progn
-       (%set-sap-ref-32 sap offset (logand value #xffffffff))
-       (%set-sap-ref-32 sap (+ offset 4) (ash value -32))))
-
-  (deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-    '(progn
-       (%set-sap-ref-32 sap offset (logand value #xffffffff))
-       (%set-signed-sap-ref-32 sap (+ offset 4) (ash value -32)))))
-
-#!-little-endian
-(progn
-  (deftransform sap-ref-64 ((sap offset) (* *))
-    '(logior (ash (sap-ref-32 sap offset) 32)
-             (sap-ref-32 sap (+ offset 4))))
-
-  (deftransform signed-sap-ref-64 ((sap offset) (* *))
-    '(logior (ash (signed-sap-ref-32 sap offset) 32)
-             (sap-ref-32 sap (+ 4 offset))))
-
-  (deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-    '(progn
-       (%set-sap-ref-32 sap offset (ash value -32))
-       (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-  (deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-    '(progn
-       (%set-signed-sap-ref-32 sap offset (ash value -32))
-       (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff)))))

diff --git a/src/compiler/ppc/sap.lisp b/src/compiler/ppc/sap.lisp
index 6720083..3118559 100644 (file)
--- a/src/compiler/ppc/sap.lisp
+++ b/src/compiler/ppc/sap.lisp
@@ -256,22 +256,3 @@
   (:generator 2
     (inst addi sap vector
           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))
-\f
-;;; Transforms for 64-bit SAP accessors.
-(deftransform sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ offset 4))))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (signed-sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ 4 offset))))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-signed-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))

diff --git a/src/compiler/saptran.lisp b/src/compiler/saptran.lisp
index 066572e..ed407c8 100644 (file)
--- a/src/compiler/saptran.lisp
+++ b/src/compiler/saptran.lisp
@@ -176,3 +176,48 @@
     %set-sap-ref-32 %set-sap-ref-64)
   (def %set-signed-sap-ref-word (sap offset value)
     %set-signed-sap-ref-32 %set-signed-sap-ref-64))
+\f
+;;; Transforms for 64-bit SAP accessors on 32-bit platforms.
+
+#!+#.(cl:if (cl:= 32 sb!vm:n-machine-word-bits) '(and) '(or))
+(progn
+#!+#.(cl:if (cl:eq :little-endian sb!c:*backend-byte-order*) '(and) '(or))
+(progn
+  (deftransform sap-ref-64 ((sap offset) (* *))
+    '(logior (sap-ref-32 sap offset)
+             (ash (sap-ref-32 sap (+ offset 4)) 32)))
+
+  (deftransform signed-sap-ref-64 ((sap offset) (* *))
+    '(logior (sap-ref-32 sap offset)
+             (ash (signed-sap-ref-32 sap (+ offset 4)) 32)))
+
+  (deftransform %set-sap-ref-64 ((sap offset value) (* * *))
+    '(progn
+       (%set-sap-ref-32 sap offset (logand value #xffffffff))
+       (%set-sap-ref-32 sap (+ offset 4) (ash value -32))))
+
+  (deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
+    '(progn
+       (%set-sap-ref-32 sap offset (logand value #xffffffff))
+       (%set-signed-sap-ref-32 sap (+ offset 4) (ash value -32)))))
+
+#!+#.(cl:if (cl:eq :big-endian sb!c:*backend-byte-order*) '(and) '(or))
+(progn
+  (deftransform sap-ref-64 ((sap offset) (* *))
+    '(logior (ash (sap-ref-32 sap offset) 32)
+             (sap-ref-32 sap (+ offset 4))))
+
+  (deftransform signed-sap-ref-64 ((sap offset) (* *))
+    '(logior (ash (signed-sap-ref-32 sap offset) 32)
+             (sap-ref-32 sap (+ 4 offset))))
+
+  (deftransform %set-sap-ref-64 ((sap offset value) (* * *))
+    '(progn
+       (%set-sap-ref-32 sap offset (ash value -32))
+       (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
+
+  (deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
+    '(progn
+       (%set-signed-sap-ref-32 sap offset (ash value -32))
+       (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff)))))
+) ; (= 32 SB!VM:N-MACHINE-WORD-BITS)

diff --git a/src/compiler/sparc/sap.lisp b/src/compiler/sparc/sap.lisp
index 0b1675c..b57ff7a 100644 (file)
--- a/src/compiler/sparc/sap.lisp
+++ b/src/compiler/sparc/sap.lisp
@@ -272,22 +272,3 @@
   (:generator 2
     (inst add sap vector
           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))
-\f
-;;; Transforms for 64-bit SAP accessors.
-(deftransform sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ offset 4))))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
-  '(logior (ash (signed-sap-ref-32 sap offset) 32)
-           (sap-ref-32 sap (+ 4 offset))))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-signed-sap-ref-32 sap offset (ash value -32))
-     (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))

diff --git a/src/compiler/x86/sap.lisp b/src/compiler/x86/sap.lisp
index f248b3a..50daa83 100644 (file)
--- a/src/compiler/x86/sap.lisp
+++ b/src/compiler/x86/sap.lisp
@@ -469,23 +469,3 @@
     (inst add
           sap
           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))
-
-;;; Transforms for 64-bit SAP accessors.
-
-(deftransform sap-ref-64 ((sap offset) (* *))
-  '(logior (sap-ref-32 sap offset)
-           (ash (sap-ref-32 sap (+ offset 4)) 32)))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
-  '(logior (sap-ref-32 sap offset)
-           (ash (signed-sap-ref-32 sap (+ offset 4)) 32)))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (logand value #xffffffff))
-     (%set-sap-ref-32 sap (+ offset 4) (ash value -32))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
-  '(progn
-     (%set-sap-ref-32 sap offset (logand value #xffffffff))
-     (%set-signed-sap-ref-32 sap (+ offset 4) (ash value -32))))

diff --git a/version.lisp-expr b/version.lisp-expr
index 7da4cbc..0edc72d 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.31.20"
+"1.0.31.21"