(in-package "SB!VM")
\f
;;;; 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))
(:results (result :scs (descriptor-reg)))
(:variant-vars star)
(:policy :safe)
+ (:node-var node)
(:generator 0
(cond ((zerop num)
(move result null-tn))
(control-stack
(load-stack-tn temp ,tn)
temp)))))
- (let* ((cons-cells (if star (1- num) num))
+ (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 alloc)
- (inst andn res alloc-tn lowtag-mask)
- (inst or res list-pointer-lowtag)
+ (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)))
(move ptr res)
(dotimes (i (1- cons-cells))
(storew (maybe-load (tn-ref-tn things)) ptr
(:translate make-fdefn)
(:generator 37
(with-fixed-allocation (result temp fdefn-widetag fdefn-size)
- (inst li temp (make-fixup (extern-alien-name "undefined_tramp") :foreign))
+ (inst li temp (make-fixup "undefined_tramp" :foreign))
(storew name result fdefn-name-slot other-pointer-lowtag)
(storew null-tn result fdefn-fun-slot other-pointer-lowtag)
(storew temp result fdefn-raw-addr-slot other-pointer-lowtag))))
(define-vop (make-closure)
(:args (function :to :save :scs (descriptor-reg)))
(:info length stack-allocate-p)
- (:ignore stack-allocate-p)
(:temporary (:scs (non-descriptor-reg)) temp)
(:results (result :scs (descriptor-reg)))
(:generator 10
- (let ((size (+ length closure-info-offset)))
- (pseudo-atomic (:extra (pad-data-block size))
- (inst andn result alloc-tn lowtag-mask)
- (inst or result fun-pointer-lowtag)
+ (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)))
(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)))
+ (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)))
(:temporary (:scs (non-descriptor-reg)) temp)
(: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)))
-
-
+ (with-fixed-allocation
+ (result temp value-cell-header-widetag value-cell-size)
+ (storew value result value-cell-value-slot other-pointer-lowtag))))
\f
;;;; Automatic allocators for primitive objects.