(inst beq done)
;; Okay, it is an immediate. If fixnum, we want zero. Otherwise,
;; we want the low 8 bits.
- (inst andi. result object #b11)
+ (inst andi. result object fixnum-tag-mask)
(inst beq done)
;; It wasn't a fixnum, so get the low 8 bits.
(inst andi. result object widetag-mask)
(inst b done)
-
+
FUNCTION-POINTER
(load-type result object (- fun-pointer-lowtag))
(inst b done)
(:translate (setf fun-subtype))
(:policy :fast-safe)
(:args (type :scs (unsigned-reg) :target result)
- (function :scs (descriptor-reg)))
+ (function :scs (descriptor-reg)))
(:arg-types positive-fixnum *)
(:results (result :scs (unsigned-reg)))
(:result-types positive-fixnum)
(:translate set-header-data)
(:policy :fast-safe)
(:args (x :scs (descriptor-reg) :target res)
- (data :scs (any-reg immediate zero)))
+ (data :scs (any-reg immediate zero)))
(:arg-types * positive-fixnum)
(:results (res :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) t1 t2)
(inst andi. t1 t1 widetag-mask)
(sc-case data
(any-reg
- (inst slwi t2 data (- n-widetag-bits 2))
+ (inst slwi t2 data (- n-widetag-bits n-fixnum-tag-bits))
(inst or t1 t1 t2))
(immediate
(inst ori t1 t1 (ash (tn-value data) n-widetag-bits)))
(move res x)))
-(define-vop (make-fixnum)
+(define-vop (pointer-hash)
+ (:translate pointer-hash)
(:args (ptr :scs (any-reg descriptor-reg)))
(:results (res :scs (any-reg descriptor-reg)))
+ (:policy :fast-safe)
(:generator 1
- ;;
- ;; Some code (the hash table code) depends on this returning a
- ;; positive number so make sure it does.
- (inst slwi res ptr 3)
- (inst srwi res res 1)))
+ ;; FIXME: It would be better if this would mask the lowtag,
+ ;; and shift the result into a positive fixnum like on x86.
+ (inst rlwinm res ptr n-fixnum-tag-bits 1 n-positive-fixnum-bits)))
(define-vop (make-other-immediate-type)
(:args (val :scs (any-reg descriptor-reg))
- (type :scs (any-reg descriptor-reg immediate)
- :target temp))
+ (type :scs (any-reg descriptor-reg immediate)
+ :target temp))
(:results (res :scs (any-reg descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 2
(inst slwi temp val n-widetag-bits)
(inst ori res temp (tn-value type)))
(t
- (inst srawi temp type 2)
- (inst slwi res val (- n-widetag-bits 2))
+ (inst srawi temp type n-fixnum-tag-bits)
+ (inst slwi res val (- n-widetag-bits n-fixnum-tag-bits))
(inst or res res temp)))))
\f
(define-vop (compute-fun)
(:args (code :scs (descriptor-reg))
- (offset :scs (signed-reg unsigned-reg)))
+ (offset :scs (signed-reg unsigned-reg)))
(:arg-types * positive-fixnum)
(:results (func :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
;;;; Other random VOPs.
-(defknown sb!unix::do-pending-interrupt () (values))
-(define-vop (sb!unix::do-pending-interrupt)
+(defknown sb!unix::receive-pending-interrupt () (values))
+(define-vop (sb!unix::receive-pending-interrupt)
(:policy :fast-safe)
- (:translate sb!unix::do-pending-interrupt)
+ (:translate sb!unix::receive-pending-interrupt)
(:generator 1
(inst unimp pending-interrupt-trap)))
+#!+sb-thread
+(defknown current-thread-offset-sap ((unsigned-byte 64))
+ system-area-pointer (flushable))
+
+#!+sb-thread
+(define-vop (current-thread-offset-sap)
+ (:results (sap :scs (sap-reg)))
+ (:result-types system-area-pointer)
+ (:translate current-thread-offset-sap)
+ (:args (n :scs (unsigned-reg) :target sap))
+ (:arg-types unsigned-num)
+ (:policy :fast-safe)
+ (:generator 2
+ (inst slwi n n word-shift)
+ (inst lwzx sap thread-base-tn n)))
+
(define-vop (halt)
(:generator 1
(inst unimp halt-trap)))
-
-
\f
;;;; Dynamic vop count collection support
(:temporary (:scs (non-descriptor-reg)) count)
(:generator 1
(let ((offset
- (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
- (assert (typep offset '(signed-byte 16)))
+ (- (* (+ index vector-data-offset) n-word-bytes) other-pointer-lowtag)))
+ (aver (typep offset '(signed-byte 16)))
(inst lwz count count-vector offset)
(inst addi count count 1)
(inst stw count count-vector offset))))
+\f
+;;;; Memory barrier support
+
+#!+memory-barrier-vops
+(define-vop (%compiler-barrier)
+ (:policy :fast-safe)
+ (:translate %compiler-barrier)
+ (:generator 3))
+
+#!+memory-barrier-vops
+(define-vop (%memory-barrier)
+ (:policy :fast-safe)
+ (:translate %memory-barrier)
+ (:generator 3
+ (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%read-barrier)
+ (:policy :fast-safe)
+ (:translate %read-barrier)
+ (:generator 3
+ (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%write-barrier)
+ (:policy :fast-safe)
+ (:translate %write-barrier)
+ (:generator 3
+ (inst sync)))
+
+#!+memory-barrier-vops
+(define-vop (%data-dependency-barrier)
+ (:policy :fast-safe)
+ (:translate %data-dependency-barrier)
+ (:generator 3))
+
+;;;; Dummy definition for a spin-loop hint VOP
+(define-vop (spin-loop-hint)
+ (:translate spin-loop-hint)
+ (:policy :fast-safe)
+ (:generator 0))