X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Falloc.lisp;h=59d47f5fb3ddccc378dd06fadc972355eccfac41;hb=66cff1e1319861c080d563359afea284614b3a7f;hp=8d96fcb91e439d3f396f2aa298daf418a9e32324;hpb=8d490a4d6b9d7f156cf503826b3e3195e6f3ad39;p=sbcl.git diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp index 8d96fcb..59d47f5 100644 --- a/src/compiler/x86/alloc.lisp +++ b/src/compiler/x86/alloc.lisp @@ -11,7 +11,9 @@ (in-package "SB!VM") -;;;; LIST and LIST* +;;;; CONS, LIST and LIST* +(defoptimizer (cons stack-allocate-result) ((&rest args)) + t) (defoptimizer (list stack-allocate-result) ((&rest args)) (not (null args))) (defoptimizer (list* stack-allocate-result) ((&rest args)) @@ -28,42 +30,42 @@ (:node-var node) (:generator 0 (cond ((zerop num) - ;; (move result nil-value) - (inst mov result nil-value)) - ((and star (= num 1)) - (move result (tn-ref-tn things))) - (t - (macrolet - ((store-car (tn list &optional (slot cons-car-slot)) - `(let ((reg - (sc-case ,tn - ((any-reg descriptor-reg) ,tn) - ((control-stack) - (move temp ,tn) - temp)))) - (storew reg ,list ,slot list-pointer-lowtag)))) - (let ((cons-cells (if star (1- num) num))) - (pseudo-atomic - (allocation res (* (pad-data-block cons-size) cons-cells) node + ;; (move result nil-value) + (inst mov result nil-value)) + ((and star (= num 1)) + (move result (tn-ref-tn things))) + (t + (macrolet + ((store-car (tn list &optional (slot cons-car-slot)) + `(let ((reg + (sc-case ,tn + ((any-reg descriptor-reg) ,tn) + ((control-stack) + (move temp ,tn) + temp)))) + (storew reg ,list ,slot list-pointer-lowtag)))) + (let ((cons-cells (if star (1- num) num))) + (pseudo-atomic + (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)) - (move ptr res) - (dotimes (i (1- cons-cells)) - (store-car (tn-ref-tn things) ptr) - (setf things (tn-ref-across things)) - (inst add ptr (pad-data-block cons-size)) - (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 nil-value ptr cons-cdr-slot - list-pointer-lowtag))) - (aver (null (tn-ref-across things))))) - (move result res)))))) + (inst lea res + (make-ea :byte :base res :disp list-pointer-lowtag)) + (move ptr res) + (dotimes (i (1- cons-cells)) + (store-car (tn-ref-tn things) ptr) + (setf things (tn-ref-across things)) + (inst add ptr (pad-data-block cons-size)) + (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 nil-value ptr cons-cdr-slot + list-pointer-lowtag))) + (aver (null (tn-ref-across things))))) + (move result res)))))) (define-vop (list list-or-list*) (:variant nil)) @@ -75,27 +77,52 @@ ;;; ALLOCATE-VECTOR (define-vop (allocate-vector-on-heap) - (:args (type :scs (unsigned-reg)) - (length :scs (any-reg)) - (words :scs (any-reg))) + (:args (type :scs (unsigned-reg immediate)) + (length :scs (any-reg immediate)) + (words :scs (any-reg immediate))) (:results (result :scs (descriptor-reg) :from :load)) (:arg-types positive-fixnum positive-fixnum positive-fixnum) (:policy :fast-safe) (:generator 100 - (inst lea result (make-ea :byte :base words :disp - (+ (1- (ash 1 n-lowtag-bits)) - (* vector-data-offset n-word-bytes)))) - (inst and result (lognot lowtag-mask)) - (pseudo-atomic - (allocation result result) - (inst lea result (make-ea :byte :base result :disp other-pointer-lowtag)) - (storew type result 0 other-pointer-lowtag) - (storew length result vector-length-slot other-pointer-lowtag)))) + (let ((size (sc-case words + (immediate + (logandc2 (+ (fixnumize (tn-value words)) + (+ (1- (ash 1 n-lowtag-bits)) + (* vector-data-offset n-word-bytes))) + lowtag-mask)) + (t + (inst lea result (make-ea :byte :base words :disp + (+ (1- (ash 1 n-lowtag-bits)) + (* vector-data-offset + n-word-bytes)))) + (inst and result (lognot lowtag-mask)) + result)))) + (pseudo-atomic + (allocation result size) + (inst lea result (make-ea :byte :base result :disp other-pointer-lowtag)) + (sc-case type + (immediate + (aver (typep (tn-value type) '(unsigned-byte 8))) + (storeb (tn-value type) result 0 other-pointer-lowtag)) + (t + (storew type result 0 other-pointer-lowtag))) + (sc-case length + (immediate + (let ((fixnum-length (fixnumize (tn-value length)))) + (typecase fixnum-length + ((unsigned-byte 8) + (storeb fixnum-length result + vector-length-slot other-pointer-lowtag)) + (t + (storew fixnum-length result + vector-length-slot other-pointer-lowtag))))) + (t + (storew length result vector-length-slot other-pointer-lowtag))))))) (define-vop (allocate-vector-on-stack) - (:args (type :scs (unsigned-reg)) + (:args (type :scs (unsigned-reg immediate)) (length :scs (any-reg)) (words :scs (any-reg) :target ecx)) (:temporary (:sc any-reg :offset ecx-offset :from (:argument 2)) ecx) @@ -121,13 +148,19 @@ (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)) - (storew type result 0 other-pointer-lowtag) + (sc-case type + (immediate + (aver (typep (tn-value type) '(unsigned-byte 8))) + (storeb (tn-value type) result 0 other-pointer-lowtag)) + (t + (storew type result 0 other-pointer-lowtag))) (storew length result vector-length-slot other-pointer-lowtag) (inst xor zero zero) (inst rep) (inst stos zero))) -(in-package :sb!c) +(in-package "SB!C") + (defoptimizer (allocate-vector stack-allocate-result) ((type length words) node) (ecase (policy node stack-allocate-vector) @@ -149,7 +182,7 @@ 'sb!vm::allocate-vector-on-heap)))) (dolist (arg args) (setf (lvar-info arg) - (make-ir2-lvar (primitive-type (lvar-type 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))) @@ -158,12 +191,13 @@ (dolist (arg args) (annotate-1-value-lvar arg)))) -(in-package :sb!vm) + +(in-package "SB!VM") ;;; (define-vop (allocate-code-object) (:args (boxed-arg :scs (any-reg) :target boxed) - (unboxed-arg :scs (any-reg) :target unboxed)) + (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) @@ -199,7 +233,7 @@ (storew name result fdefn-name-slot other-pointer-lowtag) (storew nil-value result fdefn-fun-slot other-pointer-lowtag) (storew (make-fixup "undefined_tramp" :foreign) - result fdefn-raw-addr-slot other-pointer-lowtag)))) + result fdefn-raw-addr-slot other-pointer-lowtag)))) (define-vop (make-closure) (:args (function :to :save :scs (descriptor-reg))) @@ -223,10 +257,11 @@ (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)))) ;;;; automatic allocators for primitive objects @@ -237,21 +272,47 @@ (:generator 1 (inst mov result unbound-marker-widetag))) +(define-vop (make-funcallable-instance-tramp) + (:args) + (:results (result :scs (any-reg))) + (:generator 1 + (inst lea result (make-fixup "funcallable_instance_tramp" :foreign)))) + (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) (:generator 50 - (pseudo-atomic - (allocation result (pad-data-block words) node) - (inst lea result (make-ea :byte :base result :disp lowtag)) - (when type - (storew (logior (ash (1- words) n-widetag-bits) type) - result - 0 - lowtag))))) + ;; We special case the allocation of conses, because they're + ;; extremely common and because the pseudo-atomic sequence on x86 + ;; is relatively heavyweight. However, if the user asks for top + ;; speed, we accomodate him. The primary reason that we don't + ;; 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 (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" + (svref *dword-register-names* + offset)))) into cases + finally (return `(case (tn-offset result) + ,@cases))))) + (aver (null type)) + (inst call (make-fixup dst :assembly-routine))) + (pseudo-atomic + (allocation result (pad-data-block words) node stack-allocate-p) + (inst lea result (make-ea :byte :base result :disp lowtag)) + (when type + (storew (logior (ash (1- words) n-widetag-bits) type) + result + 0 + lowtag)))))) (define-vop (var-alloc) (:args (extra :scs (any-reg))) @@ -264,15 +325,13 @@ (:node-var node) (:generator 50 (inst lea bytes - (make-ea :dword :base extra :disp (* (1+ words) n-word-bytes))) + (make-ea :dword :base extra :disp (* (1+ words) n-word-bytes))) (inst mov header bytes) (inst shl header (- n-widetag-bits 2)) ; w+1 to length field - (inst lea header ; (w-1 << 8) | type - (make-ea :dword :base header :disp (+ (ash -2 n-widetag-bits) type))) + (inst lea header ; (w-1 << 8) | type + (make-ea :dword :base header :disp (+ (ash -2 n-widetag-bits) type))) (inst and bytes (lognot lowtag-mask)) (pseudo-atomic (allocation result bytes node) (inst lea result (make-ea :byte :base result :disp lowtag)) (storew header result 0 lowtag)))) - -