X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsparc%2Falloc.lisp;h=8ba7acae7d3bfe7bfd6dfff88683f6be58869113;hb=HEAD;hp=51350be64801ee705967c36f4730cee7df9fe1ab;hpb=66cff1e1319861c080d563359afea284614b3a7f;p=sbcl.git diff --git a/src/compiler/sparc/alloc.lisp b/src/compiler/sparc/alloc.lisp index 51350be..8ba7aca 100644 --- a/src/compiler/sparc/alloc.lisp +++ b/src/compiler/sparc/alloc.lisp @@ -12,17 +12,13 @@ (in-package "SB!VM") ;;;; LIST and LIST* -(defoptimizer (list stack-allocate-result) ((&rest args)) - (not (null args))) -(defoptimizer (list* stack-allocate-result) ((&rest args)) - (not (null (rest args)))) - (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) + (:temporary (:scs (non-descriptor-reg)) alloc-temp) (:info num) (:results (result :scs (descriptor-reg))) (:variant-vars star) @@ -46,14 +42,10 @@ (let* ((dx-p (node-stack-allocate-p node)) (cons-cells (if star (1- num) num)) (alloc (* (pad-data-block cons-size) cons-cells))) - (pseudo-atomic (:extra (if dx-p 0 alloc)) - (let ((allocation-area-tn (if dx-p csp-tn alloc-tn))) - (when dx-p - (align-csp res)) - (inst andn res allocation-area-tn lowtag-mask) - (inst or res list-pointer-lowtag) - (when dx-p - (inst add csp-tn csp-tn alloc))) + (pseudo-atomic () + (allocation res alloc list-pointer-lowtag + :stack-p dx-p + :temp-tn alloc-temp) (move ptr res) (dotimes (i (1- cons-cells)) (storew (maybe-load (tn-ref-tn things)) ptr @@ -86,6 +78,7 @@ (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) ndescr) (:temporary (:scs (any-reg) :from (:argument 0)) boxed) + (:temporary (:scs (non-descriptor-reg)) size) (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) unboxed) (:generator 100 (inst add boxed boxed-arg (fixnumize (1+ code-trace-table-offset-slot))) @@ -94,15 +87,16 @@ (inst add unboxed lowtag-mask) (inst and unboxed (lognot lowtag-mask)) (pseudo-atomic () - ;; CMUCL Comment: - ;; Note: we don't have to subtract off the 4 that was added by - ;; pseudo-atomic, because oring in other-pointer-lowtag just adds - ;; it right back. ;; ;; This looks like another dreadful type pun. CSR - 2002-02-06 - (inst or result alloc-tn other-pointer-lowtag) - (inst add alloc-tn boxed) - (inst add alloc-tn unboxed) + ;; + ;; Not any more, or not in that sense at least, because the + ;; "p/a bit is also the highest lowtag bit" assumption is now hidden + ;; in the allocation macro. DFL - 2012-10-01 + ;; + ;; Figure out how much space we really need and allocate it. + (inst add size boxed unboxed) + (allocation result size other-pointer-lowtag :temp-tn ndescr) (inst sll ndescr boxed (- n-widetag-bits word-shift)) (inst or ndescr code-header-widetag) (storew ndescr result 0 other-pointer-lowtag) @@ -132,15 +126,10 @@ (:generator 10 (let* ((size (+ length closure-info-offset)) (alloc-size (pad-data-block size))) - (pseudo-atomic (:extra (if stack-allocate-p 0 alloc-size)) - (cond (stack-allocate-p - (align-csp temp) - (inst andn result csp-tn lowtag-mask) - (inst or result fun-pointer-lowtag) - (inst add csp-tn alloc-size)) - (t - (inst andn result alloc-tn lowtag-mask) - (inst or result fun-pointer-lowtag))) + (pseudo-atomic () + (allocation result alloc-size fun-pointer-lowtag + :stack-p stack-allocate-p + :temp-tn temp) (inst li temp (logior (ash (1- size) n-widetag-bits) closure-header-widetag)) (storew temp result 0 fun-pointer-lowtag) (storew function result closure-fun-slot fun-pointer-lowtag))))) @@ -161,7 +150,7 @@ (define-vop (make-unbound-marker) (:args) - (:results (result :scs (any-reg))) + (:results (result :scs (descriptor-reg any-reg))) (:generator 1 (inst li result unbound-marker-widetag))) @@ -178,12 +167,8 @@ (:results (result :scs (descriptor-reg))) (:temporary (:scs (non-descriptor-reg)) temp) (:generator 4 - (pseudo-atomic (:extra (pad-data-block words)) - (cond ((logbitp (1- n-lowtag-bits) lowtag) - (inst or result alloc-tn lowtag)) - (t - (inst andn result alloc-tn lowtag-mask) - (inst or result lowtag))) + (pseudo-atomic () + (allocation result (pad-data-block words) lowtag :temp-tn temp) (when type (inst li temp (logior (ash (1- words) n-widetag-bits) type)) (storew temp result 0 lowtag))))) @@ -196,18 +181,12 @@ (:results (result :scs (descriptor-reg))) (:temporary (:scs (any-reg)) bytes) (:temporary (:scs (non-descriptor-reg)) header) + (:temporary (:scs (non-descriptor-reg)) temp) (:generator 6 (inst add bytes extra (* (1+ words) n-word-bytes)) (inst sll header bytes (- n-widetag-bits 2)) (inst add header header (+ (ash -2 n-widetag-bits) type)) (inst and bytes (lognot lowtag-mask)) (pseudo-atomic () - ;; Need to be careful if the lowtag and the pseudo-atomic flag - ;; are not compatible. - (cond ((logbitp (1- n-lowtag-bits) lowtag) - (inst or result alloc-tn lowtag)) - (t - (inst andn result alloc-tn lowtag-mask) - (inst or result lowtag))) - (storew header result 0 lowtag) - (inst add alloc-tn alloc-tn bytes)))) + (allocation result bytes lowtag :temp-tn temp) + (storew header result 0 lowtag))))