New TN cost computation: directly take depth into account

[sbcl.git] / src / compiler / mips / sap.lisp

diff --git a/src/compiler/mips/sap.lisp b/src/compiler/mips/sap.lisp
index 89527cb..c6f37a2 100644 (file)
--- a/src/compiler/mips/sap.lisp
+++ b/src/compiler/mips/sap.lisp
@@ -32,7 +32,7 @@
   (:results (res :scs (descriptor-reg)))
   (:note "SAP to pointer coercion")
   (:generator 20
-    (with-fixed-allocation (res pa-flag ndescr sap-widetag sap-size)
+    (with-fixed-allocation (res pa-flag ndescr sap-widetag sap-size nil)
       (storew sap res sap-pointer-slot other-pointer-lowtag))))
 
 (define-move-vop move-from-sap :move
@@ -260,7 +260,7 @@
          (:info offset)
          (:results (result :scs (,sc)))
          (:result-types ,type)
-         (:generator 5
+         (:generator 4
            ,@(ecase size
                (:byte
                 '((inst sb value object offset)
@@ -301,6 +301,8 @@
     signed-reg signed-num :long t)
   (def-system-ref-and-set sap-ref-sap %set-sap-ref-sap
     sap-reg system-area-pointer :long)
+  (def-system-ref-and-set sap-ref-lispobj %set-sap-ref-lispobj
+    descriptor-reg * :long)
   (def-system-ref-and-set sap-ref-single %set-sap-ref-single
     single-reg single-float :single)
   (def-system-ref-and-set sap-ref-double %set-sap-ref-double
@@ -316,44 +318,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)))))