(:generator 1
(storew (encode-value-if-immediate value) object offset lowtag)))
+(define-vop (init-slot set-slot))
+
(define-vop (compare-and-swap-slot)
(:args (object :scs (descriptor-reg) :to :eval)
(old :scs (descriptor-reg any-reg) :target eax)
(progn
(loadw tls symbol symbol-tls-index-slot other-pointer-lowtag)
;; Thread-local area, no LOCK needed.
- (inst cmpxchg (make-ea :dword :base tls) new :fs)
+ (with-tls-ea (EA :base tls :base-already-live-p t)
+ (inst cmpxchg EA new :maybe-fs))
(inst cmp eax no-tls-value-marker-widetag)
(inst jmp :ne check)
(move eax old))
(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 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))))
-
-;; 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 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))))
-
-#!+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 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))))
+ (: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
+(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)
+ (with-tls-ea (EA :base tls :base-already-live-p t)
+ (inst cmp EA no-tls-value-marker-widetag :maybe-fs)
+ (inst jmp :z global-val)
+ (inst mov EA value :maybe-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)
+ (with-tls-ea (EA :base value :base-already-live-p t)
+ (inst mov value EA :maybe-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)
+ (with-tls-ea (EA :base value :base-already-live-p t)
+ (inst mov value EA :maybe-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)))))
+
#!-sb-thread
-(define-vop (fast-symbol-value cell-ref)
- (:variant symbol-value-slot other-pointer-lowtag)
- (:policy :fast)
- (:translate symbol-value))
+(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)
(:generator 9
(let ((check-unbound-label (gen-label)))
(loadw value object symbol-tls-index-slot other-pointer-lowtag)
- (inst mov value (make-ea :dword :base value) :fs)
+ (with-tls-ea (EA :base value :base-already-live-p t)
+ (inst mov value EA :maybe-fs))
(inst cmp value no-tls-value-marker-widetag)
(inst jmp :ne check-unbound-label)
(loadw value object symbol-value-slot other-pointer-lowtag)
;;; BIND -- Establish VAL as a binding for SYMBOL. Save the old value and
;;; the symbol on the binding stack and stuff the new value into the
;;; symbol.
-
+;;; See the "Chapter 9: Specials" of the SBCL Internals Manual.
+;;
;;; FIXME: Split into DYNBIND and BIND: DYNBIND needs to ensure
;;; TLS-INDEX, whereas BIND should assume it is already in place. Make
;;; LET &co compile into BIND, and PROGV into DYNBIND, plus ensure
(symbol :scs (descriptor-reg)))
(:temporary (:sc unsigned-reg) tls-index bsp)
(:generator 10
- (let ((tls-index-valid (gen-label)))
- (load-binding-stack-pointer bsp)
- (loadw tls-index symbol symbol-tls-index-slot other-pointer-lowtag)
- (inst add bsp (* binding-size n-word-bytes))
- (store-binding-stack-pointer bsp)
- (inst or tls-index tls-index)
- (inst jmp :ne tls-index-valid)
- (inst mov tls-index symbol)
- (inst call (make-fixup
- (ecase (tn-offset tls-index)
- (#.eax-offset 'alloc-tls-index-in-eax)
- (#.ebx-offset 'alloc-tls-index-in-ebx)
- (#.ecx-offset 'alloc-tls-index-in-ecx)
- (#.edx-offset 'alloc-tls-index-in-edx)
- (#.edi-offset 'alloc-tls-index-in-edi)
- (#.esi-offset 'alloc-tls-index-in-esi))
- :assembly-routine))
- (emit-label tls-index-valid)
- (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 mov (make-ea :dword :base tls-index) val :fs))))
+ (load-binding-stack-pointer bsp)
+ (loadw tls-index symbol symbol-tls-index-slot other-pointer-lowtag)
+ (inst add bsp (* binding-size n-word-bytes))
+ (store-binding-stack-pointer bsp)
+ (inst test tls-index tls-index)
+ (inst jmp :ne tls-index-valid)
+ (inst mov tls-index symbol)
+ (inst call (make-fixup
+ (ecase (tn-offset tls-index)
+ (#.eax-offset 'alloc-tls-index-in-eax)
+ (#.ebx-offset 'alloc-tls-index-in-ebx)
+ (#.ecx-offset 'alloc-tls-index-in-ecx)
+ (#.edx-offset 'alloc-tls-index-in-edx)
+ (#.edi-offset 'alloc-tls-index-in-edi)
+ (#.esi-offset 'alloc-tls-index-in-esi))
+ :assembly-routine))
+ TLS-INDEX-VALID
+ (with-tls-ea (EA :base tls-index :base-already-live-p t)
+ (inst push EA :maybe-fs)
+ (popw bsp (- binding-value-slot binding-size))
+ (storew tls-index bsp (- binding-symbol-slot binding-size))
+ (inst mov EA val :maybe-fs))))
#!-sb-thread
(define-vop (bind)
(:generator 0
(load-binding-stack-pointer bsp)
;; Load SYMBOL from stack, and get the TLS-INDEX.
- (loadw temp bsp (- binding-symbol-slot binding-size))
- (loadw tls-index temp symbol-tls-index-slot other-pointer-lowtag)
+ (loadw tls-index bsp (- binding-symbol-slot binding-size))
;; Load VALUE from stack, then restore it to the TLS area.
(loadw temp bsp (- binding-value-slot binding-size))
- (inst mov (make-ea :dword :base tls-index) temp :fs)
+ (with-tls-ea (EA :base tls-index :base-already-live-p t)
+ (inst mov EA temp :maybe-fs))
;; Zero out the stack.
- (storew 0 bsp (- binding-symbol-slot binding-size))
- (storew 0 bsp (- binding-value-slot binding-size))
(inst sub bsp (* binding-size n-word-bytes))
+ (storew 0 bsp binding-symbol-slot)
+ (storew 0 bsp binding-value-slot)
(store-binding-stack-pointer bsp)))
#!-sb-thread
(define-vop (unbind-to-here)
(:args (where :scs (descriptor-reg any-reg)))
- (:temporary (:sc unsigned-reg) symbol value bsp #!+sb-thread tls-index)
+ (:temporary (:sc unsigned-reg) symbol value bsp)
(:generator 0
(load-binding-stack-pointer bsp)
(inst cmp where bsp)
(inst jmp :e done)
LOOP
- (loadw symbol bsp (- binding-symbol-slot binding-size))
- (inst or symbol symbol)
+ (inst sub bsp (* binding-size n-word-bytes))
+ (loadw symbol bsp binding-symbol-slot)
+ (inst test symbol symbol)
(inst jmp :z skip)
;; Bind stack debug sentinels have the unbound marker in the symbol slot
(inst cmp symbol unbound-marker-widetag)
(inst jmp :eq skip)
- (loadw value bsp (- binding-value-slot binding-size))
+ (loadw value bsp binding-value-slot)
#!-sb-thread (storew value symbol symbol-value-slot other-pointer-lowtag)
-
- #!+sb-thread (loadw
- tls-index symbol symbol-tls-index-slot other-pointer-lowtag)
- #!+sb-thread (inst mov (make-ea :dword :base tls-index) value :fs)
- (storew 0 bsp (- binding-symbol-slot binding-size))
+ #!+sb-thread (with-tls-ea (EA :base symbol :base-already-live-p t)
+ (inst mov EA value :maybe-fs))
+ (storew 0 bsp binding-symbol-slot)
SKIP
- (storew 0 bsp (- binding-value-slot binding-size))
- (inst sub bsp (* binding-size n-word-bytes))
+ (storew 0 bsp binding-value-slot)
(inst cmp where bsp)
(inst jmp :ne loop)
(store-binding-stack-pointer bsp)
(define-vop (closure-init slot-set)
(:variant closure-info-offset fun-pointer-lowtag))
+
+(define-vop (closure-init-from-fp)
+ (:args (object :scs (descriptor-reg)))
+ (:info offset)
+ (:generator 4
+ (storew ebp-tn object (+ closure-info-offset offset) fun-pointer-lowtag)))
\f
;;;; value cell hackery
(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)))
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
(index :scs (any-reg immediate))
- (diff :scs (signed-reg) :target result))
- (:arg-types * tagged-num signed-num)
+ (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)
(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 xadd (make-ea-for-raw-slot object index tmp 1) diff :lock)
(move result diff)))
(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))
(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))
(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)))
(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)))