;;; Move a tagged SAP to an untagged representation.
(define-vop (move-to-sap)
- (:args (x :scs (descriptor-reg)))
+ (:args (x :scs (any-reg descriptor-reg)))
(:results (y :scs (sap-reg)))
(:note "system area pointer indirection")
(:generator 1
(loadw y x sap-pointer-slot other-pointer-lowtag)))
+
(define-move-vop move-to-sap :move
(descriptor-reg) (sap-reg))
;;; Move an untagged SAP to a tagged representation.
(define-vop (move-from-sap)
- (:args (x :scs (sap-reg) :to (:eval 1)))
+ (:args (sap :scs (sap-reg) :to :save))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:results (y :scs (descriptor-reg) :from (:eval 0)))
+ (:results (res :scs (descriptor-reg)))
(:note "system area pointer allocation")
(:generator 20
- (with-fixed-allocation (y ndescr sap-widetag sap-size)
- (storew x y sap-pointer-slot other-pointer-lowtag))))
+ (with-fixed-allocation (res nil ndescr sap-widetag sap-size nil)
+ (storew sap res sap-pointer-slot other-pointer-lowtag))))
+
(define-move-vop move-from-sap :move
(sap-reg) (descriptor-reg))
;;; Move untagged sap values.
(define-vop (sap-move)
(:args (x :target y
- :scs (sap-reg)
- :load-if (not (location= x y))))
+ :scs (sap-reg)
+ :load-if (not (location= x y))))
(:results (y :scs (sap-reg)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
+ (:note "SAP move")
(:effects)
(:affected)
(:generator 0
(move x y)))
+
(define-move-vop sap-move :move
(sap-reg) (sap-reg))
;;; Move untagged sap args/return-values.
(define-vop (move-sap-arg)
(:args (x :target y
- :scs (sap-reg))
- (fp :scs (any-reg)
- :load-if (not (sc-is y sap-reg))))
+ :scs (sap-reg))
+ (fp :scs (any-reg)
+ :load-if (not (sc-is y sap-reg))))
(:results (y))
+ (:note "SAP argument move")
(:generator 0
(sc-case y
(sap-reg
(move x y))
(sap-stack
(storew x fp (tn-offset y))))))
+
(define-move-vop move-sap-arg :move-arg
(descriptor-reg sap-reg) (sap-reg))
;;;; POINTER+ and POINTER-
(define-vop (pointer+)
(:translate sap+)
- (:args (ptr :scs (sap-reg) :target res)
- (offset :scs (signed-reg)))
+ (:args (ptr :scs (sap-reg))
+ (offset :scs (signed-reg immediate)))
(:arg-types system-area-pointer signed-num)
(:results (res :scs (sap-reg)))
(:result-types system-area-pointer)
(:policy :fast-safe)
(:generator 1
- (inst add ptr offset res)))
-
-(define-vop (pointer+-c)
- (:translate sap+)
- (:args (ptr :scs (sap-reg)))
- (:info offset)
- (:arg-types system-area-pointer (:constant (signed-byte 11)))
- (:results (res :scs (sap-reg)))
- (:result-types system-area-pointer)
- (:policy :fast-safe)
- (:generator 1
- (inst addi offset ptr res)))
+ (sc-case offset
+ (signed-reg
+ (inst add ptr offset res))
+ (immediate
+ (cond
+ ((and (< (tn-value offset) (ash 1 10))
+ (> (tn-value offset) (- (ash 1 10))))
+ (inst addi (tn-value offset) ptr res))
+ (t
+ (inst li (tn-value offset) res)
+ (inst add ptr res res)))))))
(define-vop (pointer-)
(:translate sap-)
(:args (ptr1 :scs (sap-reg))
- (ptr2 :scs (sap-reg)))
+ (ptr2 :scs (sap-reg)))
(:arg-types system-area-pointer system-area-pointer)
(:policy :fast-safe)
(:results (res :scs (signed-reg)))
\f
;;;; mumble-SYSTEM-REF and mumble-SYSTEM-SET
(macrolet ((def-system-ref-and-set
- (ref-name set-name sc type size &optional signed)
+ (ref-name set-name sc type size &optional signed)
(let ((ref-name-c (symbolicate ref-name "-C"))
- (set-name-c (symbolicate set-name "-C")))
+ (set-name-c (symbolicate set-name "-C")))
`(progn
(define-vop (,ref-name)
- (:translate ,ref-name)
- (:policy :fast-safe)
- (:args (object :scs (sap-reg))
- (offset :scs (signed-reg)))
- (:arg-types system-area-pointer signed-num)
- (:results (result :scs (,sc)))
- (:result-types ,type)
- (:generator 5
- (inst ,(ecase size
- (:byte 'ldbx)
- (:short 'ldhx)
- (:long 'ldwx)
- (:float 'fldx))
- offset object result)
- ,@(when (and signed (not (eq size :long)))
- `((inst extrs result 31 ,(ecase size
- (:byte 8)
- (:short 16))
- result)))))
+ (:translate ,ref-name)
+ (:policy :fast-safe)
+ (:args (object :scs (sap-reg))
+ (offset :scs (signed-reg)))
+ (:arg-types system-area-pointer signed-num)
+ (:results (result :scs (,sc)))
+ (:result-types ,type)
+ (:generator 5
+ (inst ,(ecase size
+ (:byte 'ldbx)
+ (:short 'ldhx)
+ (:long 'ldwx)
+ (:float 'fldx))
+ offset object result)
+ ,@(when (and signed (not (eq size :long)))
+ `((inst extrs result 31 ,(ecase size
+ (:byte 8)
+ (:short 16))
+ result)))))
(define-vop (,ref-name-c)
- (:translate ,ref-name)
- (:policy :fast-safe)
- (:args (object :scs (sap-reg)))
- (:arg-types system-area-pointer
- (:constant ,(if (eq size :float)
- '(signed-byte 5)
- '(signed-byte 14))))
- (:info offset)
- (:results (result :scs (,sc)))
- (:result-types ,type)
- (:generator 4
- (inst ,(ecase size
- (:byte 'ldb)
- (:short 'ldh)
- (:long 'ldw)
- (:float 'flds))
- offset object result)
- ,@(when (and signed (not (eq size :long)))
- `((inst extrs result 31 ,(ecase size
- (:byte 8)
- (:short 16))
- result)))))
+ (:translate ,ref-name)
+ (:policy :fast-safe)
+ (:args (object :scs (sap-reg)))
+ (:arg-types system-area-pointer
+ (:constant ,(if (eq size :float)
+ '(signed-byte 5)
+ '(signed-byte 14))))
+ (:info offset)
+ (:results (result :scs (,sc)))
+ (:result-types ,type)
+ (:generator 4
+ (inst ,(ecase size
+ (:byte 'ldb)
+ (:short 'ldh)
+ (:long 'ldw)
+ (:float 'flds))
+ offset object result)
+ ,@(when (and signed (not (eq size :long)))
+ `((inst extrs result 31 ,(ecase size
+ (:byte 8)
+ (:short 16))
+ result)))))
(define-vop (,set-name)
- (:translate ,set-name)
- (:policy :fast-safe)
- (:args (object :scs (sap-reg)
- ,@(unless (eq size :float) '(:target sap)))
- (offset :scs (signed-reg))
- (value :scs (,sc) :target result))
- (:arg-types system-area-pointer signed-num ,type)
- (:results (result :scs (,sc)))
- (:result-types ,type)
- ,@(unless (eq size :float)
- '((:temporary (:scs (sap-reg) :from (:argument 0)) sap)))
- (:generator 5
- ,@(if (eq size :float)
- `((inst fstx value offset object)
- (unless (location= value result)
- (inst funop :copy value result)))
- `((inst add object offset sap)
- (inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
- value 0 sap)
- (move value result)))))
+ (:translate ,set-name)
+ (:policy :fast-safe)
+ (:args (object :scs (sap-reg)
+ ,@(unless (eq size :float) '(:target sap)))
+ (offset :scs (signed-reg))
+ (value :scs (,sc) :target result))
+ (:arg-types system-area-pointer signed-num ,type)
+ (:results (result :scs (,sc)))
+ (:result-types ,type)
+ ,@(unless (eq size :float)
+ '((:temporary (:scs (sap-reg) :from (:argument 0)) sap)))
+ (:generator 5
+ ,@(if (eq size :float)
+ `((inst fstx value offset object)
+ (unless (location= value result)
+ (inst funop :copy value result)))
+ `((inst add object offset sap)
+ (inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
+ value 0 sap)
+ (move value result)))))
(define-vop (,set-name-c)
- (:translate ,set-name)
- (:policy :fast-safe)
- (:args (object :scs (sap-reg))
- (value :scs (,sc) :target result))
- (:arg-types system-area-pointer
- (:constant ,(if (eq size :float)
- '(signed-byte 5)
- '(signed-byte 14)))
- ,type)
- (:info offset)
- (:results (result :scs (,sc)))
- (:result-types ,type)
- (:generator 5
- ,@(if (eq size :float)
- `((inst fsts value offset object)
- (unless (location= value result)
- (inst funop :copy value result)))
- `((inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
- value offset object)
- (move value result)))))))))
+ (:translate ,set-name)
+ (:policy :fast-safe)
+ (:args (object :scs (sap-reg))
+ (value :scs (,sc) :target result))
+ (:arg-types system-area-pointer
+ (:constant ,(if (eq size :float)
+ '(signed-byte 5)
+ '(signed-byte 14)))
+ ,type)
+ (:info offset)
+ (:results (result :scs (,sc)))
+ (:result-types ,type)
+ (:generator 5
+ ,@(if (eq size :float)
+ `((inst fsts value offset object)
+ (unless (location= value result)
+ (inst funop :copy value result)))
+ `((inst ,(ecase size (:byte 'stb) (:short 'sth) (:long 'stw))
+ value offset object)
+ (move value result)))))))))
(def-system-ref-and-set sap-ref-8 %set-sap-ref-8
unsigned-reg positive-fixnum :byte nil)
(def-system-ref-and-set signed-sap-ref-8 %set-signed-sap-ref-8
signed-reg signed-num :long t)
(def-system-ref-and-set sap-ref-sap %set-sap-ref-sap
sap-reg system-area-pointer :long)
+ (def-system-ref-and-set sap-ref-lispobj %set-sap-ref-lispobj
+ descriptor-reg * :long)
(def-system-ref-and-set sap-ref-single %set-sap-ref-single
single-reg single-float :float)
(def-system-ref-and-set sap-ref-double %set-sap-ref-double
(:results (sap :scs (sap-reg)))
(:result-types system-area-pointer)
(:generator 2
- (inst addi
- (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
- vector
- sap)))
-\f
-;;; Transforms for 64-bit SAP accessors.
-
-(deftransform sap-ref-64 ((sap offset) (* *))
- '(logior (ash (sap-ref-32 sap offset) 32)
- (sap-ref-32 sap (+ offset 4))))
-
-(deftransform signed-sap-ref-64 ((sap offset) (* *))
- '(logior (ash (signed-sap-ref-32 sap offset) 32)
- (sap-ref-32 sap (+ 4 offset))))
-
-(deftransform %set-sap-ref-64 ((sap offset value) (* * *))
- '(progn
- (%set-sap-ref-32 sap offset (ash value -32))
- (%set-sap-ref-32 sap (+ offset 4) (logand value #xffffffff))))
-
-(deftransform %set-signed-sap-ref-64 ((sap offset value) (* * *))
- '(progn
- (%set-signed-sap-ref-32 sap offset (ash value -32))
- (%set-sap-ref-32 sap (+ 4 offset) (logand value #xffffffff))))
+ (inst addi (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
+ vector sap)))
projects / sbcl.git / blobdiff