X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Falloc.lisp;h=9e448537d1fd3f0affd542dd77599fd3c06ca4ac;hb=33a45339444f8418c8c537c43d59fc3d5ea3098b;hp=dfcf4bfb7923d53e60e0b317dd104c37b4fd57dc;hpb=6822034325136cde4e14773c83c3769b42721306;p=sbcl.git diff --git a/src/compiler/x86-64/alloc.lisp b/src/compiler/x86-64/alloc.lisp index dfcf4bf..9e44853 100644 --- a/src/compiler/x86-64/alloc.lisp +++ b/src/compiler/x86-64/alloc.lisp @@ -90,12 +90,12 @@ (storew length result vector-length-slot other-pointer-lowtag)))) (define-vop (allocate-vector-on-stack) - (:args (type :scs (unsigned-reg)) - (length :scs (any-reg)) + (: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 (: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 @@ -122,35 +122,6 @@ (inst rep) (inst stos zero))) -(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))) (define-vop (make-fdefn) (:policy :fast-safe)