(:results (result :scs (descriptor-reg any-reg)))
(:generator 5
(move eax old)
- #!+sb-thread
- (inst lock)
(inst cmpxchg (make-ea :dword :base object
:disp (- (* offset n-word-bytes) lowtag))
- new)
+ new :lock)
(move result eax)))
\f
;;;; symbol hacking VOPs
(progn
(loadw tls symbol symbol-tls-index-slot other-pointer-lowtag)
;; Thread-local area, no LOCK needed.
- (inst fs-segment-prefix)
- (inst cmpxchg (make-ea :dword :base tls) new)
+ (inst cmpxchg (make-ea :dword :base tls) new :fs)
(inst cmp eax no-tls-value-marker-widetag)
(inst jmp :ne check)
- (move eax old)
- (inst lock))
+ (move eax old))
(inst cmpxchg (make-ea :dword :base symbol
:disp (- (* symbol-value-slot n-word-bytes)
other-pointer-lowtag))
- new)
+ new :lock)
(emit-label check)
(move result eax)
(inst cmp result unbound-marker-widetag)
(inst jmp :e unbound))))
-;;; these next two cf the sparc version, by jrd.
-;;; FIXME: Deref this ^ reference.
-
-
-;;; The compiler likes to be able to directly SET symbols.
-#!+sb-thread
-(define-vop (set)
- (:args (symbol :scs (descriptor-reg))
- (value :scs (descriptor-reg any-reg)))
- (:temporary (:sc descriptor-reg) tls)
- ;;(:policy :fast-safe)
- (:generator 4
- (let ((global-val (gen-label))
- (done (gen-label)))
- (loadw tls symbol symbol-tls-index-slot other-pointer-lowtag)
- (inst fs-segment-prefix)
- (inst cmp (make-ea :dword :base tls) no-tls-value-marker-widetag)
- (inst jmp :z global-val)
- (inst fs-segment-prefix)
- (inst mov (make-ea :dword :base tls) value)
- (inst jmp done)
- (emit-label global-val)
- (storew value symbol symbol-value-slot other-pointer-lowtag)
- (emit-label done))))
-
-;; unithreaded it's a lot simpler ...
-#!-sb-thread
-(define-vop (set cell-set)
+(define-vop (%set-symbol-global-value cell-set)
(:variant symbol-value-slot other-pointer-lowtag))
-;;; With Symbol-Value, we check that the value isn't the trap object. So
-;;; Symbol-Value of NIL is NIL.
-#!+sb-thread
-(define-vop (symbol-value)
- (:translate symbol-value)
- (:policy :fast-safe)
- (:args (object :scs (descriptor-reg) :to (:result 1)))
- (:results (value :scs (descriptor-reg any-reg)))
- (:vop-var vop)
- (:save-p :compute-only)
- (:generator 9
- (let* ((check-unbound-label (gen-label))
- (err-lab (generate-error-code vop 'unbound-symbol-error object))
- (ret-lab (gen-label)))
- (loadw value object symbol-tls-index-slot other-pointer-lowtag)
- (inst fs-segment-prefix)
- (inst mov value (make-ea :dword :base value))
- (inst cmp value no-tls-value-marker-widetag)
- (inst jmp :ne check-unbound-label)
- (loadw value object symbol-value-slot other-pointer-lowtag)
- (emit-label check-unbound-label)
- (inst cmp value unbound-marker-widetag)
- (inst jmp :e err-lab)
- (emit-label ret-lab))))
-
-#!+sb-thread
-(define-vop (fast-symbol-value symbol-value)
- ;; KLUDGE: not really fast, in fact, because we're going to have to
- ;; do a full lookup of the thread-local area anyway. But half of
- ;; the meaning of FAST-SYMBOL-VALUE is "do not signal an error if
- ;; unbound", which is used in the implementation of COPY-SYMBOL. --
- ;; CSR, 2003-04-22
+(define-vop (fast-symbol-global-value cell-ref)
+ (:variant symbol-value-slot other-pointer-lowtag)
(:policy :fast)
- (:translate symbol-value)
- (:generator 8
- (let ((ret-lab (gen-label)))
- (loadw value object symbol-tls-index-slot other-pointer-lowtag)
- (inst fs-segment-prefix)
- (inst mov value (make-ea :dword :base value))
- (inst cmp value no-tls-value-marker-widetag)
- (inst jmp :ne ret-lab)
- (loadw value object symbol-value-slot other-pointer-lowtag)
- (emit-label ret-lab))))
+ (:translate symbol-global-value))
-#!-sb-thread
-(define-vop (symbol-value)
- (:translate symbol-value)
+(define-vop (symbol-global-value)
(:policy :fast-safe)
+ (:translate symbol-global-value)
(:args (object :scs (descriptor-reg) :to (:result 1)))
(:results (value :scs (descriptor-reg any-reg)))
(:vop-var vop)
(inst cmp value unbound-marker-widetag)
(inst jmp :e err-lab))))
-#!-sb-thread
-(define-vop (fast-symbol-value cell-ref)
- (:variant symbol-value-slot other-pointer-lowtag)
- (:policy :fast)
- (:translate symbol-value))
-
-(defknown locked-symbol-global-value-add (symbol fixnum) fixnum ())
+#!+sb-thread
+(progn
+ (define-vop (set)
+ (:args (symbol :scs (descriptor-reg))
+ (value :scs (descriptor-reg any-reg)))
+ (:temporary (:sc descriptor-reg) tls)
+ (:generator 4
+ (let ((global-val (gen-label))
+ (done (gen-label)))
+ (loadw tls symbol symbol-tls-index-slot other-pointer-lowtag)
+ (inst cmp (make-ea :dword :base tls) no-tls-value-marker-widetag :fs)
+ (inst jmp :z global-val)
+ (inst mov (make-ea :dword :base tls) value :fs)
+ (inst jmp done)
+ (emit-label global-val)
+ (storew value symbol symbol-value-slot other-pointer-lowtag)
+ (emit-label done))))
+
+ ;; With Symbol-Value, we check that the value isn't the trap object. So
+ ;; Symbol-Value of NIL is NIL.
+ (define-vop (symbol-value)
+ (:translate symbol-value)
+ (:policy :fast-safe)
+ (:args (object :scs (descriptor-reg) :to (:result 1)))
+ (:results (value :scs (descriptor-reg any-reg)))
+ (:vop-var vop)
+ (:save-p :compute-only)
+ (:generator 9
+ (let* ((check-unbound-label (gen-label))
+ (err-lab (generate-error-code vop 'unbound-symbol-error object))
+ (ret-lab (gen-label)))
+ (loadw value object symbol-tls-index-slot other-pointer-lowtag)
+ (inst mov value (make-ea :dword :base value) :fs)
+ (inst cmp value no-tls-value-marker-widetag)
+ (inst jmp :ne check-unbound-label)
+ (loadw value object symbol-value-slot other-pointer-lowtag)
+ (emit-label check-unbound-label)
+ (inst cmp value unbound-marker-widetag)
+ (inst jmp :e err-lab)
+ (emit-label ret-lab))))
+
+ (define-vop (fast-symbol-value symbol-value)
+ ;; KLUDGE: not really fast, in fact, because we're going to have to
+ ;; do a full lookup of the thread-local area anyway. But half of
+ ;; the meaning of FAST-SYMBOL-VALUE is "do not signal an error if
+ ;; unbound", which is used in the implementation of COPY-SYMBOL. --
+ ;; CSR, 2003-04-22
+ (:policy :fast)
+ (:translate symbol-value)
+ (:generator 8
+ (let ((ret-lab (gen-label)))
+ (loadw value object symbol-tls-index-slot other-pointer-lowtag)
+ (inst mov value (make-ea :dword :base value) :fs)
+ (inst cmp value no-tls-value-marker-widetag)
+ (inst jmp :ne ret-lab)
+ (loadw value object symbol-value-slot other-pointer-lowtag)
+ (emit-label ret-lab)))))
-(define-vop (locked-symbol-global-value-add)
- (:args (object :scs (descriptor-reg) :to :result)
- (value :scs (any-reg) :target result))
- (:arg-types * tagged-num)
- (:results (result :scs (any-reg) :from (:argument 1)))
- (:policy :fast)
- (:translate locked-symbol-global-value-add)
- (:result-types tagged-num)
- (:policy :fast-safe)
- (:generator 4
- (move result value)
- (inst lock)
- (inst add (make-ea-for-object-slot object symbol-value-slot
- other-pointer-lowtag)
- value)))
+#!-sb-thread
+(progn
+ (define-vop (symbol-value symbol-global-value)
+ (:translate symbol-value))
+ (define-vop (fast-symbol-value fast-symbol-global-value)
+ (:translate symbol-value))
+ (define-vop (set %set-symbol-global-value)))
#!+sb-thread
(define-vop (boundp)
(:translate boundp)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
- (:conditional)
- (:info target not-p)
+ (:conditional :ne)
(:temporary (:sc descriptor-reg #+nil(:from (:argument 0))) value)
(:generator 9
(let ((check-unbound-label (gen-label)))
(loadw value object symbol-tls-index-slot other-pointer-lowtag)
- (inst fs-segment-prefix)
- (inst mov value (make-ea :dword :base value))
+ (inst mov value (make-ea :dword :base value) :fs)
(inst cmp value no-tls-value-marker-widetag)
(inst jmp :ne check-unbound-label)
(loadw value object symbol-value-slot other-pointer-lowtag)
(emit-label check-unbound-label)
- (inst cmp value unbound-marker-widetag)
- (inst jmp (if not-p :e :ne) target))))
+ (inst cmp value unbound-marker-widetag))))
#!-sb-thread
(define-vop (boundp)
(:translate boundp)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
- (:conditional)
- (:info target not-p)
+ (:conditional :ne)
(:generator 9
(inst cmp (make-ea-for-object-slot object symbol-value-slot
other-pointer-lowtag)
- unbound-marker-widetag)
- (inst jmp (if not-p :e :ne) target)))
+ unbound-marker-widetag)))
(define-vop (symbol-hash)
(#.esi-offset 'alloc-tls-index-in-esi))
:assembly-routine))
(emit-label tls-index-valid)
- (inst fs-segment-prefix)
- (inst push (make-ea :dword :base tls-index))
+ (inst push (make-ea :dword :base tls-index) :fs)
(popw bsp (- binding-value-slot binding-size))
(storew symbol bsp (- binding-symbol-slot binding-size))
- (inst fs-segment-prefix)
- (inst mov (make-ea :dword :base tls-index) val))))
+ (inst mov (make-ea :dword :base tls-index) val :fs))))
#!-sb-thread
(define-vop (bind)
(loadw tls-index temp symbol-tls-index-slot other-pointer-lowtag)
;; Load VALUE from stack, then restore it to the TLS area.
(loadw temp bsp (- binding-value-slot binding-size))
- (inst fs-segment-prefix)
- (inst mov (make-ea :dword :base tls-index) temp)
+ (inst mov (make-ea :dword :base tls-index) temp :fs)
;; Zero out the stack.
(storew 0 bsp (- binding-symbol-slot binding-size))
(storew 0 bsp (- binding-value-slot binding-size))
#!+sb-thread (loadw
tls-index symbol symbol-tls-index-slot other-pointer-lowtag)
- #!+sb-thread (inst fs-segment-prefix)
- #!+sb-thread (inst mov (make-ea :dword :base tls-index) value)
+ #!+sb-thread (inst mov (make-ea :dword :base tls-index) value :fs)
(storew 0 bsp (- binding-symbol-slot binding-size))
SKIP
;;;; raw instance slot accessors
(defun make-ea-for-raw-slot (object index instance-length n-words)
- (sc-case index
- (any-reg (make-ea :dword
- :base object
- :index instance-length
- :disp (- (* (- instance-slots-offset n-words)
- n-word-bytes)
- instance-pointer-lowtag)))
- (immediate (make-ea :dword :base object
+ (if (integerp instance-length)
+ ;; For RAW-INSTANCE-INIT/* VOPs, which know the exact instance length
+ ;; at compile time.
+ (make-ea :dword
+ :base object
+ :disp (- (* (- instance-length instance-slots-offset index (1- n-words))
+ n-word-bytes)
+ instance-pointer-lowtag))
+ (flet ((make-ea-using-value (value)
+ (make-ea :dword :base object
:index instance-length
:scale 4
:disp (- (* (- instance-slots-offset n-words)
n-word-bytes)
instance-pointer-lowtag
- (fixnumize (tn-value index)))))))
+ (* value n-word-bytes)))))
+ (if (typep index 'tn)
+ (sc-case index
+ (any-reg (make-ea :dword
+ :base object
+ :index instance-length
+ :disp (- (* (- instance-slots-offset n-words)
+ n-word-bytes)
+ instance-pointer-lowtag)))
+ (immediate (make-ea-using-value (tn-value index))))
+ (make-ea-using-value index)))))
(define-vop (raw-instance-ref/word)
(:translate %raw-instance-ref/word)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(inst mov value (make-ea-for-raw-slot object index tmp 1))))
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(inst mov (make-ea-for-raw-slot object index tmp 1) value)
(move result value)))
+(define-vop (raw-instance-init/word)
+ (:args (object :scs (descriptor-reg))
+ (value :scs (unsigned-reg)))
+ (:arg-types * unsigned-num)
+ (:info instance-length index)
+ (:generator 5
+ (inst mov (make-ea-for-raw-slot object index instance-length 1) value)))
+
+(define-vop (raw-instance-atomic-incf/word)
+ (:translate %raw-instance-atomic-incf/word)
+ (:policy :fast-safe)
+ (:args (object :scs (descriptor-reg))
+ (index :scs (any-reg immediate))
+ (diff :scs (unsigned-reg) :target result))
+ (:arg-types * tagged-num unsigned-num)
+ (:temporary (:sc unsigned-reg) tmp)
+ (:results (result :scs (unsigned-reg)))
+ (:result-types unsigned-num)
+ (:generator 5
+ (loadw tmp object 0 instance-pointer-lowtag)
+ (inst shr tmp n-widetag-bits)
+ (when (sc-is index any-reg)
+ (inst shl tmp n-fixnum-tag-bits)
+ (inst sub tmp index))
+ (inst xadd (make-ea-for-raw-slot object index tmp 1) diff :lock)
+ (move result diff)))
+
(define-vop (raw-instance-ref/single)
(:translate %raw-instance-ref/single)
(:policy :fast-safe)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(with-empty-tn@fp-top(value)
(inst fld (make-ea-for-raw-slot object index tmp 1)))))
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(unless (zerop (tn-offset value))
(inst fxch value))
(inst fst result))
(inst fxch value)))))
+(define-vop (raw-instance-init/single)
+ (:args (object :scs (descriptor-reg))
+ (value :scs (single-reg)))
+ (:arg-types * single-float)
+ (:info instance-length index)
+ (:generator 5
+ (with-tn@fp-top (value)
+ (inst fst (make-ea-for-raw-slot object index instance-length 1)))))
+
(define-vop (raw-instance-ref/double)
(:translate %raw-instance-ref/double)
(:policy :fast-safe)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(with-empty-tn@fp-top(value)
(inst fldd (make-ea-for-raw-slot object index tmp 2)))))
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(unless (zerop (tn-offset value))
(inst fxch value))
(inst fstd result))
(inst fxch value)))))
+(define-vop (raw-instance-init/double)
+ (:args (object :scs (descriptor-reg))
+ (value :scs (double-reg)))
+ (:arg-types * double-float)
+ (:info instance-length index)
+ (:generator 5
+ (with-tn@fp-top (value)
+ (inst fstd (make-ea-for-raw-slot object index instance-length 2)))))
+
(define-vop (raw-instance-ref/complex-single)
(:translate %raw-instance-ref/complex-single)
(:policy :fast-safe)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(let ((real-tn (complex-single-reg-real-tn value)))
(with-empty-tn@fp-top (real-tn)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(let ((value-real (complex-single-reg-real-tn value))
(result-real (complex-single-reg-real-tn result)))
(inst fst result-imag))
(inst fxch value-imag))))
+(define-vop (raw-instance-init/complex-single)
+ (:args (object :scs (descriptor-reg))
+ (value :scs (complex-single-reg)))
+ (:arg-types * complex-single-float)
+ (:info instance-length index)
+ (:generator 5
+ (let ((value-real (complex-single-reg-real-tn value)))
+ (with-tn@fp-top (value-real)
+ (inst fst (make-ea-for-raw-slot object index instance-length 2))))
+ (let ((value-imag (complex-single-reg-imag-tn value)))
+ (with-tn@fp-top (value-imag)
+ (inst fst (make-ea-for-raw-slot object index instance-length 1))))))
+
(define-vop (raw-instance-ref/complex-double)
(:translate %raw-instance-ref/complex-double)
(:policy :fast-safe)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(let ((real-tn (complex-double-reg-real-tn value)))
(with-empty-tn@fp-top (real-tn)
(loadw tmp object 0 instance-pointer-lowtag)
(inst shr tmp n-widetag-bits)
(when (sc-is index any-reg)
- (inst shl tmp 2)
+ (inst shl tmp n-fixnum-tag-bits)
(inst sub tmp index))
(let ((value-real (complex-double-reg-real-tn value))
(result-real (complex-double-reg-real-tn result)))
(unless (location= value-imag result-imag)
(inst fstd result-imag))
(inst fxch value-imag))))
+
+(define-vop (raw-instance-init/complex-double)
+ (:args (object :scs (descriptor-reg))
+ (value :scs (complex-double-reg)))
+ (:arg-types * complex-double-float)
+ (:info instance-length index)
+ (:generator 20
+ (let ((value-real (complex-double-reg-real-tn value)))
+ (with-tn@fp-top (value-real)
+ (inst fstd (make-ea-for-raw-slot object index instance-length 4))))
+ (let ((value-imag (complex-double-reg-imag-tn value)))
+ (with-tn@fp-top (value-imag)
+ (inst fstd (make-ea-for-raw-slot object index instance-length 2))))))
projects / sbcl.git / blobdiff