X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Falloc.lisp;h=bcf3483a7b3072f3b3b89dc3dc964b469ca8062c;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=c01f9a2fd0abf47346fa3ae55dc8201393b87f63;hpb=4d50265fe5a3dd4ea5b35c8ec12fe2b88721d22c;p=sbcl.git diff --git a/src/compiler/x86/alloc.lisp b/src/compiler/x86/alloc.lisp index c01f9a2..bcf3483 100644 --- a/src/compiler/x86/alloc.lisp +++ b/src/compiler/x86/alloc.lisp @@ -12,6 +12,10 @@ (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)) @@ -40,7 +44,8 @@ (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) + (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) @@ -71,49 +76,6 @@ (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))) - (:temporary (:sc unsigned-reg :from :eval) temp) - (:temporary (:sc unsigned-reg :from (:argument 0)) boxed) - (:temporary (:sc unsigned-reg :from (:argument 1)) unboxed) - (: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)) - (pseudo-atomic - ;; comment from CMU CL code: - ;; now loading code into static space cause it can't move - ;; - ;; KLUDGE: What? What's all the cruft about saving fixups for then? - ;; I think what's happened is that ALLOCATE-CODE-OBJECT is the basic - ;; CMU CL primitive; this ALLOCATE-CODE-OBJECT was hacked for - ;; static space only in a simple-minded port to the X86; and then - ;; in an attempt to improve the port to the X86, - ;; ALLOCATE-DYNAMIC-CODE-OBJECT was defined. If that's right, I'd like - ;; to know why not just go back to the basic CMU CL behavior of - ;; ALLOCATE-CODE-OBJECT, where it makes a relocatable code object. - ;; -- WHN 19990916 - ;; - ;; FIXME: should have a check for overflow of static space - (load-symbol-value temp *static-space-free-pointer*) - (inst lea result (make-ea :byte :base temp :disp other-pointer-lowtag)) - (inst add temp boxed) - (inst add temp unboxed) - (store-symbol-value temp *static-space-free-pointer*) - (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) - (inst mov temp nil-value) - (storew temp result code-entry-points-slot other-pointer-lowtag)) - (storew temp result code-debug-info-slot other-pointer-lowtag))) - -(define-vop (allocate-dynamic-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) @@ -153,18 +115,19 @@ (define-vop (make-closure) (:args (function :to :save :scs (descriptor-reg))) - (:info length) + (:info length stack-allocate-p) (:temporary (:sc any-reg) temp) (:results (result :scs (descriptor-reg))) (:node-var node) (:generator 10 - (pseudo-atomic - (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)) - (storew (logior (ash (1- size) n-widetag-bits) closure-header-widetag) - result 0 fun-pointer-lowtag)) + (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)) + (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) (storew temp result closure-fun-slot fun-pointer-lowtag)))) @@ -224,39 +187,4 @@ (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)))) +