X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Falloc.lisp;h=74c49e8a336fab00c261b8b5bf34f156ae0dbbc8;hb=0e3c4b4db102bd204a30402d7e5a0de44aea57ce;hp=3a5624c917102cccbf23a7dc9bd34b972d0004ec;hpb=fae139755a81c0431e7f12f2af9b5f3abc1326dc;p=sbcl.git diff --git a/src/compiler/x86-64/alloc.lisp b/src/compiler/x86-64/alloc.lisp index 3a5624c..74c49e8 100644 --- a/src/compiler/x86-64/alloc.lisp +++ b/src/compiler/x86-64/alloc.lisp @@ -1,4 +1,4 @@ -;;;; allocation VOPs for the x86 +;;;; allocation VOPs for the x86-64 ;;;; This software is part of the SBCL system. See the README file for ;;;; more information. @@ -11,8 +11,7 @@ (in-package "SB!VM") -;;;; LIST and LIST* - +;;;; CONS, LIST and LIST* (define-vop (list-or-list*) (:args (things :more t)) (:temporary (:sc unsigned-reg) ptr temp) @@ -24,41 +23,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) - (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)))))) + ;; (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)) + (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 + stack-allocate-p 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)) @@ -68,32 +68,62 @@ ;;;; special-purpose inline allocators -(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) +;;; ALLOCATE-VECTOR +(define-vop (allocate-vector-on-heap) + (:args (type :scs (unsigned-reg)) + (length :scs (any-reg)) + (words :scs (any-reg))) + (:results (result :scs (descriptor-reg) :from :load)) + (:arg-types positive-fixnum + positive-fixnum + positive-fixnum) + (:policy :fast-safe) (: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) + (inst lea result (make-ea :byte :index words + :scale (ash 1 (- word-shift n-fixnum-tag-bits)) + :disp (+ lowtag-mask + (* vector-data-offset n-word-bytes)))) + (inst and result (lognot lowtag-mask)) (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))) + (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)))) + +(define-vop (allocate-vector-on-stack) + (:args (type :scs (unsigned-reg) :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 :eval) zero) + (:temporary (:sc any-reg :offset edi-offset) res) + (:results (result :scs (descriptor-reg) :from :load)) + (:arg-types positive-fixnum + positive-fixnum + positive-fixnum) + (:translate allocate-vector) + (:policy :fast-safe) + (:node-var node) + (:generator 100 + (inst lea result (make-ea :byte :index words + :scale (ash 1 (- word-shift n-fixnum-tag-bits)) + :disp (+ lowtag-mask + (* vector-data-offset n-word-bytes)))) + (inst and result (lognot lowtag-mask)) + ;; 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 other-pointer-lowtag) + (inst cld) + (inst lea res + (make-ea :byte :base result :disp (- (* vector-data-offset n-word-bytes) + other-pointer-lowtag))) + (storew type result 0 other-pointer-lowtag) + (storew length result vector-length-slot other-pointer-lowtag) + (zeroize zero) + (inst rep) + (inst stos zero))) + (define-vop (make-fdefn) (:policy :fast-safe) @@ -105,24 +135,22 @@ (with-fixed-allocation (result fdefn-widetag fdefn-size node) (storew name result fdefn-name-slot other-pointer-lowtag) (storew nil-value result fdefn-fun-slot other-pointer-lowtag) - (storew (make-fixup (extern-alien-name "undefined_tramp") :foreign) - result fdefn-raw-addr-slot other-pointer-lowtag)))) + (storew (make-fixup "undefined_tramp" :foreign) + 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 (:sc any-reg) temp) (:results (result :scs (descriptor-reg))) (:node-var node) (:generator 10 - (pseudo-atomic + (maybe-pseudo-atomic stack-allocate-p (let ((size (+ length closure-info-offset))) - (allocation result (pad-data-block size) node) - (inst lea result - (make-ea :byte :base result :disp fun-pointer-lowtag)) + (allocation result (pad-data-block size) node stack-allocate-p + fun-pointer-lowtag) (storew (logior (ash (1- size) n-widetag-bits) closure-header-widetag) - result 0 fun-pointer-lowtag)) + result 0 fun-pointer-lowtag)) (loadw temp function closure-fun-slot fun-pointer-lowtag) (storew temp result closure-fun-slot fun-pointer-lowtag)))) @@ -130,35 +158,41 @@ (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)) - (storew value result value-cell-value-slot other-pointer-lowtag))) + (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 (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 (make-funcallable-instance-tramp) + (:args) + (:results (result :scs (any-reg))) + (:generator 1 + (inst mov 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)) + (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 - 0 - lowtag))))) + result + 0 + lowtag))))) (define-vop (var-alloc) (:args (extra :scs (any-reg))) @@ -171,50 +205,15 @@ (:node-var node) (:generator 50 (inst lea bytes - (make-ea :qword :base extra :disp (* (1+ words) n-word-bytes))) + (make-ea :qword :disp (* (1+ words) n-word-bytes) :index extra + :scale (ash 1 (- word-shift n-fixnum-tag-bits)))) (inst mov header bytes) - (inst shl header (- n-widetag-bits 3)) ; w+1 to length field - (inst lea header ; (w-1 << 8) | type - (make-ea :qword :base header :disp (+ (ash -2 n-widetag-bits) type))) + (inst shl header (- n-widetag-bits word-shift)) ; w+1 to length field + (inst lea header ; (w-1 << 8) | type + (make-ea :qword :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)))) - -(define-vop (make-symbol) - (:policy :fast-safe) - (:translate make-symbol) - (:args (name :scs (descriptor-reg) :to :eval)) - (:temporary (:sc unsigned-reg :from :eval) temp) - (:results (result :scs (descriptor-reg) :from :argument)) - (:node-var node) - (:generator 37 - (with-fixed-allocation (result symbol-header-widetag symbol-size node) - (storew name result symbol-name-slot other-pointer-lowtag) - (storew unbound-marker-widetag - result - symbol-value-slot - other-pointer-lowtag) - ;; Set up a random hash value for the symbol. Perhaps the object - ;; address could be used for even faster and smaller code! - ;; FIXME: We don't mind the symbol hash not being repeatable, so - ;; we might as well add in the object address here, too. (Adding entropy - ;; is good, even if ANSI doesn't understand that.) - (inst imul temp - (make-fixup (extern-alien-name "fast_random_state") :foreign) - 1103515245) - (inst add temp 12345) - (inst mov (make-fixup (extern-alien-name "fast_random_state") :foreign) - temp) - ;; We want a positive fixnum for the hash value, so discard the LS bits. - ;; - ;; FIXME: OK, who wants to tell me (CSR) why these two - ;; instructions aren't replaced by (INST AND TEMP #x8FFFFFFC)? - ;; Are the following two instructions actually faster? Does the - ;; difference in behaviour really matter? - (inst shr temp 1) - (inst and temp #xfffffffc) - (storew temp result symbol-hash-slot other-pointer-lowtag) - (storew nil-value result symbol-plist-slot other-pointer-lowtag) - (storew nil-value result symbol-package-slot other-pointer-lowtag))))