X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Falloc.lisp;h=96621a3553b53e2bd1e9c87b84a180ad57f5d895;hb=2db410feb35e7e30c95af8f20f67e6177fa92488;hp=36e7f0a531fa996f4b56140da9076c1955955e0c;hpb=50305b602c3953440af716137a56f50cd204375d;p=sbcl.git diff --git a/src/compiler/alpha/alloc.lisp b/src/compiler/alpha/alloc.lisp index 36e7f0a..96621a3 100644 --- a/src/compiler/alpha/alloc.lisp +++ b/src/compiler/alpha/alloc.lisp @@ -12,55 +12,61 @@ (in-package "SB!VM") ;;;; LIST and LIST* - (define-vop (list-or-list*) (:args (things :more t)) (:temporary (:scs (descriptor-reg) :type list) ptr) (:temporary (:scs (descriptor-reg)) temp) (:temporary (:scs (descriptor-reg) :type list :to (:result 0) :target result) - res) + res) (:info num) (:results (result :scs (descriptor-reg))) (:variant-vars star) (:policy :safe) + (:node-var node) (:generator 0 (cond ((zerop num) - (move null-tn result)) - ((and star (= num 1)) - (move (tn-ref-tn things) result)) - (t - (macrolet - ((store-car (tn list &optional (slot cons-car-slot)) - `(let ((reg - (sc-case ,tn - ((any-reg descriptor-reg) ,tn) - (zero zero-tn) - (null null-tn) - (control-stack - (load-stack-tn temp ,tn) - temp)))) - (storew reg ,list ,slot list-pointer-lowtag)))) - (let ((cons-cells (if star (1- num) num))) - (pseudo-atomic (:extra (* (pad-data-block cons-size) - cons-cells)) - (inst bis alloc-tn list-pointer-lowtag res) - (move res ptr) - (dotimes (i (1- cons-cells)) - (store-car (tn-ref-tn things) ptr) - (setf things (tn-ref-across things)) - (inst lda ptr (pad-data-block cons-size) ptr) - (storew ptr ptr - (- cons-cdr-slot cons-size) - list-pointer-lowtag)) - (store-car (tn-ref-tn things) ptr) - (cond (star - (setf things (tn-ref-across things)) - (store-car (tn-ref-tn things) ptr cons-cdr-slot)) - (t - (storew null-tn ptr - cons-cdr-slot list-pointer-lowtag))) - (assert (null (tn-ref-across things))) - (move res result)))))))) + (move null-tn result)) + ((and star (= num 1)) + (move (tn-ref-tn things) result)) + (t + (macrolet + ((store-car (tn list &optional (slot cons-car-slot)) + `(let ((reg + (sc-case ,tn + ((any-reg descriptor-reg) ,tn) + (zero zero-tn) + (null null-tn) + (control-stack + (load-stack-tn temp ,tn) + temp)))) + (storew reg ,list ,slot list-pointer-lowtag)))) + (let* ((dx-p (node-stack-allocate-p node)) + (cons-cells (if star (1- num) num)) + (space (* (pad-data-block cons-size) cons-cells))) + (pseudo-atomic (:extra (if dx-p 0 space)) + (cond (dx-p + (align-csp res) + (inst bis csp-tn list-pointer-lowtag res) + (inst lda csp-tn space csp-tn)) + (t + (inst bis alloc-tn list-pointer-lowtag res))) + (move res ptr) + (dotimes (i (1- cons-cells)) + (store-car (tn-ref-tn things) ptr) + (setf things (tn-ref-across things)) + (inst lda ptr (pad-data-block cons-size) ptr) + (storew ptr ptr + (- cons-cdr-slot cons-size) + list-pointer-lowtag)) + (store-car (tn-ref-tn things) ptr) + (cond (star + (setf things (tn-ref-across things)) + (store-car (tn-ref-tn things) ptr cons-cdr-slot)) + (t + (storew null-tn ptr + cons-cdr-slot list-pointer-lowtag))) + (aver (null (tn-ref-across things))) + (move res result)))))))) (define-vop (list list-or-list*) (:variant nil)) @@ -72,7 +78,7 @@ (define-vop (allocate-code-object) (:args (boxed-arg :scs (any-reg)) - (unboxed-arg :scs (any-reg))) + (unboxed-arg :scs (any-reg))) (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) ndescr) (:temporary (:scs (any-reg) :from (:argument 0)) boxed) @@ -80,14 +86,14 @@ (:generator 100 (inst li (lognot lowtag-mask) ndescr) (inst lda boxed (fixnumize (1+ code-trace-table-offset-slot)) - boxed-arg) + boxed-arg) (inst and boxed ndescr boxed) (inst srl unboxed-arg word-shift unboxed) (inst lda unboxed lowtag-mask unboxed) (inst and unboxed ndescr unboxed) (inst sll boxed (- n-widetag-bits word-shift) ndescr) (inst bis ndescr code-header-widetag ndescr) - + (pseudo-atomic () (inst bis alloc-tn other-pointer-lowtag result) (storew ndescr result 0 other-pointer-lowtag) @@ -113,30 +119,36 @@ (define-vop (make-closure) (:args (function :to :save :scs (descriptor-reg))) - (:info length) + (:info length stack-allocate-p) (:temporary (:scs (non-descriptor-reg)) temp) (:results (result :scs (descriptor-reg))) (:generator 10 - (let ((size (+ length closure-info-offset))) + (let* ((size (+ length closure-info-offset)) + (alloc-size (pad-data-block size))) (inst li - (logior (ash (1- size) n-widetag-bits) closure-header-widetag) - temp) - (pseudo-atomic (:extra (pad-data-block size)) - (inst bis alloc-tn fun-pointer-lowtag result) - (storew temp result 0 fun-pointer-lowtag)) - (storew function result closure-fun-slot fun-pointer-lowtag)))) + (logior (ash (1- size) n-widetag-bits) closure-header-widetag) + temp) + (pseudo-atomic (:extra (if stack-allocate-p 0 alloc-size)) + (cond (stack-allocate-p + (align-csp result) + (inst bis csp-tn fun-pointer-lowtag result) + (inst lda csp-tn alloc-size csp-tn)) + (t + (inst bis alloc-tn fun-pointer-lowtag result))) + (storew temp result 0 fun-pointer-lowtag) + (storew function result closure-fun-slot fun-pointer-lowtag))))) ;;; The compiler likes to be able to directly make value cells. -;;; (define-vop (make-value-cell) (:args (value :to :save :scs (descriptor-reg any-reg null zero))) (:temporary (:scs (non-descriptor-reg)) temp) + (:info stack-allocate-p) + (:ignore stack-allocate-p) (:results (result :scs (descriptor-reg))) (:generator 10 (with-fixed-allocation - (result temp value-cell-header-widetag value-cell-size)) - (storew value result value-cell-value-slot other-pointer-lowtag))) - + (result temp value-cell-header-widetag value-cell-size) + (storew value result value-cell-value-slot other-pointer-lowtag)))) ;;;; automatic allocators for primitive objects @@ -146,18 +158,24 @@ (:generator 1 (inst li unbound-marker-widetag result))) +(define-vop (make-funcallable-instance-tramp) + (:args) + (:results (result :scs (any-reg))) + (:generator 1 + (inst li (make-fixup "funcallable_instance_tramp" :foreign) result))) + (define-vop (fixed-alloc) (:args) - (:info name words type lowtag) - (:ignore name) + (:info name words type lowtag stack-allocate-p) + (:ignore name stack-allocate-p) (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) temp) (:generator 4 (pseudo-atomic (:extra (pad-data-block words)) (inst bis alloc-tn lowtag result) (when type - (inst li (logior (ash (1- words) n-widetag-bits) type) temp) - (storew temp result 0 lowtag))))) + (inst li (logior (ash (1- words) n-widetag-bits) type) temp) + (storew temp result 0 lowtag))))) (define-vop (var-alloc) (:args (extra :scs (any-reg)))