X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-ir2tran.lisp;h=4544f51c8584a1a6d3ea43dbf412ef9597931d79;hb=5d04a95274c9ddaebbcd6ddffc5d646e2c25598c;hp=5f924b5b04252b66796f5a47a8e33388874b24cb;hpb=bfb19d306581ac86feb4371846c4b9953d692dd8;p=sbcl.git diff --git a/src/compiler/generic/vm-ir2tran.lisp b/src/compiler/generic/vm-ir2tran.lisp index 5f924b5..4544f51 100644 --- a/src/compiler/generic/vm-ir2tran.lisp +++ b/src/compiler/generic/vm-ir2tran.lisp @@ -9,6 +9,13 @@ (in-package "SB!C") +(def-alloc %make-structure-instance 1 :structure-alloc + sb!vm:instance-header-widetag sb!vm:instance-pointer-lowtag + nil) + +(defoptimizer (%make-structure-instance stack-allocate-result) ((&rest args)) + t) + (defoptimizer ir2-convert-reffer ((object) node block name offset lowtag) (let* ((lvar (node-lvar node)) (locs (lvar-result-tns lvar @@ -46,48 +53,79 @@ res) (move-lvar-result node block locs lvar))) -(defun emit-inits (node block name result lowtag inits args) +(defun emit-inits (node block name object lowtag instance-length inits args) + #!-raw-instance-init-vops + (declare (ignore instance-length)) (let ((unbound-marker-tn nil) (funcallable-instance-tramp-tn nil)) (dolist (init inits) (let ((kind (car init)) (slot (cdr init))) - (vop set-slot node block result - (ecase kind - (:arg - (aver args) - (lvar-tn node block (pop args))) - (:unbound - (or unbound-marker-tn - (setf unbound-marker-tn - (let ((tn (make-restricted-tn - nil - (sc-number-or-lose 'sb!vm::any-reg)))) - (vop make-unbound-marker node block tn) - tn)))) - (:null - (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))) + (case kind + (:slot + (let ((raw-type (pop slot)) + (arg-tn (lvar-tn node block (pop args)))) + (macrolet ((make-case () + `(ecase raw-type + ((t) + (vop set-slot node block object arg-tn + name (+ sb!vm:instance-slots-offset slot) lowtag)) + ,@(mapcar (lambda (rsd) + `(,(sb!kernel::raw-slot-data-raw-type rsd) + (vop ,(sb!kernel::raw-slot-data-init-vop rsd) + node block + object arg-tn instance-length slot))) + #!+raw-instance-init-vops + sb!kernel::*raw-slot-data-list* + #!-raw-instance-init-vops + nil)))) + (make-case)))) + (:dd + (vop set-slot node block object + (emit-constant (sb!kernel::dd-layout-or-lose slot)) + name sb!vm:instance-slots-offset lowtag)) + (otherwise + (vop set-slot node block object + (ecase kind + (:arg + (aver args) + (lvar-tn node block (pop args))) + (:unbound + (or unbound-marker-tn + (setf unbound-marker-tn + (let ((tn (make-restricted-tn + nil + (sc-number-or-lose 'sb!vm::any-reg)))) + (vop make-unbound-marker node block tn) + tn)))) + (:null + (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)))))) + (unless (null args) + (bug "Leftover args: ~S" args))) -(defun emit-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*))) (result (first locs))) - (emit-fixed-alloc node block name words type lowtag result) - (emit-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 words inits args) (move-lvar-result node block locs lvar))) (defoptimizer ir2-convert-variable-allocation @@ -97,12 +135,26 @@ (result (first locs))) (if (constant-lvar-p extra) (let ((words (+ (lvar-value extra) words))) - (emit-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)) - (emit-inits node block name result lowtag inits args) + (emit-inits node block name result lowtag nil inits args) (move-lvar-result node block locs lvar))) +(defoptimizer ir2-convert-structure-allocation + ((dd slot-specs &rest args) node block name words type lowtag inits) + (let* ((lvar (node-lvar node)) + (locs (lvar-result-tns lvar (list *backend-t-primitive-type*))) + (result (first locs))) + (aver (constant-lvar-p dd)) + (aver (constant-lvar-p slot-specs)) + (let* ((c-dd (lvar-value dd)) + (c-slot-specs (lvar-value slot-specs)) + (words (+ (sb!kernel::dd-instance-length c-dd) words))) + (emit-fixed-alloc node block name words type lowtag result lvar) + (emit-inits node block name result lowtag words `((:dd . ,c-dd) ,@c-slot-specs) args) + (move-lvar-result node block locs lvar)))) + ;;; :SET-TRANS (in objdef.lisp DEFINE-PRIMITIVE-OBJECT) doesn't quite ;;; cut it for symbols, where under certain compilation options ;;; (e.g. #!+SB-THREAD) we have to do something complicated, rather