X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Farray.lisp;h=2dc0a4095e2b7a9d5b7f99907000a54bad55b726;hb=9af8ab0a80bbd4d579ed4a12d2a2819a7490901a;hp=504ef62cafcfc2a92a563c522507eadeab97b891;hpb=c6538bf61955a67d0145aa3e6c937f6dd03f9e51;p=sbcl.git diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp index 504ef62..2dc0a40 100644 --- a/src/compiler/x86-64/array.lisp +++ b/src/compiler/x86-64/array.lisp @@ -343,7 +343,7 @@ complex-offset) other-pointer-lowtag)))))) -(define-vop (data-vector-ref/simple-array-single-float) +(define-vop (data-vector-ref-with-offset/simple-array-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -361,7 +361,7 @@ (inst shr dword-index 1) (inst movss value (make-ea-for-float-ref object dword-index offset 4)))) -(define-vop (data-vector-ref-c/simple-array-single-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -375,7 +375,7 @@ (:generator 4 (inst movss value (make-ea-for-float-ref object index offset 4)))) -(define-vop (data-vector-set/simple-array-single-float) +(define-vop (data-vector-set-with-offset/simple-array-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -394,10 +394,9 @@ (move dword-index index) (inst shr dword-index 1) (inst movss (make-ea-for-float-ref object dword-index offset 4) value) - (unless (location= result value) - (inst movss result value)))) + (move result value))) -(define-vop (data-vector-set-c/simple-array-single-float) +(define-vop (data-vector-set-c-with-offset/simple-array-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -412,10 +411,9 @@ (:result-types single-float) (:generator 4 (inst movss (make-ea-for-float-ref object index offset 4) value) - (unless (location= result value) - (inst movss result value)))) + (move result value))) -(define-vop (data-vector-ref/simple-array-double-float) +(define-vop (data-vector-ref-with-offset/simple-array-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -444,7 +442,7 @@ (:generator 6 (inst movsd value (make-ea-for-float-ref object index offset 8)))) -(define-vop (data-vector-set/simple-array-double-float) +(define-vop (data-vector-set-with-offset/simple-array-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -460,10 +458,9 @@ (:result-types double-float) (:generator 20 (inst movsd (make-ea-for-float-ref object index offset 8) value) - (unless (location= result value) - (inst movsd result value)))) + (move result value))) -(define-vop (data-vector-set-c/simple-array-double-float) +(define-vop (data-vector-set-c-with-offset/simple-array-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -478,13 +475,12 @@ (:result-types double-float) (:generator 19 (inst movsd (make-ea-for-float-ref object index offset 8) value) - (unless (location= result value) - (inst movsd result value)))) + (move result value))) ;;; complex float variants -(define-vop (data-vector-ref/simple-array-complex-single-float) +(define-vop (data-vector-ref-with-offset/simple-array-complex-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -497,13 +493,9 @@ (:results (value :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 5 - (let ((real-tn (complex-single-reg-real-tn value))) - (inst movss real-tn (make-ea-for-float-ref object index offset 8))) - (let ((imag-tn (complex-single-reg-imag-tn value))) - (inst movss imag-tn (make-ea-for-float-ref object index offset 8 - :complex-offset 4))))) + (inst movq value (make-ea-for-float-ref object index offset 8)))) -(define-vop (data-vector-ref-c/simple-array-complex-single-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-complex-single-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -515,13 +507,9 @@ (:results (value :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 4 - (let ((real-tn (complex-single-reg-real-tn value))) - (inst movss real-tn (make-ea-for-float-ref object index offset 8))) - (let ((imag-tn (complex-single-reg-imag-tn value))) - (inst movss imag-tn (make-ea-for-float-ref object index offset 8 - :complex-offset 4))))) + (inst movq value (make-ea-for-float-ref object index offset 8)))) -(define-vop (data-vector-set/simple-array-complex-single-float) +(define-vop (data-vector-set-with-offset/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -536,20 +524,10 @@ (:results (result :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 5 - (let ((value-real (complex-single-reg-real-tn value)) - (result-real (complex-single-reg-real-tn result))) - (inst movss (make-ea-for-float-ref object index offset 8) value-real) - (unless (location= value-real result-real) - (inst movss result-real value-real))) - (let ((value-imag (complex-single-reg-imag-tn value)) - (result-imag (complex-single-reg-imag-tn result))) - (inst movss (make-ea-for-float-ref object index offset 8 - :complex-offset 4) - value-imag) - (unless (location= value-imag result-imag) - (inst movss result-imag value-imag))))) - -(define-vop (data-vector-set-c/simple-array-complex-single-float) + (move result value) + (inst movq (make-ea-for-float-ref object index offset 8) value))) + +(define-vop (data-vector-set-c-with-offset/simple-array-complex-single-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -563,20 +541,10 @@ (:results (result :scs (complex-single-reg))) (:result-types complex-single-float) (:generator 4 - (let ((value-real (complex-single-reg-real-tn value)) - (result-real (complex-single-reg-real-tn result))) - (inst movss (make-ea-for-float-ref object index offset 8) value-real) - (unless (location= value-real result-real) - (inst movss result-real value-real))) - (let ((value-imag (complex-single-reg-imag-tn value)) - (result-imag (complex-single-reg-imag-tn result))) - (inst movss (make-ea-for-float-ref object index offset 8 - :complex-offset 4) - value-imag) - (unless (location= value-imag result-imag) - (inst movss result-imag value-imag))))) - -(define-vop (data-vector-ref/simple-array-complex-double-float) + (move result value) + (inst movq (make-ea-for-float-ref object index offset 8) value))) + +(define-vop (data-vector-ref-with-offset/simple-array-complex-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -589,13 +557,9 @@ (:results (value :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 7 - (let ((real-tn (complex-double-reg-real-tn value))) - (inst movsd real-tn (make-ea-for-float-ref object index offset 16 :scale 2))) - (let ((imag-tn (complex-double-reg-imag-tn value))) - (inst movsd imag-tn (make-ea-for-float-ref object index offset 16 :scale 2 - :complex-offset 8))))) + (inst movapd value (make-ea-for-float-ref object index offset 16 :scale 2)))) -(define-vop (data-vector-ref-c/simple-array-complex-double-float) +(define-vop (data-vector-ref-c-with-offset/simple-array-complex-double-float) (:note "inline array access") (:translate data-vector-ref-with-offset) (:policy :fast-safe) @@ -607,13 +571,9 @@ (:results (value :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 6 - (let ((real-tn (complex-double-reg-real-tn value))) - (inst movsd real-tn (make-ea-for-float-ref object index offset 16 :scale 2))) - (let ((imag-tn (complex-double-reg-imag-tn value))) - (inst movsd imag-tn (make-ea-for-float-ref object index offset 16 :scale 2 - :complex-offset 8))))) + (inst movapd value (make-ea-for-float-ref object index offset 16 :scale 2)))) -(define-vop (data-vector-set/simple-array-complex-double-float) +(define-vop (data-vector-set-with-offset/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -628,21 +588,10 @@ (:results (result :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 20 - (let ((value-real (complex-double-reg-real-tn value)) - (result-real (complex-double-reg-real-tn result))) - (inst movsd (make-ea-for-float-ref object index offset 16 :scale 2) - value-real) - (unless (location= value-real result-real) - (inst movsd result-real value-real))) - (let ((value-imag (complex-double-reg-imag-tn value)) - (result-imag (complex-double-reg-imag-tn result))) - (inst movsd (make-ea-for-float-ref object index offset 16 :scale 2 - :complex-offset 8) - value-imag) - (unless (location= value-imag result-imag) - (inst movsd result-imag value-imag))))) - -(define-vop (data-vector-set-c/simple-array-complex-double-float) + (inst movapd (make-ea-for-float-ref object index offset 16 :scale 2) value) + (move result value))) + +(define-vop (data-vector-set-c-with-offset/simple-array-complex-double-float) (:note "inline array store") (:translate data-vector-set-with-offset) (:policy :fast-safe) @@ -656,19 +605,8 @@ (:results (result :scs (complex-double-reg))) (:result-types complex-double-float) (:generator 19 - (let ((value-real (complex-double-reg-real-tn value)) - (result-real (complex-double-reg-real-tn result))) - (inst movsd (make-ea-for-float-ref object index offset 16 :scale 2) - value-real) - (unless (location= value-real result-real) - (inst movsd result-real value-real))) - (let ((value-imag (complex-double-reg-imag-tn value)) - (result-imag (complex-double-reg-imag-tn result))) - (inst movsd (make-ea-for-float-ref object index offset 16 :scale 2 - :complex-offset 8) - value-imag) - (unless (location= value-imag result-imag) - (inst movsd result-imag value-imag))))) + (inst movapd (make-ea-for-float-ref object index offset 16 :scale 2) value) + (move result value))) @@ -676,7 +614,7 @@ (macrolet ((define-data-vector-frobs (ptype mov-inst type 8-bit-tns-p &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -693,7 +631,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) offset) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -709,7 +647,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) index offset) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (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)) @@ -734,7 +672,7 @@ other-pointer-lowtag)) ,(if 8-bit-tns-p 'value 'al-tn)) (move result ,(if 8-bit-tns-p 'value 'rax)))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (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)) @@ -772,7 +710,7 @@ ;;; unsigned-byte-16 (macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -789,7 +727,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) (* offset 2)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -806,7 +744,7 @@ (* 2 index) (* 2 offset)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (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)) @@ -831,7 +769,7 @@ ax-tn) (move result eax))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (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)) @@ -864,7 +802,7 @@ (macrolet ((define-data-vector-frobs (ptype mov-inst type &rest scs) `(progn - (define-vop (,(symbolicate "DATA-VECTOR-REF/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg)) @@ -881,7 +819,7 @@ :disp (- (+ (* vector-data-offset n-word-bytes) (* offset 4)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-REF-C/" ptype)) + (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype)) (:translate data-vector-ref-with-offset) (:policy :fast-safe) (:args (object :scs (descriptor-reg))) @@ -898,7 +836,7 @@ (* 4 index) (* 4 offset)) other-pointer-lowtag))))) - (define-vop (,(symbolicate "DATA-VECTOR-SET/" ptype)) + (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)) @@ -923,7 +861,7 @@ eax-tn) (move result rax))) - (define-vop (,(symbolicate "DATA-VECTOR-SET-C/" ptype)) + (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)) @@ -960,10 +898,6 @@ ;;; These vops are useful for accessing the bits of a vector ;;; irrespective of what type of vector it is. -(define-full-reffer raw-bits * 0 other-pointer-lowtag (unsigned-reg) - unsigned-num %raw-bits) -(define-full-setter set-raw-bits * 0 other-pointer-lowtag (unsigned-reg) - unsigned-num %set-raw-bits) (define-full-reffer vector-raw-bits * vector-data-offset other-pointer-lowtag (unsigned-reg) unsigned-num %vector-raw-bits) (define-full-setter set-vector-raw-bits * vector-data-offset other-pointer-lowtag