;;;; files for more information.
(in-package "SB!VM")
-
-(file-comment
- "$Header$")
\f
;;;; allocator for the array header
(: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
:disp (fixnumize (1- array-dimensions-offset))))
- (inst shl header type-bits)
+ (inst shl header n-widetag-bits)
(inst or header type)
(inst shr header 2)
(pseudo-atomic
(allocation result bytes node)
- (inst lea result (make-ea :dword :base result :disp other-pointer-type))
- (storew header result 0 other-pointer-type))))
+ (inst lea result (make-ea :dword :base result :disp other-pointer-lowtag))
+ (storew header result 0 other-pointer-lowtag))))
\f
;;;; additional accessors and setters for the array header
())
(define-full-reffer %array-dimension *
- array-dimensions-offset other-pointer-type
+ array-dimensions-offset other-pointer-lowtag
(any-reg) positive-fixnum sb!impl::%array-dimension)
(define-full-setter %set-array-dimension *
- array-dimensions-offset other-pointer-type
+ array-dimensions-offset other-pointer-lowtag
(any-reg) positive-fixnum sb!impl::%set-array-dimension)
(defknown sb!impl::%array-rank (t) index (flushable))
(:results (res :scs (unsigned-reg)))
(:result-types positive-fixnum)
(:generator 6
- (loadw res x 0 other-pointer-type)
- (inst shr res type-bits)
+ (loadw res x 0 other-pointer-lowtag)
+ (inst shr res n-widetag-bits)
(inst sub res (1- array-dimensions-offset))))
\f
;;;; bounds checking routine
(macrolet ((def-full-data-vector-frobs (type element-type &rest scs)
`(progn
(define-full-reffer ,(symbolicate "DATA-VECTOR-REF/" type)
- ,type vector-data-offset other-pointer-type ,scs
+ ,type vector-data-offset other-pointer-lowtag ,scs
,element-type data-vector-ref)
(define-full-setter ,(symbolicate "DATA-VECTOR-SET/" type)
- ,type vector-data-offset other-pointer-type ,scs
+ ,type vector-data-offset other-pointer-lowtag ,scs
,element-type data-vector-set))))
(def-full-data-vector-frobs simple-vector * descriptor-reg any-reg)
(def-full-data-vector-frobs simple-array-unsigned-byte-32 unsigned-num
;;;; 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))
(inst shr ecx ,bit-shift)
(inst mov result
(make-ea :dword :base object :index ecx :scale 4
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))
(move ecx index)
(inst and ecx ,(1- elements-per-word))
,@(unless (= bits 1)
(:generator 15
(multiple-value-bind (word extra) (floor index ,elements-per-word)
(loadw result object (+ word vector-data-offset)
- other-pointer-type)
+ other-pointer-lowtag)
(unless (zerop extra)
(inst shr result (* extra ,bits)))
(unless (= extra ,(1- elements-per-word))
(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)
- other-pointer-type)))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))
(loadw old ptr)
(move ecx index)
(inst and ecx ,(1- elements-per-word))
(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)
- other-pointer-type)))
+ :disp (- (* (+ word vector-data-offset)
+ n-word-bytes)
+ other-pointer-lowtag)))
(sc-case value
(immediate
(let* ((value (tn-value value))
(inst rol old shift)))))
(inst mov (make-ea :dword :base object
:disp (- (* (+ word vector-data-offset)
- word-bytes)
- other-pointer-type))
+ n-word-bytes)
+ other-pointer-lowtag))
old)
(sc-case value
(immediate
(: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)
- sb!vm:other-pointer-type))))))
+ :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)
(:note "inline array access")
(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-type))))))
+ sb!vm:other-pointer-lowtag))))))
(define-vop (data-vector-set/simple-array-single-float)
(:note "inline array store")
(:result-types single-float)
(:generator 5
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result))
;; Value is in ST0 but not result.
(inst fst result)))
(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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result))
;; The result is in ST0.
(inst fst value))
(:result-types single-float)
(:generator 4
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result))
;; Value is in ST0 but not result.
(inst fst result)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result))
;; The result is in ST0.
(inst fst value))
(: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)
- sb!vm:other-pointer-type))))))
+ :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)
(:note "inline array access")
(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-type))))))
+ sb!vm:other-pointer-lowtag))))))
(define-vop (data-vector-set/simple-array-double-float)
(:note "inline array store")
(:result-types double-float)
(:generator 20
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result))
;; Value is in ST0 but not result.
(inst fstd result)))
(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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result))
;; The result is in ST0.
(inst fstd value))
(:result-types double-float)
(:generator 19
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result))
;; Value is in ST0 but not result.
(inst fstd result)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result))
;; The result is in ST0.
(inst fstd value))
(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:other-pointer-type))))))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag))))))
#!+long-float
(define-vop (data-vector-ref-c/simple-array-long-float)
(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-type))))))
+ sb!vm:other-pointer-lowtag))))))
#!+long-float
(define-vop (data-vector-set/simple-array-long-float)
;; temp = 3 * index
(inst lea temp (make-ea :dword :base index :index index :scale 2))
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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)
- sb!vm:other-pointer-type)))
+ :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.
(inst fstd result)))
(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)
- sb!vm:other-pointer-type)))
+ :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.
(inst fstd value))
(:result-types long-float)
(:generator 19
(cond ((zerop (tn-offset value))
- ;; Value is in ST0
+ ;; 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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result))
;; Value is in ST0 but not result.
(inst fstd result)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result))
;; The result is in ST0.
(inst fstd value))
(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:other-pointer-type)))))
+ 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:other-pointer-type)))))))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))))))
(define-vop (data-vector-ref-c/simple-array-complex-single-float)
(:note "inline array access")
(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-type)))))
+ 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-type)))))))
+ sb!vm:other-pointer-lowtag)))))))
(define-vop (data-vector-set/simple-array-complex-single-float)
(:note "inline array store")
;; 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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result-real))
;; Value is in ST0 but not result.
(inst fst result-real)))
(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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result-real))
;; The result is in ST0.
(inst fst value-real))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (location= value-imag result-imag)
(inst fst result-imag))
(inst fxch value-imag))))
(let ((value-real (complex-single-reg-real-tn value))
(result-real (complex-single-reg-real-tn result)))
(cond ((zerop (tn-offset value-real))
- ;; Value is in ST0
+ ;; 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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result-real))
;; Value is in ST0 but not result.
(inst fst result-real)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result-real))
;; The result is in ST0.
(inst fst value-real))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (location= value-imag result-imag)
(inst fst result-imag))
(inst fxch value-imag))))
(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:other-pointer-type)))))
+ 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-type)))))))
+ sb!vm:other-pointer-lowtag)))))))
(define-vop (data-vector-ref-c/simple-array-complex-double-float)
(:note "inline array access")
(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-type)))))
+ 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-type)))))))
+ sb!vm:other-pointer-lowtag)))))))
(define-vop (data-vector-set/simple-array-complex-double-float)
(:note "inline array store")
(let ((value-real (complex-double-reg-real-tn value))
(result-real (complex-double-reg-real-tn result)))
(cond ((zerop (tn-offset value-real))
- ;; Value is in ST0
+ ;; 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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result-real))
;; Value is in ST0 but not result.
(inst fstd result-real)))
(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:other-pointer-type)))
+ sb!vm:n-word-bytes)
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result-real))
;; The result is in ST0.
(inst fstd value-real))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (location= value-imag result-imag)
(inst fstd result-imag))
(inst fxch value-imag))))
(let ((value-real (complex-double-reg-real-tn value))
(result-real (complex-double-reg-real-tn result)))
(cond ((zerop (tn-offset value-real))
- ;; Value is in ST0
+ ;; 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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result-real))
;; Value is in ST0 but not result.
(inst fstd result-real)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result-real))
;; The result is in ST0.
(inst fstd value-real))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (location= value-imag result-imag)
(inst fstd result-imag))
(inst fxch value-imag))))
(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:other-pointer-type)))))
+ 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-type)))))))
+ sb!vm:other-pointer-lowtag)))))))
#!+long-float
(define-vop (data-vector-ref-c/simple-array-complex-long-float)
(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-type)))))
+ 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-type)))))))
+ sb!vm:other-pointer-lowtag)))))))
#!+long-float
(define-vop (data-vector-set/simple-array-complex-long-float)
(let ((value-real (complex-long-reg-real-tn value))
(result-real (complex-long-reg-real-tn result)))
(cond ((zerop (tn-offset value-real))
- ;; Value is in ST0
+ ;; 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)
- sb!vm:other-pointer-type)))
+ :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.
(inst fstd result-real)))
(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)
- sb!vm:other-pointer-type)))
+ :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.
(inst fstd value-real))
(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)
- sb!vm:other-pointer-type)))
+ :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))
(inst fxch value-imag))))
(let ((value-real (complex-long-reg-real-tn value))
(result-real (complex-long-reg-real-tn result)))
(cond ((zerop (tn-offset value-real))
- ;; Value is in ST0
+ ;; 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)
(* 24 index))
- sb!vm:other-pointer-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (zerop (tn-offset result-real))
;; Value is in ST0 but not result.
(inst fstd result-real)))
(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-type)))
+ sb!vm:other-pointer-lowtag)))
(cond ((zerop (tn-offset result-real))
;; The result is in ST0.
(inst fstd value-real))
(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
;; instead of appearing to flirt with supporting
;; this maintenance nightmare.
(* 24 index) 12)
- sb!vm:other-pointer-type)))
+ sb!vm:other-pointer-lowtag)))
(unless (location= value-imag result-imag)
(inst fstd result-imag))
(inst fxch value-imag))))
-
\f
-;;;; dtc expanded and fixed the following:
-
;;; unsigned-byte-8
(define-vop (data-vector-ref/simple-array-unsigned-byte-8)
(:generator 5
(inst movzx value
(make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))))
(define-vop (data-vector-ref-c/simple-array-unsigned-byte-8)
(:translate data-vector-ref)
(:generator 4
(inst movzx value
(make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type)))))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag)))))
(define-vop (data-vector-set/simple-array-unsigned-byte-8)
(:translate data-vector-set)
(:generator 5
(move eax value)
(inst mov (make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag))
al-tn)
(move result eax)))
(:generator 4
(move eax value)
(inst mov (make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag))
al-tn)
(move result eax)))
(:generator 5
(inst movzx value
(make-ea :word :base object :index index :scale 2
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))))
(define-vop (data-vector-ref-c/simple-array-unsigned-byte-16)
(:translate data-vector-ref)
(:generator 4
(inst movzx value
(make-ea :word :base object
- :disp (- (+ (* vector-data-offset word-bytes) (* 2 index))
- other-pointer-type)))))
+ :disp (- (+ (* vector-data-offset n-word-bytes) (* 2 index))
+ other-pointer-lowtag)))))
(define-vop (data-vector-set/simple-array-unsigned-byte-16)
(:translate data-vector-set)
(:generator 5
(move eax value)
(inst mov (make-ea :word :base object :index index :scale 2
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag))
ax-tn)
(move result eax)))
(: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-type))
+ other-pointer-lowtag))
ax-tn)
(move result eax)))
(:generator 5
(inst mov al-tn
(make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))
(move value al-tn)))
(define-vop (data-vector-ref-c/simple-string)
(:generator 4
(inst mov al-tn
(make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type)))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag)))
(move value al-tn)))
(define-vop (data-vector-set/simple-string)
(:result-types base-char)
(:generator 5
(inst mov (make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag))
value)
(move result value)))
(:result-types base-char)
(:generator 4
(inst mov (make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag))
value)
(move result value)))
(:generator 5
(inst movsx value
(make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))))
(define-vop (data-vector-ref-c/simple-array-signed-byte-8)
(:translate data-vector-ref)
(:generator 4
(inst movsx value
(make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type)))))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag)))))
(define-vop (data-vector-set/simple-array-signed-byte-8)
(:translate data-vector-set)
(:generator 5
(move eax value)
(inst mov (make-ea :byte :base object :index index :scale 1
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag))
al-tn)
(move result eax)))
(:generator 4
(move eax value)
(inst mov (make-ea :byte :base object
- :disp (- (+ (* vector-data-offset word-bytes) index)
- other-pointer-type))
+ :disp (- (+ (* vector-data-offset n-word-bytes) index)
+ other-pointer-lowtag))
al-tn)
(move result eax)))
(:generator 5
(inst movsx value
(make-ea :word :base object :index index :scale 2
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type)))))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag)))))
(define-vop (data-vector-ref-c/simple-array-signed-byte-16)
(:translate data-vector-ref)
(: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-type)))))
+ other-pointer-lowtag)))))
(define-vop (data-vector-set/simple-array-signed-byte-16)
(:translate data-vector-set)
(:generator 5
(move eax value)
(inst mov (make-ea :word :base object :index index :scale 2
- :disp (- (* vector-data-offset word-bytes)
- other-pointer-type))
+ :disp (- (* vector-data-offset n-word-bytes)
+ other-pointer-lowtag))
ax-tn)
(move result eax)))
(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-type))
+ other-pointer-lowtag))
ax-tn)
(move result eax)))
\f
;;; 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-type (unsigned-reg)
+(define-full-reffer raw-bits * 0 other-pointer-lowtag (unsigned-reg)
unsigned-num %raw-bits)
-(define-full-setter set-raw-bits * 0 other-pointer-type (unsigned-reg)
+(define-full-setter set-raw-bits * 0 other-pointer-lowtag (unsigned-reg)
unsigned-num %set-raw-bits)
\f
;;;; miscellaneous array VOPs
projects / sbcl.git / blobdiff