X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=7ba583916f328f007bf184ec25b29b06cf0c0b68;hb=bc7cd341567dd3b2978c2accb6063356280fb80e;hp=28060d92075f51aa119aa6ed5b4092077406c6bd;hpb=6b0e40584d83dfc32e028b5835d973bdbd61e182;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index 28060d9..7ba5839 100644 --- a/src/compiler/x86-64/array.lisp +++ b/src/compiler/x86-64/array.lisp @@ -14,7 +14,7 @@ ;; For use in constant indexing; we can't use INDEX since the displacement ;; field of an EA can't contain 64 bit values. -(deftype low-index () '(signed-byte 29)) +(def!type low-index () '(signed-byte 29)) ;;;; allocator for the array header @@ -637,82 +637,86 @@ (:byte 1) (:word 2) (:dword 4)))) - `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg)) - (index :scs (unsigned-reg))) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - ,n-bytes vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst ,mov-inst value - (make-ea ,operand-size :base object :index index :scale ,n-bytes - :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset ,n-bytes)) - other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) - (:translate data-vector-ref-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg))) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - ,n-bytes vector-data-offset))) - (:results (value :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst ,mov-inst value - (make-ea ,operand-size :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* ,n-bytes index) - (* ,n-bytes offset)) - other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) - (:translate data-vector-set-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (index :scs (unsigned-reg) :to (:eval 0)) - (value :scs ,scs :target result)) - (:info offset) - (:arg-types ,ptype positive-fixnum - (:constant (constant-displacement other-pointer-lowtag - ,n-bytes vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 5 - (inst mov (make-ea ,operand-size :base object :index index :scale ,n-bytes - :disp (- (+ (* vector-data-offset n-word-bytes) - (* offset ,n-bytes)) - other-pointer-lowtag)) - (reg-in-size value ,operand-size)) - (move result value))) - - (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) - (:translate data-vector-set-with-offset) - (:policy :fast-safe) - (:args (object :scs (descriptor-reg) :to (:eval 0)) - (value :scs ,scs :target result)) - (:info index offset) - (:arg-types ,ptype (:constant low-index) - (:constant (constant-displacement other-pointer-lowtag - ,n-bytes vector-data-offset)) - ,type) - (:results (result :scs ,scs)) - (:result-types ,type) - (:generator 4 - (inst mov (make-ea ,operand-size :base object - :disp (- (+ (* vector-data-offset n-word-bytes) - (* ,n-bytes index) - (* ,n-bytes offset)) - other-pointer-lowtag)) - (reg-in-size value ,operand-size)) - (move result value))))))) + (multiple-value-bind (index-sc scale) + (if (>= n-bytes (ash 1 n-fixnum-tag-bits)) + (values 'any-reg (ash n-bytes (- n-fixnum-tag-bits))) + (values 'unsigned-reg n-bytes)) + `(progn + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) + (:translate data-vector-ref-with-offset) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg)) + (index :scs (,index-sc))) + (:info offset) + (:arg-types ,ptype positive-fixnum + (:constant (constant-displacement other-pointer-lowtag + ,n-bytes vector-data-offset))) + (:results (value :scs ,scs)) + (:result-types ,type) + (:generator 5 + (inst ,mov-inst value + (make-ea ,operand-size :base object :index index :scale ,scale + :disp (- (+ (* vector-data-offset n-word-bytes) + (* offset ,n-bytes)) + other-pointer-lowtag))))) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) + (:translate data-vector-ref-with-offset) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg))) + (:info index offset) + (:arg-types ,ptype (:constant low-index) + (:constant (constant-displacement other-pointer-lowtag + ,n-bytes vector-data-offset))) + (:results (value :scs ,scs)) + (:result-types ,type) + (:generator 4 + (inst ,mov-inst value + (make-ea ,operand-size :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* ,n-bytes index) + (* ,n-bytes offset)) + other-pointer-lowtag))))) + (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype)) + (:translate data-vector-set-with-offset) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (index :scs (,index-sc) :to (:eval 0)) + (value :scs ,scs :target result)) + (:info offset) + (:arg-types ,ptype positive-fixnum + (:constant (constant-displacement other-pointer-lowtag + ,n-bytes vector-data-offset)) + ,type) + (:results (result :scs ,scs)) + (:result-types ,type) + (:generator 5 + (inst mov (make-ea ,operand-size :base object :index index :scale ,scale + :disp (- (+ (* vector-data-offset n-word-bytes) + (* offset ,n-bytes)) + other-pointer-lowtag)) + (reg-in-size value ,operand-size)) + (move result value))) + + (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype)) + (:translate data-vector-set-with-offset) + (:policy :fast-safe) + (:args (object :scs (descriptor-reg) :to (:eval 0)) + (value :scs ,scs :target result)) + (:info index offset) + (:arg-types ,ptype (:constant low-index) + (:constant (constant-displacement other-pointer-lowtag + ,n-bytes vector-data-offset)) + ,type) + (:results (result :scs ,scs)) + (:result-types ,type) + (:generator 4 + (inst mov (make-ea ,operand-size :base object + :disp (- (+ (* vector-data-offset n-word-bytes) + (* ,n-bytes index) + (* ,n-bytes offset)) + other-pointer-lowtag)) + (reg-in-size value ,operand-size)) + (move result value)))))))) (define-data-vector-frobs simple-array-unsigned-byte-7 movzx :byte positive-fixnum unsigned-reg signed-reg) (define-data-vector-frobs simple-array-unsigned-byte-8 movzx :byte