X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-ir2tran.lisp;h=e2deca6e8a75f3e1e429cee16cdda69c03317514;hb=6bbc22725d3bf663726ed9adca544e39316364a6;hp=1ca4e97a6a7df0020a6ca51e7f96eeba1ffa3051;hpb=f1ffbf976aaa50b7b22f126b97e34afe06a91210;p=sbcl.git

diff --git a/src/compiler/generic/vm-ir2tran.lisp b/src/compiler/generic/vm-ir2tran.lisp
index 1ca4e97..e2deca6 100644
--- a/src/compiler/generic/vm-ir2tran.lisp
+++ b/src/compiler/generic/vm-ir2tran.lisp
@@ -32,8 +32,23 @@
          name offset lowtag)
     (move-lvar-result node block (list value-tn) (node-lvar node))))
 
-(defun do-inits (node block name result lowtag inits args)
-  (let ((unbound-marker-tn nil))
+#!+compare-and-swap-vops
+(defoptimizer ir2-convert-casser
+    ((object old new) node block name offset lowtag)
+  (let* ((lvar (node-lvar node))
+         (locs (lvar-result-tns lvar (list *backend-t-primitive-type*)))
+         (res (first locs)))
+    (vop compare-and-swap-slot node block
+         (lvar-tn node block object)
+         (lvar-tn node block old)
+         (lvar-tn node block new)
+         name offset lowtag
+         res)
+    (move-lvar-result node block locs lvar)))
+
+(defun emit-inits (node block name result lowtag inits args)
+  (let ((unbound-marker-tn nil)
+        (funcallable-instance-tramp-tn nil))
     (dolist (init inits)
       (let ((kind (car init))
             (slot (cdr init)))
@@ -51,35 +66,45 @@
                             (vop make-unbound-marker node block tn)
                             tn))))
                (:null
-                (emit-constant nil)))
+                (emit-constant nil))
+               (:funcallable-instance-tramp
+                (or funcallable-instance-tramp-tn
+                    (setf funcallable-instance-tramp-tn
+                          (let ((tn (make-restricted-tn
+                                     nil
+                                     (sc-number-or-lose 'sb!vm::any-reg))))
+                            (vop make-funcallable-instance-tramp node block tn)
+                            tn)))))
              name slot lowtag))))
   (aver (null args)))
 
-(defun do-fixed-alloc (node block name words type lowtag result)
-  (vop fixed-alloc node block name words type lowtag result))
+(defun emit-fixed-alloc (node block name words type lowtag result lvar)
+  (let ((stack-allocate-p (and lvar (lvar-dynamic-extent lvar))))
+    (when stack-allocate-p
+      (vop current-stack-pointer node block
+           (ir2-lvar-stack-pointer (lvar-info lvar))))
+    (vop fixed-alloc node block name words type lowtag stack-allocate-p result)))
 
 (defoptimizer ir2-convert-fixed-allocation
               ((&rest args) node block name words type lowtag inits)
   (let* ((lvar (node-lvar node))
-         (locs (lvar-result-tns lvar
-                                        (list *backend-t-primitive-type*)))
+         (locs (lvar-result-tns lvar (list *backend-t-primitive-type*)))
          (result (first locs)))
-    (do-fixed-alloc node block name words type lowtag result)
-    (do-inits node block name result lowtag inits args)
+    (emit-fixed-alloc node block name words type lowtag result lvar)
+    (emit-inits node block name result lowtag inits args)
     (move-lvar-result node block locs lvar)))
 
 (defoptimizer ir2-convert-variable-allocation
               ((extra &rest args) node block name words type lowtag inits)
   (let* ((lvar (node-lvar node))
-         (locs (lvar-result-tns lvar
-                                        (list *backend-t-primitive-type*)))
+         (locs (lvar-result-tns lvar (list *backend-t-primitive-type*)))
          (result (first locs)))
     (if (constant-lvar-p extra)
         (let ((words (+ (lvar-value extra) words)))
-          (do-fixed-alloc node block name words type lowtag result))
+          (emit-fixed-alloc node block name words type lowtag result lvar))
         (vop var-alloc node block (lvar-tn node block extra) name words
              type lowtag result))
-    (do-inits node block name result lowtag inits args)
+    (emit-inits node block name result lowtag inits args)
     (move-lvar-result node block locs lvar)))
 
 ;;; :SET-TRANS (in objdef.lisp DEFINE-PRIMITIVE-OBJECT) doesn't quite