X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Farray.lisp;h=7228e6ddb8fba93ba90926d06d29d9eadd103b6a;hb=bc46c8bcdd6ac8918df8ea9e9db49808e4924fcf;hp=b940fc6428aa443063216c08c8844211ba5a2776;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git diff --git a/src/compiler/x86/array.lisp b/src/compiler/x86/array.lisp index b940fc6..7228e6d 100644 --- a/src/compiler/x86/array.lisp +++ b/src/compiler/x86/array.lisp @@ -26,7 +26,7 @@ (:generator 13 (inst lea bytes (make-ea :dword :base rank - :disp (+ (* (1+ array-dimensions-offset) word-bytes) + :disp (+ (* (1+ array-dimensions-offset) n-word-bytes) lowtag-mask))) (inst and bytes (lognot lowtag-mask)) (inst lea header (make-ea :dword :base rank @@ -72,6 +72,42 @@ ;;; Note that the immediate SC for the index argument is disabled ;;; because it is not possible to generate a valid error code SC for ;;; an immediate value. +;;; +;;; FIXME: As per the KLUDGE note explaining the :IGNORE-FAILURE-P +;;; flag in build-order.lisp-expr, compiling this file causes warnings +;;; Argument FOO to VOP CHECK-BOUND has SC restriction +;;; DESCRIPTOR-REG which is not allowed by the operand type: +;;; (:OR POSITIVE-FIXNUM) +;;; CSR's message "format ~/ /" on sbcl-devel 2002-03-12 contained +;;; a possible patch, described as +;;; Another patch is included more for information than anything -- +;;; removing the descriptor-reg SCs from the CHECK-BOUND vop in +;;; x86/array.lisp seems to allow that file to compile without error[*], +;;; and build; I haven't tested rebuilding capability, but I'd be +;;; surprised if there were a problem. I'm not certain that this is the +;;; correct fix, though, as the restrictions on the arguments to the VOP +;;; aren't the same as in the sparc and alpha ports, where, incidentally, +;;; the corresponding file builds without error currently. +;;; Since neither of us (CSR or WHN) was quite sure that this is the +;;; right thing, I've just recorded the patch here in hopes it might +;;; help when someone attacks this problem again: +;;; diff -u -r1.7 array.lisp +;;; --- src/compiler/x86/array.lisp 11 Oct 2001 14:05:26 -0000 1.7 +;;; +++ src/compiler/x86/array.lisp 12 Mar 2002 12:23:37 -0000 +;;; @@ -76,10 +76,10 @@ +;;; (:translate %check-bound) +;;; (:policy :fast-safe) +;;; (:args (array :scs (descriptor-reg)) +;;; - (bound :scs (any-reg descriptor-reg)) +;;; - (index :scs (any-reg descriptor-reg #+nil immediate) :target result)) +;;; + (bound :scs (any-reg)) +;;; + (index :scs (any-reg #+nil immediate) :target result)) +;;; (:arg-types * positive-fixnum tagged-num) +;;; - (:results (result :scs (any-reg descriptor-reg))) +;;; + (:results (result :scs (any-reg))) +;;; (:result-types positive-fixnum) +;;; (:vop-var vop) +;;; (:save-p :compute-only) (define-vop (check-bound) (:translate %check-bound) (:policy :fast-safe) @@ -121,7 +157,7 @@ ;;;; bit, 2-bit, and 4-bit vectors (macrolet ((def-small-data-vector-frobs (type bits) - (let* ((elements-per-word (floor sb!vm:word-bits bits)) + (let* ((elements-per-word (floor sb!vm:n-word-bits bits)) (bit-shift (1- (integer-length elements-per-word)))) `(progn (define-vop (,(symbolicate 'data-vector-ref/ type)) @@ -139,7 +175,7 @@ (inst shr ecx ,bit-shift) (inst mov result (make-ea :dword :base object :index ecx :scale 4 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))) (move ecx index) (inst and ecx ,(1- elements-per-word)) @@ -182,7 +218,7 @@ (inst shr word-index ,bit-shift) (inst lea ptr (make-ea :dword :base object :index word-index :scale 4 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))) (loadw old ptr) (move ecx index) @@ -220,7 +256,8 @@ (multiple-value-bind (word extra) (floor index ,elements-per-word) (inst mov old (make-ea :dword :base object - :disp (- (* (+ word vector-data-offset) word-bytes) + :disp (- (* (+ word vector-data-offset) + n-word-bytes) other-pointer-lowtag))) (sc-case value (immediate @@ -240,7 +277,7 @@ (inst rol old shift))))) (inst mov (make-ea :dword :base object :disp (- (* (+ word vector-data-offset) - word-bytes) + n-word-bytes) other-pointer-lowtag)) old) (sc-case value @@ -266,7 +303,8 @@ (:generator 5 (with-empty-tn@fp-top(value) (inst fld (make-ea :dword :base object :index index :scale 1 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag)))))) (define-vop (data-vector-ref-c/simple-array-single-float) @@ -282,7 +320,7 @@ (with-empty-tn@fp-top(value) (inst fld (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 4 index)) sb!vm:other-pointer-lowtag)))))) @@ -301,7 +339,7 @@ ;; Value is in ST0. (inst fst (make-ea :dword :base object :index index :scale 1 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) ;; Value is in ST0 but not result. @@ -311,7 +349,7 @@ (inst fxch value) (inst fst (make-ea :dword :base object :index index :scale 1 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) ;; The result is in ST0. @@ -338,7 +376,7 @@ ;; Value is in ST0. (inst fst (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 4 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) @@ -349,7 +387,7 @@ (inst fxch value) (inst fst (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 4 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) @@ -373,7 +411,8 @@ (:generator 7 (with-empty-tn@fp-top(value) (inst fldd (make-ea :dword :base object :index index :scale 2 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag)))))) (define-vop (data-vector-ref-c/simple-array-double-float) @@ -389,7 +428,7 @@ (with-empty-tn@fp-top(value) (inst fldd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag)))))) @@ -408,7 +447,7 @@ ;; Value is in ST0. (inst fstd (make-ea :dword :base object :index index :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) ;; Value is in ST0 but not result. @@ -418,7 +457,7 @@ (inst fxch value) (inst fstd (make-ea :dword :base object :index index :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) ;; The result is in ST0. @@ -445,7 +484,7 @@ ;; Value is in ST0. (inst fstd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) @@ -456,7 +495,7 @@ (inst fxch value) (inst fstd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) @@ -485,7 +524,7 @@ (with-empty-tn@fp-top(value) (inst fldl (make-ea :dword :base object :index temp :scale 1 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag)))))) #!+long-float @@ -502,7 +541,7 @@ (with-empty-tn@fp-top(value) (inst fldl (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 12 index)) sb!vm:other-pointer-lowtag)))))) @@ -525,7 +564,7 @@ ;; Value is in ST0. (store-long-float (make-ea :dword :base object :index temp :scale 1 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) ;; Value is in ST0 but not result. @@ -535,7 +574,7 @@ (inst fxch value) (store-long-float (make-ea :dword :base object :index temp :scale 1 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) ;; The result is in ST0. @@ -562,7 +601,7 @@ ;; Value is in ST0. (store-long-float (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 12 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result)) @@ -573,7 +612,7 @@ (inst fxch value) (store-long-float (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 12 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result)) @@ -601,13 +640,13 @@ (with-empty-tn@fp-top (real-tn) (inst fld (make-ea :dword :base object :index index :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-single-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fld (make-ea :dword :base object :index index :scale 2 :disp (- (* (1+ sb!vm:vector-data-offset) - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))))))) (define-vop (data-vector-ref-c/simple-array-complex-single-float) @@ -624,14 +663,14 @@ (with-empty-tn@fp-top (real-tn) (inst fld (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-single-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fld (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index) 4) sb!vm:other-pointer-lowtag))))))) @@ -653,7 +692,7 @@ ;; Value is in ST0. (inst fst (make-ea :dword :base object :index index :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) ;; Value is in ST0 but not result. @@ -663,7 +702,7 @@ (inst fxch value-real) (inst fst (make-ea :dword :base object :index index :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) ;; The result is in ST0. @@ -678,7 +717,7 @@ (inst fxch value-imag) (inst fst (make-ea :dword :base object :index index :scale 2 :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) 4) sb!vm:other-pointer-lowtag))) (unless (location= value-imag result-imag) @@ -703,7 +742,7 @@ ;; Value is in ST0. (inst fst (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) @@ -714,7 +753,7 @@ (inst fxch value-real) (inst fst (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) @@ -730,7 +769,7 @@ (inst fxch value-imag) (inst fst (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 8 index) 4) sb!vm:other-pointer-lowtag))) (unless (location= value-imag result-imag) @@ -752,13 +791,13 @@ (with-empty-tn@fp-top (real-tn) (inst fldd (make-ea :dword :base object :index index :scale 4 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-double-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fldd (make-ea :dword :base object :index index :scale 4 :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) 8) sb!vm:other-pointer-lowtag))))))) @@ -776,14 +815,14 @@ (with-empty-tn@fp-top (real-tn) (inst fldd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 16 index)) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-double-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fldd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 16 index) 8) sb!vm:other-pointer-lowtag))))))) @@ -805,7 +844,7 @@ ;; Value is in ST0. (inst fstd (make-ea :dword :base object :index index :scale 4 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) ;; Value is in ST0 but not result. @@ -815,7 +854,7 @@ (inst fxch value-real) (inst fstd (make-ea :dword :base object :index index :scale 4 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) ;; The result is in ST0. @@ -830,7 +869,7 @@ (inst fxch value-imag) (inst fstd (make-ea :dword :base object :index index :scale 4 :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) 8) sb!vm:other-pointer-lowtag))) (unless (location= value-imag result-imag) @@ -855,7 +894,7 @@ ;; Value is in ST0. (inst fstd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 16 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) @@ -866,7 +905,7 @@ (inst fxch value-real) (inst fstd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 16 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) @@ -882,7 +921,7 @@ (inst fxch value-imag) (inst fstd (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 16 index) 8) sb!vm:other-pointer-lowtag))) (unless (location= value-imag result-imag) @@ -908,13 +947,13 @@ (with-empty-tn@fp-top (real-tn) (inst fldl (make-ea :dword :base object :index temp :scale 2 :disp (- (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-long-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fldl (make-ea :dword :base object :index temp :scale 2 :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) 12) sb!vm:other-pointer-lowtag))))))) @@ -933,14 +972,14 @@ (with-empty-tn@fp-top (real-tn) (inst fldl (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 24 index)) sb!vm:other-pointer-lowtag))))) (let ((imag-tn (complex-long-reg-imag-tn value))) (with-empty-tn@fp-top (imag-tn) (inst fldl (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 24 index) 12) sb!vm:other-pointer-lowtag))))))) @@ -966,7 +1005,7 @@ ;; Value is in ST0. (store-long-float (make-ea :dword :base object :index temp :scale 2 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) ;; Value is in ST0 but not result. @@ -976,7 +1015,7 @@ (inst fxch value-real) (store-long-float (make-ea :dword :base object :index temp :scale 2 - :disp (- (* sb!vm:vector-data-offset sb!vm:word-bytes) + :disp (- (* sb!vm:vector-data-offset sb!vm:n-word-bytes) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) ;; The result is in ST0. @@ -991,7 +1030,7 @@ (inst fxch value-imag) (store-long-float (make-ea :dword :base object :index temp :scale 2 - :disp (- (+ (* sb!vm:vector-data-offset sb!vm:word-bytes) 12) + :disp (- (+ (* sb!vm:vector-data-offset sb!vm:n-word-bytes) 12) sb!vm:other-pointer-lowtag))) (unless (location= value-imag result-imag) (inst fstd result-imag)) @@ -1017,7 +1056,7 @@ (store-long-float (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 24 index)) sb!vm:other-pointer-lowtag))) (unless (zerop (tn-offset result-real)) @@ -1029,7 +1068,7 @@ (store-long-float (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) (* 24 index)) sb!vm:other-pointer-lowtag))) (cond ((zerop (tn-offset result-real)) @@ -1046,7 +1085,7 @@ (store-long-float (make-ea :dword :base object :disp (- (+ (* sb!vm:vector-data-offset - sb!vm:word-bytes) + sb!vm:n-word-bytes) ;; FIXME: There are so many of these bare constants ;; (24, 12..) in the LONG-FLOAT code that it's ;; ridiculous. I should probably just delete it all @@ -1071,7 +1110,7 @@ (:generator 5 (inst movzx value (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-unsigned-byte-8) @@ -1085,7 +1124,7 @@ (:generator 4 (inst movzx value (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-unsigned-byte-8) @@ -1103,7 +1142,7 @@ (:generator 5 (move eax value) (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)) al-tn) (move result eax))) @@ -1124,7 +1163,7 @@ (:generator 4 (move eax value) (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag)) al-tn) (move result eax))) @@ -1142,7 +1181,7 @@ (:generator 5 (inst movzx value (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-unsigned-byte-16) @@ -1156,7 +1195,7 @@ (:generator 4 (inst movzx value (make-ea :word :base object - :disp (- (+ (* vector-data-offset word-bytes) (* 2 index)) + :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-unsigned-byte-16) @@ -1174,7 +1213,7 @@ (:generator 5 (move eax value) (inst mov (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)) ax-tn) (move result eax))) @@ -1195,7 +1234,7 @@ (:generator 4 (move eax value) (inst mov (make-ea :word :base object - :disp (- (+ (* vector-data-offset word-bytes) + :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) other-pointer-lowtag)) ax-tn) @@ -1220,7 +1259,7 @@ (:generator 5 (inst mov al-tn (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))) (move value al-tn))) @@ -1239,7 +1278,7 @@ (:generator 4 (inst mov al-tn (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag))) (move value al-tn))) @@ -1254,7 +1293,7 @@ (:result-types base-char) (:generator 5 (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)) value) (move result value))) @@ -1270,7 +1309,7 @@ (:result-types base-char) (:generator 4 (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag)) value) (move result value))) @@ -1288,7 +1327,7 @@ (:generator 5 (inst movsx value (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-signed-byte-8) @@ -1302,7 +1341,7 @@ (:generator 4 (inst movsx value (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag))))) (define-vop (data-vector-set/simple-array-signed-byte-8) @@ -1320,7 +1359,7 @@ (:generator 5 (move eax value) (inst mov (make-ea :byte :base object :index index :scale 1 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)) al-tn) (move result eax))) @@ -1341,7 +1380,7 @@ (:generator 4 (move eax value) (inst mov (make-ea :byte :base object - :disp (- (+ (* vector-data-offset word-bytes) index) + :disp (- (+ (* vector-data-offset n-word-bytes) index) other-pointer-lowtag)) al-tn) (move result eax))) @@ -1359,7 +1398,7 @@ (:generator 5 (inst movsx value (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))) (define-vop (data-vector-ref-c/simple-array-signed-byte-16) @@ -1373,7 +1412,7 @@ (:generator 4 (inst movsx value (make-ea :word :base object - :disp (- (+ (* vector-data-offset word-bytes) + :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) other-pointer-lowtag))))) @@ -1392,7 +1431,7 @@ (:generator 5 (move eax value) (inst mov (make-ea :word :base object :index index :scale 2 - :disp (- (* vector-data-offset word-bytes) + :disp (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)) ax-tn) (move result eax))) @@ -1413,7 +1452,7 @@ (move eax value) (inst mov (make-ea :word :base object - :disp (- (+ (* vector-data-offset word-bytes) + :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index)) other-pointer-lowtag)) ax-tn)