projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.15.22: check for error, do not aver, do not collect $200
[sbcl.git]
/
src
/
compiler
/
alpha
/
sap.lisp
diff --git
a/src/compiler/alpha/sap.lisp
b/src/compiler/alpha/sap.lisp
index
66c3e30
..
6fa3a7d
100644
(file)
--- a/
src/compiler/alpha/sap.lisp
+++ b/
src/compiler/alpha/sap.lisp
@@
-40,10
+40,10
@@
;;; Move untagged SAP values.
(define-vop (sap-move)
(:args (x :target y
;;; 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)
(:results (y :scs (sap-reg)
- :load-if (not (location= x y))))
+ :load-if (not (location= x y))))
(:effects)
(:affected)
(:generator 0
(:effects)
(:affected)
(:generator 0
@@
-52,11
+52,11
@@
(sap-reg) (sap-reg))
;;; Move untagged SAP arguments/return-values.
(sap-reg) (sap-reg))
;;; Move untagged SAP arguments/return-values.
-(define-vop (move-sap-argument)
+(define-vop (move-sap-arg)
(:args (x :target y
(: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))
(:generator 0
(sc-case y
(:results (y))
(:generator 0
(sc-case y
@@
-64,12
+64,12
@@
(move x y))
(sap-stack
(storeq x fp (tn-offset y))))))
(move x y))
(sap-stack
(storeq x fp (tn-offset y))))))
-(define-move-vop move-sap-argument :move-argument
+(define-move-vop move-sap-arg :move-arg
(descriptor-reg sap-reg) (sap-reg))
(descriptor-reg sap-reg) (sap-reg))
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged sap to a
+;;; Use standard MOVE-ARG + coercion to move an untagged sap to a
;;; descriptor passing location.
;;; descriptor passing location.
-(define-move-vop move-argument :move-argument
+(define-move-vop move-arg :move-arg
(sap-reg) (descriptor-reg))
\f
;;;; SAP-INT and INT-SAP
(sap-reg) (descriptor-reg))
\f
;;;; SAP-INT and INT-SAP
@@
-99,7
+99,7
@@
(define-vop (pointer+)
(:translate sap+)
(:args (ptr :scs (sap-reg))
(define-vop (pointer+)
(:translate sap+)
(:args (ptr :scs (sap-reg))
- (offset :scs (signed-reg immediate)))
+ (offset :scs (signed-reg immediate)))
(:arg-types system-area-pointer signed-num)
(:results (res :scs (sap-reg)))
(:result-types system-area-pointer)
(:arg-types system-area-pointer signed-num)
(:results (res :scs (sap-reg)))
(:result-types system-area-pointer)
@@
-114,7
+114,7
@@
(define-vop (pointer-)
(:translate sap-)
(:args (ptr1 :scs (sap-reg))
(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)))
(:arg-types system-area-pointer system-area-pointer)
(:policy :fast-safe)
(:results (res :scs (signed-reg)))
@@
-219,7
+219,10
@@
(:single
'((inst lds result offset object)))
(:double
(:single
'((inst lds result offset object)))
(:double
- '((inst ldt result (+ offset word-bytes) object))))))
+ '((inst ldt
+ result
+ (+ offset n-word-bytes)
+ object))))))
(define-vop (,set-name)
(:translate ,set-name)
(:policy :fast-safe)
(define-vop (,set-name)
(:translate ,set-name)
(:policy :fast-safe)
@@
-351,5
+354,5
@@
(:result-types system-area-pointer)
(:generator 2
(inst lda sap
(:result-types system-area-pointer)
(:generator 2
(inst lda sap
- (- (* vector-data-offset word-bytes) other-pointer-lowtag)
- vector)))
+ (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
+ vector)))