(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))))
-
+;;;; CONS, LIST and LIST*
(define-vop (list-or-list*)
(:args (things :more t))
(:temporary (:sc unsigned-reg) ptr temp)
(move temp ,tn)
temp))))
(storew reg ,list ,slot list-pointer-lowtag))))
- (let ((cons-cells (if star (1- num) num)))
- (pseudo-atomic
+ (let ((cons-cells (if star (1- num) num))
+ (stack-allocate-p (awhen (sb!c::node-lvar node)
+ (sb!c::lvar-dynamic-extent it))))
+ (maybe-pseudo-atomic stack-allocate-p
(allocation res (* (pad-data-block cons-size) cons-cells) node
- (awhen (sb!c::node-lvar node) (sb!c::lvar-dynamic-extent it)))
- (inst lea res
- (make-ea :byte :base res :disp list-pointer-lowtag))
+ stack-allocate-p list-pointer-lowtag)
(move ptr res)
(dotimes (i (1- cons-cells))
(store-car (tn-ref-tn things) ptr)
(storew length result vector-length-slot other-pointer-lowtag)))))))
(define-vop (allocate-vector-on-stack)
- (:args (type :scs (unsigned-reg immediate))
- (length :scs (any-reg))
+ (:args (type :scs (unsigned-reg immediate) :to :save)
+ (length :scs (any-reg) :to :eval :target zero)
(words :scs (any-reg) :target ecx))
(:temporary (:sc any-reg :offset ecx-offset :from (:argument 2)) ecx)
- (:temporary (:sc any-reg :offset eax-offset :from (:argument 2)) zero)
- (:temporary (:sc any-reg :offset edi-offset :from (:argument 0)) res)
+ (:temporary (:sc any-reg :offset eax-offset :from :eval) zero)
+ (:temporary (:sc any-reg :offset edi-offset) res)
(:results (result :scs (descriptor-reg) :from :load))
(:arg-types positive-fixnum
positive-fixnum
;; FIXME: It would be good to check for stack overflow here.
(move ecx words)
(inst shr ecx n-fixnum-tag-bits)
- (allocation result result node t)
+ (allocation result result node t other-pointer-lowtag)
(inst cld)
(inst lea res
- (make-ea :byte :base result :disp (* vector-data-offset n-word-bytes)))
- (inst lea result (make-ea :byte :base result :disp other-pointer-lowtag))
+ (make-ea :byte :base result :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))
(sc-case type
(immediate
(aver (typep (tn-value type) '(unsigned-byte 8)))
(inst rep)
(inst stos zero)))
-(in-package "SB!C")
-
-(defoptimizer (allocate-vector stack-allocate-result)
- ((type length words) node)
- (ecase (policy node stack-allocate-vector)
- (0 nil)
- ((1 2)
- ;; a vector object should fit in one page
- (values-subtypep (lvar-derived-type words)
- (load-time-value
- (specifier-type `(integer 0 ,(- (/ sb!vm::*backend-page-size*
- sb!vm:n-word-bytes)
- sb!vm:vector-data-offset))))))
- (3 t)))
-
-(defoptimizer (allocate-vector ltn-annotate) ((type length words) call ltn-policy)
- (let ((args (basic-combination-args call))
- (template (template-or-lose (if (awhen (node-lvar call)
- (lvar-dynamic-extent it))
- 'sb!vm::allocate-vector-on-stack
- 'sb!vm::allocate-vector-on-heap))))
- (dolist (arg args)
- (setf (lvar-info arg)
- (make-ir2-lvar (primitive-type (lvar-type arg)))))
- (unless (is-ok-template-use template call (ltn-policy-safe-p ltn-policy))
- (ltn-default-call call)
- (return-from allocate-vector-ltn-annotate-optimizer (values)))
- (setf (basic-combination-info call) template)
- (setf (node-tail-p call) nil)
-
- (dolist (arg args)
- (annotate-1-value-lvar arg))))
-
-(in-package "SB!VM")
-
-;;;
-(define-vop (allocate-code-object)
- (:args (boxed-arg :scs (any-reg) :target boxed)
- (unboxed-arg :scs (any-reg) :target unboxed))
- (:results (result :scs (descriptor-reg) :from :eval))
- (:temporary (:sc unsigned-reg :from (:argument 0)) boxed)
- (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed)
- (:node-var node)
- (:generator 100
- (move boxed boxed-arg)
- (inst add boxed (fixnumize (1+ code-trace-table-offset-slot)))
- (inst and boxed (lognot lowtag-mask))
- (move unboxed unboxed-arg)
- (inst shr unboxed word-shift)
- (inst add unboxed lowtag-mask)
- (inst and unboxed (lognot lowtag-mask))
- (inst mov result boxed)
- (inst add result unboxed)
- (pseudo-atomic
- (allocation result result node)
- (inst lea result (make-ea :byte :base result :disp other-pointer-lowtag))
- (inst shl boxed (- n-widetag-bits word-shift))
- (inst or boxed code-header-widetag)
- (storew boxed result 0 other-pointer-lowtag)
- (storew unboxed result code-code-size-slot other-pointer-lowtag)
- (storew nil-value result code-entry-points-slot other-pointer-lowtag))
- (storew nil-value result code-debug-info-slot other-pointer-lowtag)))
\f
(define-vop (make-fdefn)
(:policy :fast-safe)
(maybe-pseudo-atomic stack-allocate-p
(let ((size (+ length closure-info-offset)))
(allocation result (pad-data-block size) node
- stack-allocate-p)
- (inst lea result
- (make-ea :byte :base result :disp fun-pointer-lowtag))
+ stack-allocate-p
+ fun-pointer-lowtag)
(storew (logior (ash (1- size) n-widetag-bits) closure-header-widetag)
result 0 fun-pointer-lowtag))
(loadw temp function closure-fun-slot fun-pointer-lowtag)
(define-vop (make-value-cell)
(:args (value :scs (descriptor-reg any-reg) :to :result))
(:results (result :scs (descriptor-reg) :from :eval))
+ (:info stack-allocate-p)
(:node-var node)
(:generator 10
(with-fixed-allocation
- (result value-cell-header-widetag value-cell-size node)
+ (result value-cell-header-widetag value-cell-size node stack-allocate-p)
(storew value result value-cell-value-slot other-pointer-lowtag))))
\f
;;;; automatic allocators for primitive objects
(define-vop (make-unbound-marker)
(:args)
- (:results (result :scs (any-reg)))
+ (:results (result :scs (descriptor-reg any-reg)))
(:generator 1
(inst mov result unbound-marker-widetag)))
(define-vop (fixed-alloc)
(:args)
- (:info name words type lowtag)
+ (:info name words type lowtag stack-allocate-p)
(:ignore name)
(:results (result :scs (descriptor-reg)))
(:node-var node)
;; also check for (< SPEED SPACE) is because we want the space
;; savings that these out-of-line allocation routines bring whilst
;; compiling SBCL itself. --njf, 2006-07-08
- (if (and (= lowtag list-pointer-lowtag) (policy node (< speed 3)))
+ (if (and (not stack-allocate-p)
+ (= lowtag list-pointer-lowtag) (policy node (< speed 3)))
(let ((dst
+ ;; FIXME: out-of-line dx-allocation
#.(loop for offset in *dword-regs*
collect `(,offset
',(intern (format nil "ALLOCATE-CONS-TO-~A"
,@cases)))))
(aver (null type))
(inst call (make-fixup dst :assembly-routine)))
- (pseudo-atomic
- (allocation result (pad-data-block words) node)
- (inst lea result (make-ea :byte :base result :disp lowtag))
+ (maybe-pseudo-atomic stack-allocate-p
+ (allocation result (pad-data-block words) node stack-allocate-p lowtag)
(when type
(storew (logior (ash (1- words) n-widetag-bits) type)
result
projects / sbcl.git / blobdiff