CMUCL commit: intl-branch src/compiler/sparc (16 files)
Raymond Toy
rtoy at common-lisp.net
Fri Feb 26 22:36:21 CET 2010
Date: Friday, February 26, 2010 @ 16:36:21
Author: rtoy
Path: /project/cmucl/cvsroot/src/compiler/sparc
Tag: intl-branch
Modified: alloc.lisp arith.lisp array.lisp c-call.lisp call.lisp cell.lisp
char.lisp debug.lisp float.lisp insts.lisp macros.lisp move.lisp
parms.lisp sap.lisp static-fn.lisp system.lisp
o Put these in the cmucl-sparc text domain.
o Mark translatable vop template notes.
o Mark other translatable strings.
----------------+
alloc.lisp | 4 -
arith.lisp | 126 ++++++++++++++++++++--------------------
array.lisp | 79 ++++++++++++-------------
c-call.lisp | 7 +-
call.lisp | 5 -
cell.lisp | 3
char.lisp | 15 ++--
debug.lisp | 3
float.lisp | 171 +++++++++++++++++++++++++++----------------------------
insts.lisp | 55 +++++++++--------
macros.lisp | 43 +++++++------
move.lisp | 41 ++++++-------
parms.lisp | 27 ++++----
sap.lisp | 11 +--
static-fn.lisp | 7 +-
system.lisp | 5 -
16 files changed, 308 insertions(+), 294 deletions(-)
Index: src/compiler/sparc/alloc.lisp
diff -u src/compiler/sparc/alloc.lisp:1.23 src/compiler/sparc/alloc.lisp:1.23.36.1
--- src/compiler/sparc/alloc.lisp:1.23 Mon May 9 09:27:02 2005
+++ src/compiler/sparc/alloc.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/alloc.lisp,v 1.23 2005-05-09 13:27:02 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/alloc.lisp,v 1.23.36.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -15,7 +15,7 @@
;;;
(in-package "SPARC")
-
+(intl:textdomain "cmucl-sparc-vm")
;;;; Dynamic-Extent.
Index: src/compiler/sparc/arith.lisp
diff -u src/compiler/sparc/arith.lisp:1.46 src/compiler/sparc/arith.lisp:1.46.18.1
--- src/compiler/sparc/arith.lisp:1.46 Mon Aug 18 16:40:02 2008
+++ src/compiler/sparc/arith.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/arith.lisp,v 1.46 2008-08-18 20:40:02 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/arith.lisp,v 1.46.18.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -18,7 +18,7 @@
;;; Enhancements/debugging by Raymond Toy 1999, 2000
(in-package "SPARC")
-
+(intl:textdomain "cmucl-sparc-vm")
;;;; Unary operations.
@@ -32,14 +32,14 @@
(define-vop (fixnum-unop fast-safe-arith-op)
(:args (x :scs (any-reg)))
(:results (res :scs (any-reg)))
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:arg-types tagged-num)
(:result-types tagged-num))
(define-vop (signed-unop fast-safe-arith-op)
(:args (x :scs (signed-reg)))
(:results (res :scs (signed-reg)))
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:arg-types signed-num)
(:result-types signed-num))
@@ -74,7 +74,7 @@
(:arg-types tagged-num tagged-num)
(:results (r :scs (any-reg)))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic"))
+ (:note _N"inline fixnum arithmetic"))
(define-vop (fast-unsigned-binop fast-safe-arith-op)
(:args (x :target r :scs (unsigned-reg zero))
@@ -82,7 +82,7 @@
(:arg-types unsigned-num unsigned-num)
(:results (r :scs (unsigned-reg)))
(:result-types unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic"))
+ (:note _N"inline (unsigned-byte 32) arithmetic"))
(define-vop (fast-signed-binop fast-safe-arith-op)
(:args (x :target r :scs (signed-reg zero))
@@ -90,7 +90,7 @@
(:arg-types signed-num signed-num)
(:results (r :scs (signed-reg)))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic"))
+ (:note _N"inline (signed-byte 32) arithmetic"))
(define-vop (fast-fixnum-binop-c fast-safe-arith-op)
(:args (x :target r :scs (any-reg zero)))
@@ -99,7 +99,7 @@
(:constant (and (signed-byte #.(- 13 vm:fixnum-tag-bits)) (not (integer 0 0)))))
(:results (r :scs (any-reg)))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic"))
+ (:note _N"inline fixnum arithmetic"))
(define-vop (fast-unsigned-binop-c fast-safe-arith-op)
(:args (x :target r :scs (unsigned-reg zero)))
@@ -108,7 +108,7 @@
(:constant (and (signed-byte 13) (not (integer 0 0)))))
(:results (r :scs (unsigned-reg)))
(:result-types unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic"))
+ (:note _N"inline (unsigned-byte 32) arithmetic"))
(define-vop (fast-signed-binop-c fast-safe-arith-op)
(:args (x :target r :scs (signed-reg zero)))
@@ -117,7 +117,7 @@
(:constant (and (signed-byte 13) (not (integer 0 0)))))
(:results (r :scs (signed-reg)))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic"))
+ (:note _N"inline (signed-byte 32) arithmetic"))
(eval-when (compile load eval)
@@ -226,7 +226,7 @@
(:results (r :scs (unsigned-reg)))
(:result-types unsigned-num)
(:translate abs)
- (:note "inline 32-bit abs")
+ (:note _N"inline 32-bit abs")
(:temporary (:scs (signed-reg)) y)
(:generator 1
;; From Hacker's Delight
@@ -247,7 +247,7 @@
(:policy :safe)
(:results (r :scs (any-reg descriptor-reg)))
(:result-types tagged-num)
- (:note "safe inline fixnum arithmetic")
+ (:note _N"safe inline fixnum arithmetic")
(:generator 4
(inst taddcctv r x y)))
@@ -255,7 +255,7 @@
(:policy :safe)
(:results (r :scs (any-reg descriptor-reg)))
(:result-types tagged-num)
- (:note "safe inline fixnum arithmetic")
+ (:note _N"safe inline fixnum arithmetic")
(:generator 3
(inst taddcctv r x (fixnumize y))))
@@ -263,7 +263,7 @@
(:policy :safe)
(:results (r :scs (any-reg descriptor-reg)))
(:result-types tagged-num)
- (:note "safe inline fixnum arithmetic")
+ (:note _N"safe inline fixnum arithmetic")
(:generator 4
(inst tsubcctv r x y)))
@@ -271,7 +271,7 @@
(:policy :safe)
(:results (r :scs (any-reg descriptor-reg)))
(:result-types tagged-num)
- (:note "safe inline fixnum arithmetic")
+ (:note _N"safe inline fixnum arithmetic")
(:generator 3
(inst tsubcctv r x (fixnumize y))))
@@ -289,7 +289,7 @@
(:results (quo :scs (any-reg))
(rem :scs (any-reg)))
(:result-types tagged-num tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:temporary (:scs (any-reg) :target quo) q)
(:temporary (:scs (any-reg)) r)
(:temporary (:scs (signed-reg)) y-int)
@@ -325,7 +325,7 @@
(:results (quo :scs (signed-reg))
(rem :scs (signed-reg)))
(:result-types signed-num signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:temporary (:scs (signed-reg) :target quo) q)
(:temporary (:scs (signed-reg)) r)
(:vop-var vop)
@@ -359,7 +359,7 @@
(:results (quo :scs (unsigned-reg))
(rem :scs (unsigned-reg)))
(:result-types unsigned-num unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:temporary (:scs (unsigned-reg) :target quo) q)
(:temporary (:scs (unsigned-reg)) r)
(:vop-var vop)
@@ -391,7 +391,7 @@
(:results (quo :scs (signed-reg))
(rem :scs (signed-reg)))
(:result-types signed-num signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:temporary (:scs (signed-reg) :target quo) q)
(:temporary (:scs (signed-reg)) r)
(:vop-var vop)
@@ -420,7 +420,7 @@
(:results (quo :scs (signed64-reg))
(rem :scs (signed64-reg)))
(:result-types signed64-num signed64-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:temporary (:scs (signed64-reg) :target quo) q)
(:temporary (:scs (signed64-reg)) r)
(:vop-var vop)
@@ -447,7 +447,7 @@
(:results (quo :scs (unsigned-reg))
(rem :scs (unsigned-reg)))
(:result-types unsigned-num unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:temporary (:scs (unsigned-reg) :target quo) q)
(:temporary (:scs (unsigned-reg)) r)
(:vop-var vop)
@@ -470,7 +470,7 @@
;;; Shifting
(define-vop (fast-ash/signed=>signed)
- (:note "inline (signed-byte 32) ASH")
+ (:note _N"inline (signed-byte 32) ASH")
(:args (number :scs (signed-reg) :to :save)
(amount :scs (signed-reg immediate) :to :save))
(:arg-types signed-num signed-num)
@@ -527,7 +527,7 @@
(move result number))))))))
(define-vop (fast-ash/unsigned=>unsigned)
- (:note "inline (unsigned-byte 32) ASH")
+ (:note _N"inline (unsigned-byte 32) ASH")
(:args (number :scs (unsigned-reg) :to :save)
(amount :scs (signed-reg immediate) :to :save))
(:arg-types unsigned-num signed-num)
@@ -583,7 +583,7 @@
(move result number))))))))
(define-vop (fast-ash-c/unsigned=>unsigned)
- (:note "inline constant ASH")
+ (:note _N"inline constant ASH")
(:args (number :scs (unsigned-reg)))
(:info count)
(:arg-types unsigned-num (:constant integer))
@@ -596,14 +596,14 @@
((< count -31) (move result zero-tn))
((< count 0) (inst srl result number (min (- count) 31)))
((> count 0) (inst sll result number (min count 31)))
- (t (error "identity ASH not transformed away")))))
+ (t (error _"identity ASH not transformed away")))))
;; Some special cases where we know we want a left shift. Just do the
;; shift, instead of checking for the sign of the shift.
(macrolet
((frob (name sc-type type result-type cost)
`(define-vop (,name)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:translate ash)
(:args (number :scs (,sc-type))
(amount :scs (signed-reg unsigned-reg immediate)))
@@ -630,7 +630,7 @@
(macrolet
((frob (name sc-type type result-type cost)
`(define-vop (,name)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:translate ash)
(:args (number :scs (,sc-type)))
(:info amount)
@@ -653,7 +653,7 @@
;;#+sparc-v9
#+nil
(define-vop (fast-ash-left/signed64=>signed64)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:translate ash)
(:args (number :scs (signed64-reg))
(amount :scs (signed-reg unsigned-reg immediate)))
@@ -705,7 +705,7 @@
(macrolet
((frob (trans name sc-type type shift-inst cost)
`(define-vop (,name)
- (:note "inline right ASH")
+ (:note _N"inline right ASH")
(:translate ,trans)
(:args (number :scs (,sc-type))
(amount :scs (signed-reg unsigned-reg immediate)))
@@ -736,7 +736,7 @@
(macrolet
((frob (trans name sc-type type shift-inst cost max-shift)
`(define-vop (,name)
- (:note "inline right ASH")
+ (:note _N"inline right ASH")
(:translate ,trans)
(:args (number :target result :scs (,sc-type)))
(:info amount)
@@ -769,7 +769,7 @@
(:results (r :scs (signed-reg)))
(:result-types signed-num)
(:translate ash-right-signed)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:generator 1
(if (zerop y)
(move r x)
@@ -777,7 +777,7 @@
(define-vop (fast-ash-right/fixnum=>fixnum)
- (:note "inline right ASH")
+ (:note _N"inline right ASH")
(:translate ash-right-signed)
(:args (number :scs (any-reg))
(amount :scs (signed-reg unsigned-reg immediate)))
@@ -801,7 +801,7 @@
(define-vop (signed-byte-32-len)
(:translate integer-length)
- (:note "inline (signed-byte 32) integer-length")
+ (:note _N"inline (signed-byte 32) integer-length")
(:policy :fast-safe)
(:args (arg :scs (signed-reg) :target shift))
(:arg-types signed-num)
@@ -827,7 +827,7 @@
(define-vop (unsigned-byte-32-len)
(:translate integer-length)
- (:note "inline (unsigned-byte 32) integer-length")
+ (:note _N"inline (unsigned-byte 32) integer-length")
(:policy :fast-safe)
(:args (arg :scs (unsigned-reg) :target shift))
(:arg-types unsigned-num)
@@ -852,7 +852,7 @@
(define-vop (unsigned-byte-32-count)
(:translate logcount)
- (:note "inline (unsigned-byte 32) logcount")
+ (:note _N"inline (unsigned-byte 32) logcount")
(:policy :fast-safe)
(:args (arg :scs (unsigned-reg)))
(:arg-types unsigned-num)
@@ -915,7 +915,7 @@
(:constant (and (signed-byte 13) (not (integer 0 0)))))
(:results (r :scs (any-reg)))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:translate *)
(:guard (or (backend-featurep :sparc-v8)
(and (backend-featurep :sparc-v9)
@@ -978,13 +978,13 @@
(let ((bound (ash 1 (1- s))))
`(integer ,(- bound) ,(- bound bite 1))))
(t
- (error "Bad size specified for SIGNED-BYTE type specifier: ~S." s))))
+ (error _"Bad size specified for SIGNED-BYTE type specifier: ~S." s))))
(define-vop (fast-conditional/fixnum fast-conditional)
(:args (x :scs (any-reg zero))
(y :scs (any-reg zero)))
(:arg-types tagged-num tagged-num)
- (:note "inline fixnum comparison"))
+ (:note _N"inline fixnum comparison"))
(define-vop (fast-conditional-c/fixnum fast-conditional/fixnum)
(:args (x :scs (any-reg zero)))
@@ -995,7 +995,7 @@
(:args (x :scs (signed-reg zero))
(y :scs (signed-reg zero)))
(:arg-types signed-num signed-num)
- (:note "inline (signed-byte 32) comparison"))
+ (:note _N"inline (signed-byte 32) comparison"))
(define-vop (fast-conditional-c/signed fast-conditional/signed)
(:args (x :scs (signed-reg zero)))
@@ -1006,7 +1006,7 @@
(:args (x :scs (unsigned-reg zero))
(y :scs (unsigned-reg zero)))
(:arg-types unsigned-num unsigned-num)
- (:note "inline (unsigned-byte 32) comparison"))
+ (:note _N"inline (unsigned-byte 32) comparison"))
(define-vop (fast-conditional-c/unsigned fast-conditional/unsigned)
(:args (x :scs (unsigned-reg zero)))
@@ -1057,7 +1057,7 @@
(:args (x :scs (any-reg descriptor-reg zero))
(y :scs (any-reg zero)))
(:arg-types tagged-num tagged-num)
- (:note "inline fixnum comparison")
+ (:note _N"inline fixnum comparison")
(:translate eql)
(:generator 4
(inst cmp x y)
@@ -1180,13 +1180,13 @@
(define-vop (shift-towards-start shift-towards-someplace)
(:translate shift-towards-start)
- (:note "shift-towards-start")
+ (:note _N"shift-towards-start")
(:generator 1
(inst slln r num amount)))
(define-vop (shift-towards-end shift-towards-someplace)
(:translate shift-towards-end)
- (:note "shift-towards-end")
+ (:note _N"shift-towards-end")
(:generator 1
(inst srln r num amount)))
@@ -1297,7 +1297,7 @@
;;; routines.
;;;
(defun emit-multiply (multiplier multiplicand result-high result-low)
- "Emit code to multiply MULTIPLIER with MULTIPLICAND, putting the result
+ _N"Emit code to multiply MULTIPLIER with MULTIPLICAND, putting the result
in RESULT-HIGH and RESULT-LOW. KIND is either :signed or :unsigned.
Note: the lifetimes of MULTIPLICAND and RESULT-HIGH overlap."
(declare (type tn multiplier result-high result-low)
@@ -1573,7 +1573,7 @@
(:results (quo :scs (signed-reg))
(rem :scs (signed-reg)))
(:result-types signed-num signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:guard (or (backend-featurep :sparc-v8)
(and (backend-featurep :sparc-v9)
(not (backend-featurep :sparc-64)))))
@@ -1618,7 +1618,7 @@
(:results (quo :scs (unsigned-reg))
(rem :scs (unsigned-reg)))
(:result-types unsigned-num unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:guard (or (backend-featurep :sparc-v8)
(and (backend-featurep :sparc-v9)
(not (backend-featurep :sparc-64)))))
@@ -1784,7 +1784,7 @@
(:arg-types (:or signed64-num signed-num unsigned-num))
(:result-types signed64-num)
(:temporary (:scs (signed64-reg)) x64)
- (:note "inline (signed-byte 64) arithmetic"))
+ (:note _N"inline (signed-byte 64) arithmetic"))
(define-vop (fast-signed64-binop fast-safe-arith-op)
(:args (x :target r :scs (signed64-reg unsigned-reg signed-reg zero))
@@ -1793,7 +1793,7 @@
(:or signed64-num signed-num unsigned-num))
(:results (r :scs (signed64-reg)))
(:result-types signed64-num)
- (:note "inline (signed-byte 64) arithmetic"))
+ (:note _N"inline (signed-byte 64) arithmetic"))
(define-vop (fast-signed64-binop-c fast-safe-arith-op)
(:args (x :target r :scs (signed64-reg unsigned-reg signed-reg zero)))
@@ -1802,7 +1802,7 @@
(:constant (and (signed-byte 13) (not (integer 0 0)))))
(:results (r :scs (signed64-reg)))
(:result-types signed64-num)
- (:note "inline (signed-byte 64) arithmetic"))
+ (:note _N"inline (signed-byte 64) arithmetic"))
(define-vop (fast-unsigned64-binop fast-safe-arith-op)
(:args (x :target r :scs (unsigned64-reg unsigned-reg zero))
@@ -1811,7 +1811,7 @@
(:or unsigned64-num unsigned-num))
(:results (r :scs (unsigned64-reg)))
(:result-types unsigned64-num)
- (:note "inline (unsigned-byte 64) arithmetic"))
+ (:note _N"inline (unsigned-byte 64) arithmetic"))
(define-vop (fast-unsigned64-binop-c fast-safe-arith-op)
(:args (x :target r :scs (unsigned64-reg unsigned-reg zero)))
@@ -1820,7 +1820,7 @@
(:constant (and (signed-byte 13) (not (integer 0 0)))))
(:results (r :scs (unsigned64-reg)))
(:result-types unsigned64-num)
- (:note "inline (unsigned-byte 64) arithmetic"))
+ (:note _N"inline (unsigned-byte 64) arithmetic"))
;; Extend the sign of Y appropriately and perform the desired
;; operation. R is where the result should go, X is the first arg, Y
@@ -2014,7 +2014,7 @@
(:result-types signed64-num)
(:temporary (:scs (signed64-reg)) x64 y64)
(:translate *)
- (:note "inline (signed-byte 64) arithmetic")
+ (:note _N"inline (signed-byte 64) arithmetic")
(:guard (backend-featurep :sparc-v9))
(:generator 3
(sc-dispatch r x y x64 y64 mulx)))
@@ -2028,7 +2028,7 @@
(:result-types unsigned64-num)
(:temporary (:scs (signed64-reg)) x64 y64)
(:translate *)
- (:note "inline (signed-byte 64) arithmetic")
+ (:note _N"inline (signed-byte 64) arithmetic")
(:guard (backend-featurep :sparc-v9))
(:generator 3
(sc-dispatch r x y x64 y64 mulx)))
@@ -2044,7 +2044,7 @@
(:result-types signed64-num)
(:temporary (:scs (signed64-reg)) x64 y64)
(:translate *)
- (:note "inline (signed-byte 64) arithmetic")
+ (:note _N"inline (signed-byte 64) arithmetic")
(:guard (backend-featurep :sparc-v9))
(:generator 3
(sc-dispatch r x y x64 y64 mulx)))
@@ -2059,13 +2059,13 @@
(:result-types unsigned64-num)
(:temporary (:scs (unsigned64-reg)) x64 y64)
(:translate *)
- (:note "inline (unsigned-byte 64) arithmetic")
+ (:note _N"inline (unsigned-byte 64) arithmetic")
(:guard (backend-featurep :sparc-v9))
(:generator 3
(sc-dispatch r x y x64 y64 mulx)))
(define-vop (fast-ash/signed64=>signed64)
- (:note "inline (signed-byte 64) ASH")
+ (:note _N"inline (signed-byte 64) ASH")
(:args (number :scs (signed64-reg unsigned-reg signed-reg) :to :save)
(amount :scs (signed64-reg signed-reg unsigned-reg) :to :save))
(:arg-types (:or signed64-num signed-num unsigned-num)
@@ -2131,7 +2131,7 @@
(move result num64))))))))
(define-vop (fast-ash/unsigned64=>unsigned64)
- (:note "inline (signed-byte 64) ASH")
+ (:note _N"inline (signed-byte 64) ASH")
(:args (number :scs (unsigned64-reg unsigned-reg) :to :save)
(amount :scs (signed64-reg signed-reg unsigned-reg immediate) :to :save))
(:arg-types (:or unsigned64-num unsigned-num)
@@ -2208,28 +2208,28 @@
(y :scs (signed64-reg unsigned-reg signed-reg zero)))
(:arg-types (:or signed64-num unsigned-num signed-num)
(:or signed64-num unsigned-num signed-num))
- (:note "inline (signed-byte 64) comparison"))
+ (:note _N"inline (signed-byte 64) comparison"))
(define-vop (fast-conditional-c/signed64 fast-conditional)
(:args (x :scs (signed64-reg unsigned-reg signed-reg zero)))
(:arg-types (:or signed64-num unsigned-num signed-num)
(:constant (signed-byte 13)))
(:info target not-p y)
- (:note "inline (signed-byte 64) comparison"))
+ (:note _N"inline (signed-byte 64) comparison"))
(define-vop (fast-conditional/unsigned64 fast-conditional)
(:args (x :scs (unsigned64-reg zero))
(y :scs (unsigned64-reg zero)))
(:arg-types (:or unsigned64-num)
(:or unsigned64-num))
- (:note "inline (unsigned-byte 64) comparison"))
+ (:note _N"inline (unsigned-byte 64) comparison"))
(define-vop (fast-conditional-c/unsigned64 fast-conditional)
(:args (x :scs (unsigned64-reg zero)))
(:arg-types (:or unsigned64-num)
(:constant (unsigned-byte 12)))
(:info target not-p y)
- (:note "inline (signed-byte 64) comparison"))
+ (:note _N"inline (signed-byte 64) comparison"))
;; If I were smarter, This would be a macro like it is for the 32-bit
;; versions. It's easier this way to see what's happening, though.
@@ -2577,12 +2577,12 @@
(deftransform * ((x y)
((unsigned-byte 32) (constant-argument (unsigned-byte 32)))
(unsigned-byte 32))
- "recode as shifts and adds"
+ _N"recode as shifts and adds"
(*-transformer y))
#+modular-arith
(deftransform vm::*-mod32 ((x y)
((unsigned-byte 32) (constant-argument (unsigned-byte 32)))
(unsigned-byte 32))
- "recode as shifts and adds"
+ _N"recode as shifts and adds"
(*-transformer y))
Index: src/compiler/sparc/array.lisp
diff -u src/compiler/sparc/array.lisp:1.36 src/compiler/sparc/array.lisp:1.36.12.1
--- src/compiler/sparc/array.lisp:1.36 Thu Jun 11 12:04:00 2009
+++ src/compiler/sparc/array.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/array.lisp,v 1.36 2009-06-11 16:04:00 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/array.lisp,v 1.36.12.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,7 @@
;;; Complex-float and long-float support by Douglas Crosher 1998.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;;; Allocator for the array header.
@@ -116,7 +117,7 @@
,(intern (concatenate 'simple-string
(string variant)
"-REF")))
- (:note "inline array access")
+ (:note _N"inline array access")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-ref)
(:arg-types ,type positive-fixnum)
@@ -128,7 +129,7 @@
,(intern (concatenate 'simple-string
(string variant)
"-SET")))
- (:note "inline array store")
+ (:note _N"inline array store")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-set)
(:arg-types ,type positive-fixnum ,element-type)
@@ -174,7 +175,7 @@
(bit-shift (1- (integer-length elements-per-word))))
`(progn
(define-vop (,(symbolicate 'data-vector-ref/ type))
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -230,7 +231,7 @@
(unless (= extra ,(1- elements-per-word))
(inst and result ,(1- (ash 1 bits)))))))
(define-vop (,(symbolicate 'data-vector-set/ type))
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -341,7 +342,7 @@
;;;
(define-vop (data-vector-ref/simple-array-single-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -356,7 +357,7 @@
(inst ldf value object offset)))
(define-vop (data-vector-ref-c/simple-array-single-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
@@ -377,7 +378,7 @@
(define-vop (data-vector-set/simple-array-single-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -396,7 +397,7 @@
(inst fmovs result value))))
(define-vop (data-vector-set-c/simple-array-single-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -421,7 +422,7 @@
(inst fmovs result value)))))
(define-vop (data-vector-ref/simple-array-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -437,7 +438,7 @@
(inst lddf value object offset)))
(define-vop (data-vector-ref-c/simple-array-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg)))
@@ -457,7 +458,7 @@
(inst lddf value object temp))))))
(define-vop (data-vector-set/simple-array-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -476,7 +477,7 @@
(move-double-reg result value))))
(define-vop (data-vector-set-c/simple-array-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -502,7 +503,7 @@
#+long-float
(define-vop (data-vector-ref/simple-array-long-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -519,7 +520,7 @@
#+long-float
(define-vop (data-vector-set/simple-array-long-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg))
@@ -555,7 +556,7 @@
;;;
(define-vop (data-vector-ref/simple-array-signed-byte-8 signed-byte-index-ref)
- (:note "inline array access")
+ (:note _N"inline array access")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-ref)
(:arg-types simple-array-signed-byte-8 positive-fixnum)
@@ -563,7 +564,7 @@
(:result-types tagged-num))
(define-vop (data-vector-set/simple-array-signed-byte-8 byte-index-set)
- (:note "inline array store")
+ (:note _N"inline array store")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-set)
(:arg-types simple-array-signed-byte-8 positive-fixnum tagged-num)
@@ -576,7 +577,7 @@
(define-vop (data-vector-ref/simple-array-signed-byte-16
signed-halfword-index-ref)
- (:note "inline array access")
+ (:note _N"inline array access")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-ref)
(:arg-types simple-array-signed-byte-16 positive-fixnum)
@@ -584,7 +585,7 @@
(:result-types tagged-num))
(define-vop (data-vector-set/simple-array-signed-byte-16 halfword-index-set)
- (:note "inline array store")
+ (:note _N"inline array store")
(:variant vm:vector-data-offset vm:other-pointer-type)
(:translate data-vector-set)
(:arg-types simple-array-signed-byte-16 positive-fixnum tagged-num)
@@ -598,7 +599,7 @@
;;; Complex float arrays.
(define-vop (data-vector-ref/simple-array-complex-single-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -618,7 +619,7 @@
(inst ldf imag-tn object offset))))
(define-vop (data-vector-ref-c/simple-array-complex-single-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result))
@@ -644,7 +645,7 @@
(inst ldf imag-tn object temp))))))
(define-vop (data-vector-set/simple-array-complex-single-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -672,7 +673,7 @@
(inst fmovs result-imag value-imag)))))
(define-vop (data-vector-set-c/simple-array-complex-single-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -706,7 +707,7 @@
(inst fmovs result-imag value-imag)))))
(define-vop (data-vector-ref/simple-array-complex-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -726,7 +727,7 @@
(inst lddf imag-tn object offset))))
(define-vop (data-vector-ref-c/simple-array-complex-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result))
@@ -751,7 +752,7 @@
(inst lddf imag-tn object temp))))))
(define-vop (data-vector-set/simple-array-complex-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -779,7 +780,7 @@
(move-double-reg result-imag value-imag)))))
(define-vop (data-vector-set-c/simple-array-complex-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -818,7 +819,7 @@
#+long-float
(define-vop (data-vector-ref/simple-array-complex-long-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -839,7 +840,7 @@
#+long-float
(define-vop (data-vector-set/simple-array-complex-long-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -976,14 +977,14 @@
;;;
(define-vop (raw-bits word-index-ref)
- (:note "raw-bits VOP")
+ (:note _N"raw-bits VOP")
(:translate %raw-bits)
(:results (value :scs (unsigned-reg)))
(:result-types unsigned-num)
(:variant 0 vm:other-pointer-type))
(define-vop (set-raw-bits word-index-set)
- (:note "setf raw-bits VOP")
+ (:note _N"setf raw-bits VOP")
(:translate %set-raw-bits)
(:args (object :scs (descriptor-reg))
(index :scs (any-reg zero immediate))
@@ -997,7 +998,7 @@
#+double-double
(progn
(define-vop (data-vector-ref/simple-array-double-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -1017,7 +1018,7 @@
(inst lddf lo-tn object offset))))
(define-vop (data-vector-ref-c/simple-array-double-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result))
@@ -1042,7 +1043,7 @@
(inst lddf lo-tn object temp))))))
(define-vop (data-vector-set/simple-array-double-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -1070,7 +1071,7 @@
(move-double-reg result-lo value-lo)))))
(define-vop (data-vector-set-c/simple-array-double-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -1108,7 +1109,7 @@
(move-double-reg result-lo value-lo)))))
(define-vop (data-vector-ref/simple-array-complex-double-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -1134,7 +1135,7 @@
(inst lddf imag-tn object offset))))
(define-vop (data-vector-ref-c/simple-array-complex-double-double-float)
- (:note "inline array access")
+ (:note _N"inline array access")
(:translate data-vector-ref)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result))
@@ -1167,7 +1168,7 @@
(inst lddf imag-lo-tn object temp))))))
(define-vop (data-vector-set/simple-array-complex-double-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
@@ -1207,7 +1208,7 @@
(move-double-reg result-imag value-imag)))))
(define-vop (data-vector-set-c/simple-array-complex-double-double-float)
- (:note "inline array store")
+ (:note _N"inline array store")
(:translate data-vector-set)
(:policy :fast-safe)
(:args (object :scs (descriptor-reg) :to :result)
Index: src/compiler/sparc/c-call.lisp
diff -u src/compiler/sparc/c-call.lisp:1.27 src/compiler/sparc/c-call.lisp:1.27.32.1
--- src/compiler/sparc/c-call.lisp:1.27 Tue Nov 29 12:02:53 2005
+++ src/compiler/sparc/c-call.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/c-call.lisp,v 1.27 2005-11-29 17:02:53 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/c-call.lisp,v 1.27.32.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -15,6 +15,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
(use-package "ALIEN")
(use-package "ALIEN-INTERNALS")
@@ -89,7 +90,7 @@
(def-alien-type-method (values :result-tn) (type state)
(let ((values (alien-values-type-values type)))
(when (> (length values) 2)
- (error "Too many result values from c-call."))
+ (error _"Too many result values from c-call."))
(mapcar #'(lambda (type)
(invoke-alien-type-method :result-tn type state))
values)))
@@ -365,7 +366,7 @@
(eq (machine-rep type1) (machine-rep type2)))))
(defun make-callback-trampoline (index fn-type)
- "Cons up a piece of code which calls call-callback with INDEX and a
+ _N"Cons up a piece of code which calls call-callback with INDEX and a
pointer to the arguments."
(let ((return-type (alien-function-type-result-type fn-type)))
(flet ((def-reg-tn (offset)
Index: src/compiler/sparc/call.lisp
diff -u src/compiler/sparc/call.lisp:1.38 src/compiler/sparc/call.lisp:1.38.38.1
--- src/compiler/sparc/call.lisp:1.38 Fri Feb 11 16:02:34 2005
+++ src/compiler/sparc/call.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/call.lisp,v 1.38 2005-02-11 21:02:34 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/call.lisp,v 1.38.38.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -14,6 +14,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;;; Interfaces to IR2 conversion:
@@ -1248,7 +1249,7 @@
(:results (context :scs (descriptor-reg))
(count :scs (any-reg)))
(:result-types t tagged-num)
- (:note "more-arg-context")
+ (:note _N"more-arg-context")
(:generator 5
(inst sub count supplied (fixnumize fixed))
(inst sub context csp-tn count)))
Index: src/compiler/sparc/cell.lisp
diff -u src/compiler/sparc/cell.lisp:1.26 src/compiler/sparc/cell.lisp:1.26.38.1
--- src/compiler/sparc/cell.lisp:1.26 Mon May 17 21:14:05 2004
+++ src/compiler/sparc/cell.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/cell.lisp,v 1.26 2004-05-18 01:14:05 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/cell.lisp,v 1.26.38.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -18,6 +18,7 @@
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;;; Data object ref/set stuff.
Index: src/compiler/sparc/char.lisp
diff -u src/compiler/sparc/char.lisp:1.12 src/compiler/sparc/char.lisp:1.12.42.1
--- src/compiler/sparc/char.lisp:1.12 Sun Oct 19 21:25:01 2003
+++ src/compiler/sparc/char.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/char.lisp,v 1.12 2003-10-20 01:25:01 toy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/char.lisp,v 1.12.42.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,7 @@
;;; And then to the SPARC by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
@@ -26,7 +27,7 @@
(define-vop (move-to-base-char)
(:args (x :scs (any-reg descriptor-reg)))
(:results (y :scs (base-char-reg)))
- (:note "character untagging")
+ (:note _N"character untagging")
(:generator 1
(inst srln y x vm:type-bits)))
;;;
@@ -39,7 +40,7 @@
(define-vop (move-from-base-char)
(:args (x :scs (base-char-reg)))
(:results (y :scs (any-reg descriptor-reg)))
- (:note "character tagging")
+ (:note _N"character tagging")
(:generator 1
(inst slln y x vm:type-bits)
(inst or y vm:base-char-type)))
@@ -55,7 +56,7 @@
:load-if (not (location= x y))))
(:results (y :scs (base-char-reg)
:load-if (not (location= x y))))
- (:note "character move")
+ (:note _N"character move")
(:effects)
(:affected)
(:generator 0
@@ -74,7 +75,7 @@
:load-if (not (sc-is y base-char-reg))))
(:results (y))
(:temporary (:sc non-descriptor-reg) temp)
- (:note "character arg move")
+ (:note _N"character arg move")
(:generator 0
(sc-case y
(base-char-reg
@@ -126,7 +127,7 @@
(:conditional)
(:info target not-p)
(:policy :fast-safe)
- (:note "inline comparison")
+ (:note _N"inline comparison")
(:variant-vars condition not-condition)
(:generator 3
(inst cmp x y)
@@ -151,7 +152,7 @@
(:conditional)
(:info target not-p y)
(:policy :fast-safe)
- (:note "inline comparison")
+ (:note _N"inline comparison")
(:variant-vars condition not-condition)
(:generator 2
(inst cmp x (char-code y))
Index: src/compiler/sparc/debug.lisp
diff -u src/compiler/sparc/debug.lisp:1.6 src/compiler/sparc/debug.lisp:1.6.42.1
--- src/compiler/sparc/debug.lisp:1.6 Mon Oct 27 13:30:27 2003
+++ src/compiler/sparc/debug.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/debug.lisp,v 1.6 2003-10-27 18:30:27 toy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/debug.lisp,v 1.6.42.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -14,6 +14,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
(defknown di::current-sp () system-area-pointer (movable flushable))
(defknown di::current-fp () system-area-pointer (movable flushable))
Index: src/compiler/sparc/float.lisp
diff -u src/compiler/sparc/float.lisp:1.62 src/compiler/sparc/float.lisp:1.62.12.1
--- src/compiler/sparc/float.lisp:1.62 Mon Jun 15 14:03:25 2009
+++ src/compiler/sparc/float.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/float.lisp,v 1.62 2009-06-15 18:03:25 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/float.lisp,v 1.62.12.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,7 @@
;;; Complex-float and long-float support by Douglas Crosher 1998.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;;; Move functions:
@@ -141,7 +142,7 @@
:load-if (not (location= x y))))
(:results (y :scs (,sc)
:load-if (not (location= x y))))
- (:note "float move")
+ (:note _N"float move")
(:generator 0
(unless (location= y x)
,@(ecase format
@@ -158,7 +159,7 @@
(define-vop (move-from-float)
(:args (x :to :save))
(:results (y))
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:temporary (:scs (non-descriptor-reg)) ndescr)
(:variant-vars format size type data)
(:generator 13
@@ -192,7 +193,7 @@
(define-vop (,name)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (,sc)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(inst ,(ecase format
(:single 'ldf)
@@ -207,7 +208,7 @@
(define-vop (move-to-long)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (long-reg)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(load-long-reg y x (- (* vm:long-float-value-slot vm:word-bytes)
vm:other-pointer-type))))
@@ -221,7 +222,7 @@
(nfp :scs (any-reg)
:load-if (not (sc-is y ,sc))))
(:results (y))
- (:note "float argument move")
+ (:note _N"float argument move")
(:generator ,(ecase format (:single 1) (:double 2))
(sc-case y
(,sc
@@ -245,7 +246,7 @@
(:args (x :scs (long-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y long-reg))))
(:results (y))
- (:note "float argument move")
+ (:note _N"float argument move")
(:generator 3
(sc-case y
(long-reg
@@ -396,7 +397,7 @@
(:args (x :scs (complex-single-reg) :target y
:load-if (not (location= x y))))
(:results (y :scs (complex-single-reg) :load-if (not (location= x y))))
- (:note "complex single float move")
+ (:note _N"complex single float move")
(:generator 0
(unless (location= x y)
;; Note the complex-float-regs are aligned to every second
@@ -415,7 +416,7 @@
(:args (x :scs (complex-double-reg)
:target y :load-if (not (location= x y))))
(:results (y :scs (complex-double-reg) :load-if (not (location= x y))))
- (:note "complex double float move")
+ (:note _N"complex double float move")
(:generator 0
(unless (location= x y)
;; Note the complex-float-regs are aligned to every second
@@ -435,7 +436,7 @@
(:args (x :scs (complex-long-reg)
:target y :load-if (not (location= x y))))
(:results (y :scs (complex-long-reg) :load-if (not (location= x y))))
- (:note "complex long float move")
+ (:note _N"complex long float move")
(:generator 0
(unless (location= x y)
;; Note the complex-float-regs are aligned to every second
@@ -456,7 +457,7 @@
(:args (x :scs (complex-double-double-reg)
:target y :load-if (not (location= x y))))
(:results (y :scs (complex-double-double-reg) :load-if (not (location= x y))))
- (:note "complex double-double float move")
+ (:note _N"complex double-double float move")
(:generator 0
(unless (location= x y)
;; Note the complex-float-regs are aligned to every second
@@ -486,7 +487,7 @@
(:args (x :scs (complex-single-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:note "complex single float to pointer coercion")
+ (:note _N"complex single float to pointer coercion")
(:generator 13
(with-fixed-allocation (y ndescr vm:complex-single-float-type
vm:complex-single-float-size))
@@ -506,7 +507,7 @@
(:args (x :scs (complex-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:note "complex double float to pointer coercion")
+ (:note _N"complex double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y ndescr vm:complex-double-float-type
vm:complex-double-float-size))
@@ -527,7 +528,7 @@
(:args (x :scs (complex-long-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:note "complex long float to pointer coercion")
+ (:note _N"complex long float to pointer coercion")
(:generator 13
(with-fixed-allocation (y ndescr vm:complex-long-float-type
vm:complex-long-float-size))
@@ -549,7 +550,7 @@
(:args (x :scs (complex-double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:note "complex double-double float to pointer coercion")
+ (:note _N"complex double-double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y ndescr vm::complex-double-double-float-type
vm::complex-double-double-float-size))
@@ -580,7 +581,7 @@
(define-vop (move-to-complex-single)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-single-reg)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-single-reg-real-tn y)))
(inst ldf real-tn x (- (* complex-single-float-real-slot word-bytes)
@@ -594,7 +595,7 @@
(define-vop (move-to-complex-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-double-reg)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-double-reg-real-tn y)))
(inst lddf real-tn x (- (* complex-double-float-real-slot word-bytes)
@@ -609,7 +610,7 @@
(define-vop (move-to-complex-long)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-long-reg)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-long-reg-real-tn y)))
(load-long-reg real-tn x (- (* complex-long-float-real-slot word-bytes)
@@ -625,7 +626,7 @@
(define-vop (move-to-complex-double-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-double-double-reg)))
- (:note "pointer to complex double-double float coercion")
+ (:note _N"pointer to complex double-double float coercion")
(:generator 2
(let ((real-tn (complex-double-double-reg-real-hi-tn y)))
(inst lddf real-tn x (- (* complex-double-double-float-real-hi-slot word-bytes)
@@ -650,7 +651,7 @@
(:args (x :scs (complex-single-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y complex-single-reg))))
(:results (y))
- (:note "complex single-float argument move")
+ (:note _N"complex single-float argument move")
(:generator 1
(sc-case y
(complex-single-reg
@@ -674,7 +675,7 @@
(:args (x :scs (complex-double-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y complex-double-reg))))
(:results (y))
- (:note "complex double-float argument move")
+ (:note _N"complex double-float argument move")
(:generator 2
(sc-case y
(complex-double-reg
@@ -699,7 +700,7 @@
(:args (x :scs (complex-long-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y complex-long-reg))))
(:results (y))
- (:note "complex long-float argument move")
+ (:note _N"complex long-float argument move")
(:generator 2
(sc-case y
(complex-long-reg
@@ -726,7 +727,7 @@
(:args (x :scs (complex-double-double-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y complex-double-double-reg))))
(:results (y))
- (:note "complex double-double float argument move")
+ (:note _N"complex double-double float argument move")
(:generator 2
(sc-case y
(complex-double-double-reg
@@ -771,7 +772,7 @@
(:args (x) (y))
(:results (r))
(:policy :fast-safe)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only))
@@ -822,7 +823,7 @@
(:policy :fast-safe)
(:arg-types ,type)
(:result-types ,type)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -868,7 +869,7 @@
(:policy :fast-safe)
(:arg-types double-float)
(:result-types double-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -882,7 +883,7 @@
(:policy :fast-safe)
(:arg-types double-float)
(:result-types double-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -897,7 +898,7 @@
(:policy :fast-safe)
(:arg-types long-float)
(:result-types long-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -925,7 +926,7 @@
(:policy :fast-safe)
(:arg-types long-float)
(:result-types long-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -954,7 +955,7 @@
(:info target not-p)
(:variant-vars format yep nope)
(:policy :fast-safe)
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:vop-var vop)
(:save-p :compute-only)
(:generator 3
@@ -1073,7 +1074,7 @@
(:arg-types signed-num)
(:result-types ,to-type)
(:policy :fast-safe)
- (:note "inline float coercion")
+ (:note _N"inline float coercion")
(:translate ,translate)
(:vop-var vop)
(:save-p :compute-only)
@@ -1138,7 +1139,7 @@
(:arg-types ,from-type)
(:result-types ,to-type)
(:policy :fast-safe)
- (:note "inline float coercion")
+ (:note _N"inline float coercion")
(:translate ,translate)
(:vop-var vop)
(:save-p :compute-only)
@@ -1173,7 +1174,7 @@
(:result-types signed-num)
(:translate ,trans)
(:policy :fast-safe)
- (:note "inline float truncate")
+ (:note _N"inline float truncate")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -1205,7 +1206,7 @@
(:policy :fast-safe)
(:translate c::fast-unary-ftruncate)
(:guard (not (backend-featurep :sparc-v9)))
- (:note "inline ftruncate")
+ (:note _N"inline ftruncate")
(:generator 2
(inst fstoi r x)
(inst fitos r r)))
@@ -1218,7 +1219,7 @@
(:policy :fast-safe)
(:translate c::fast-unary-ftruncate)
(:guard (not (backend-featurep :sparc-v9)))
- (:note "inline ftruncate")
+ (:note _N"inline ftruncate")
(:generator 2
(inst fdtoi r x)
(inst fitod r r)))
@@ -1233,7 +1234,7 @@
(:policy :fast-safe)
(:translate c::fast-unary-ftruncate)
(:guard (backend-featurep :sparc-v9))
- (:note "inline ftruncate")
+ (:note _N"inline ftruncate")
(:generator 2
(inst fstox temp x)
(inst fxtos r temp)))
@@ -1246,7 +1247,7 @@
(:policy :fast-safe)
(:translate c::fast-unary-ftruncate)
(:guard (backend-featurep :sparc-v9))
- (:note "inline ftruncate")
+ (:note _N"inline ftruncate")
(:generator 2
(inst fdtox r x)
(inst fxtod r r)))
@@ -1695,7 +1696,7 @@
(backend-featurep :sparc-v9)))
(:arg-types double-float)
(:result-types double-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -1710,7 +1711,7 @@
(:policy :fast-safe)
(:arg-types long-float)
(:result-types long-float)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -1729,7 +1730,7 @@
(:results (r :scs (complex-single-reg) :from (:argument 0)
:load-if (not (sc-is r complex-single-stack))))
(:result-types complex-single-float)
- (:note "inline complex single-float creation")
+ (:note _N"inline complex single-float creation")
(:policy :fast-safe)
(:vop-var vop)
(:generator 5
@@ -1757,7 +1758,7 @@
(:results (r :scs (complex-double-reg) :from (:argument 0)
:load-if (not (sc-is r complex-double-stack))))
(:result-types complex-double-float)
- (:note "inline complex double-float creation")
+ (:note _N"inline complex double-float creation")
(:policy :fast-safe)
(:vop-var vop)
(:generator 5
@@ -1786,7 +1787,7 @@
(:results (r :scs (complex-long-reg) :from (:argument 0)
:load-if (not (sc-is r complex-long-stack))))
(:result-types complex-long-float)
- (:note "inline complex long-float creation")
+ (:note _N"inline complex long-float creation")
(:policy :fast-safe)
(:vop-var vop)
(:generator 5
@@ -1835,12 +1836,12 @@
(define-vop (realpart/complex-single-float complex-single-float-value)
(:translate realpart)
- (:note "complex single float realpart")
+ (:note _N"complex single float realpart")
(:variant :real))
(define-vop (imagpart/complex-single-float complex-single-float-value)
(:translate imagpart)
- (:note "complex single float imagpart")
+ (:note _N"complex single float imagpart")
(:variant :imag))
(define-vop (complex-double-float-value)
@@ -1873,12 +1874,12 @@
(define-vop (realpart/complex-double-float complex-double-float-value)
(:translate realpart)
- (:note "complex double float realpart")
+ (:note _N"complex double float realpart")
(:variant :real))
(define-vop (imagpart/complex-double-float complex-double-float-value)
(:translate imagpart)
- (:note "complex double float imagpart")
+ (:note _N"complex double float imagpart")
(:variant :imag))
#+long-float
@@ -1907,13 +1908,13 @@
#+long-float
(define-vop (realpart/complex-long-float complex-long-float-value)
(:translate realpart)
- (:note "complex long float realpart")
+ (:note _N"complex long float realpart")
(:variant :real))
#+long-float
(define-vop (imagpart/complex-long-float complex-long-float-value)
(:translate imagpart)
- (:note "complex long float imagpart")
+ (:note _N"complex long float imagpart")
(:variant :imag))
@@ -1947,7 +1948,7 @@
(:results (r :scs (,complex-reg)))
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate %negate)
(:generator ,cost
(let ((xr (,real-tn x))
@@ -1973,7 +1974,7 @@
(:arg-types ,c-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate ,op)
(:generator ,cost
(let ((xr (,real-part x))
@@ -2020,7 +2021,7 @@
(:policy :fast-safe)
(:temporary (:scs (,real-reg)) zero)
(:temporary (:scs (descriptor-reg)) zero-val)
- (:note "inline complex float/float arithmetic")
+ (:note _N"inline complex float/float arithmetic")
(:translate ,op)
(:generator ,cost
(let ((xr (,real-part x))
@@ -2072,7 +2073,7 @@
(:temporary (:scs (,real-reg)) zero)
(:temporary (:scs (descriptor-reg)) zero-val)
(:policy :fast-safe)
- (:note "inline complex float/float arithmetic")
+ (:note _N"inline complex float/float arithmetic")
(:translate +)
(:generator ,cost
(let ((xr (,real-part x))
@@ -2115,7 +2116,7 @@
(:temporary (:scs (,real-reg)) zero)
(:temporary (:scs (descriptor-reg)) zero-val)
(:policy :fast-safe)
- (:note "inline complex float/float arithmetic")
+ (:note _N"inline complex float/float arithmetic")
(:translate -)
(:generator ,cost
(let ((yr (,real-part y))
@@ -2147,7 +2148,7 @@
(:arg-types ,c-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float multiplication")
+ (:note _N"inline complex float multiplication")
(:translate *)
(:temporary (:scs (,real-reg)) p1 p2)
(:generator ,cost
@@ -2210,7 +2211,7 @@
(:arg-types ,c-type ,r-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate *)
(:temporary (:scs (,real-sc-type)) temp)
(:generator ,cost
@@ -2233,7 +2234,7 @@
(:arg-types ,r-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate *)
(:temporary (:scs (,real-sc-type)) temp)
(:generator ,cost
@@ -2304,7 +2305,7 @@
(:arg-types ,c-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float division")
+ (:note _N"inline complex float division")
(:translate /)
(:temporary (:sc ,real-reg) ratio)
(:temporary (:sc ,real-reg) den)
@@ -2376,7 +2377,7 @@
(:arg-types ,c-type ,r-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate /)
(:temporary (:sc ,real-sc-type) tmp)
(:generator ,cost
@@ -2413,7 +2414,7 @@
(:arg-types ,r-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float division")
+ (:note _N"inline complex float division")
(:translate /)
(:temporary (:sc ,real-reg) ratio)
(:temporary (:sc ,real-reg) den)
@@ -2472,7 +2473,7 @@
(:arg-types ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex conjugate")
+ (:note _N"inline complex conjugate")
(:translate conjugate)
(:generator ,cost
(let ((xr (,real-part x))
@@ -2532,7 +2533,7 @@
(:conditional)
(:info target not-p)
(:policy :fast-safe)
- (:note "inline complex float/float comparison")
+ (:note _N"inline complex float/float comparison")
(:vop-var vop)
(:save-p :compute-only)
(:temporary (:sc ,real-reg) fp-zero)
@@ -2559,7 +2560,7 @@
(:conditional)
(:info target not-p)
(:policy :fast-safe)
- (:note "inline complex float/float comparison")
+ (:note _N"inline complex float/float comparison")
(:vop-var vop)
(:save-p :compute-only)
(:temporary (:sc ,real-reg) fp-zero)
@@ -2599,7 +2600,7 @@
(:conditional)
(:info target not-p)
(:policy :fast-safe)
- (:note "inline complex float comparison")
+ (:note _N"inline complex float comparison")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sparc-v9)))
@@ -2636,7 +2637,7 @@
(:conditional)
(:info target not-p)
(:policy :fast-safe)
- (:note "inline complex float comparison")
+ (:note _N"inline complex float comparison")
(:vop-var vop)
(:save-p :compute-only)
(:temporary (:sc descriptor-reg) true)
@@ -2736,13 +2737,13 @@
(inst ,cmov ,max r x ,cc)
(inst ,cmov ,min r y ,cc))))))))
(frob max single-reg single-float fcmps cfmovs 3
- :fcc0 :ge :l "inline float max")
+ :fcc0 :ge :l _N"inline float max")
(frob max double-reg double-float fcmpd cfmovd 3
- :fcc0 :ge :l "inline float max")
+ :fcc0 :ge :l _N"inline float max")
(frob min single-reg single-float fcmps cfmovs 3
- :fcc0 :l :ge "inline float min")
+ :fcc0 :l :ge _N"inline float min")
(frob min double-reg double-float fcmpd cfmovd 3
- :fcc0 :l :ge "inline float min")
+ :fcc0 :l :ge _N"inline float min")
;; Strictly speaking these aren't float ops, but it's convenient to
;; do them here.
;;
@@ -2750,21 +2751,21 @@
;; 32-bit integer operands, we add 2 more to account for the
;; untagging of fixnums, if necessary.
(frob max signed-reg signed-num cmp cmove 5
- :icc :ge :lt "inline (signed-byte 32) max")
+ :icc :ge :lt _N"inline (signed-byte 32) max")
(frob max unsigned-reg unsigned-num cmp cmove 5
- :icc :ge :lt "inline (unsigned-byte 32) max")
+ :icc :ge :lt _N"inline (unsigned-byte 32) max")
;; For fixnums, make the cost lower so we don't have to untag the
;; numbers.
(frob max any-reg tagged-num cmp cmove 3
- :icc :ge :lt "inline fixnum max")
+ :icc :ge :lt _N"inline fixnum max")
(frob min signed-reg signed-num cmp cmove 5
- :icc :lt :ge "inline (signed-byte 32) min")
+ :icc :lt :ge _N"inline (signed-byte 32) min")
(frob min unsigned-reg unsigned-num cmp cmove 5
- :icc :lt :ge "inline (unsigned-byte 32) min")
+ :icc :lt :ge _N"inline (unsigned-byte 32) min")
;; For fixnums, make the cost lower so we don't have to untag the
;; numbers.
(frob min any-reg tagged-num cmp cmove 3
- :icc :lt :ge "inline fixnum min"))
+ :icc :lt :ge _N"inline fixnum min"))
#+nil
(define-vop (max-boxed-double-float=>boxed-double-float)
@@ -2774,7 +2775,7 @@
(:arg-types double-float double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline float max/min")
+ (:note _N"inline float max/min")
(:translate %max-double-float)
(:temporary (:scs (double-reg)) xval)
(:temporary (:scs (double-reg)) yval)
@@ -2951,7 +2952,7 @@
(:args (x :scs (double-double-reg)
:target y :load-if (not (location= x y))))
(:results (y :scs (double-double-reg) :load-if (not (location= x y))))
- (:note "double-double float move")
+ (:note _N"double-double float move")
(:generator 0
(unless (location= x y)
;; Note the double-float-regs are aligned to every second
@@ -2973,7 +2974,7 @@
(:args (x :scs (double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (non-descriptor-reg)) ndescr)
- (:note "double-double float to pointer coercion")
+ (:note _N"double-double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y ndescr vm::double-double-float-type
vm::double-double-float-size))
@@ -2994,7 +2995,7 @@
(define-vop (move-to-double-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (double-double-reg)))
- (:note "pointer to double-double float coercion")
+ (:note _N"pointer to double-double float coercion")
(:generator 2
(let ((hi-tn (double-double-reg-hi-tn y)))
(inst lddf hi-tn x (- (* double-double-float-hi-slot word-bytes)
@@ -3012,7 +3013,7 @@
(:args (x :scs (double-double-reg) :target y)
(nfp :scs (any-reg) :load-if (not (sc-is y double-double-reg))))
(:results (y))
- (:note "double-double float argument move")
+ (:note _N"double-double float argument move")
(:generator 2
(sc-case y
(double-double-reg
@@ -3043,7 +3044,7 @@
(:arg-types double-float double-float)
(:result-types double-double-float)
(:translate kernel::%make-double-double-float)
- (:note "inline double-double float creation")
+ (:note _N"inline double-double float creation")
(:policy :fast-safe)
(:vop-var vop)
(:generator 5
@@ -3092,12 +3093,12 @@
(define-vop (hi/double-double-value double-double-float-value)
(:translate kernel::double-double-hi)
- (:note "double-double high part")
+ (:note _N"double-double high part")
(:variant :hi))
(define-vop (lo/double-double-value double-double-float-value)
(:translate kernel::double-double-lo)
- (:note "double-double low part")
+ (:note _N"double-double low part")
(:variant :lo))
@@ -3110,7 +3111,7 @@
(:results (r :scs (complex-double-double-reg) :from (:argument 0)
:load-if (not (sc-is r complex-double-double-stack))))
(:result-types complex-double-double-float)
- (:note "inline complex double-double float creation")
+ (:note _N"inline complex double-double float creation")
(:policy :fast-safe)
(:vop-var vop)
(:generator 5
@@ -3189,12 +3190,12 @@
(define-vop (realpart/complex-double-double-float complex-double-double-float-value)
(:translate realpart)
- (:note "complex double-double float realpart")
+ (:note _N"complex double-double float realpart")
(:variant :real))
(define-vop (imagpart/complex-double-double-float complex-double-double-float-value)
(:translate imagpart)
- (:note "complex double-double float imagpart")
+ (:note _N"complex double-double float imagpart")
(:variant :imag))
); progn
Index: src/compiler/sparc/insts.lisp
diff -u src/compiler/sparc/insts.lisp:1.53 src/compiler/sparc/insts.lisp:1.53.26.1
--- src/compiler/sparc/insts.lisp:1.53 Fri Jun 30 14:41:32 2006
+++ src/compiler/sparc/insts.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/insts.lisp,v 1.53 2006-06-30 18:41:32 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/insts.lisp,v 1.53.26.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -14,6 +14,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
(use-package "NEW-ASSEM")
(use-package "EXT")
@@ -34,12 +35,12 @@
(t
(if (eq (sb-name (sc-sb (tn-sc tn))) 'registers)
(tn-offset tn)
- (error "~S isn't a register." tn)))))
+ (error _"~S isn't a register." tn)))))
(defun fp-reg-tn-encoding (tn)
(declare (type tn tn))
(unless (eq (sb-name (sc-sb (tn-sc tn))) 'float-registers)
- (error "~S isn't a floating-point register." tn))
+ (error _"~S isn't a floating-point register." tn))
(let ((offset (tn-offset tn)))
(cond ((> offset 31)
;; Use the sparc v9 double float register encoding.
@@ -55,7 +56,7 @@
:opcode-column-width 11)
(defvar *disassem-use-lisp-reg-names* t
- "If non-NIL, print registers using the Lisp register names.
+ _N"If non-NIL, print registers using the Lisp register names.
Otherwise, use the Sparc register names")
(def-vm-support-routine location-number (loc)
@@ -101,7 +102,7 @@
(cond ((null name) nil)
(t (make-symbol (concatenate 'string "%" name)))))
sparc::*register-names*)
- "The Lisp names for the Sparc integer registers")
+ _N"The Lisp names for the Sparc integer registers")
(defparameter sparc-reg-symbols
(map 'vector
@@ -112,7 +113,7 @@
"O0" "O1" "O2" "O3" "O4" "O5" "O6" "O7"
"L0" "L1" "L2" "L3" "L4" "L5" "L6" "L7"
"I0" "I1" "I2" "I3" "I4" "I5" "I6" "I7"))
- "The standard names for the Sparc integer registers")
+ _N"The standard names for the Sparc integer registers")
(defun get-reg-name (index)
(if *disassem-use-lisp-reg-names*
@@ -120,7 +121,7 @@
(aref sparc-reg-symbols index)))
(defvar *note-sethi-inst* nil
- "An alist for the disassembler indicating the target register and
+ _N"An alist for the disassembler indicating the target register and
value used in a SETHI instruction. This is used to make annotations
about function addresses and register values.")
@@ -290,7 +291,7 @@
(= rd alloc-offset)
(not *pseudo-atomic-set*))
;; "ADD 4, %ALLOC" sets the flag
- (disassem:note "Set pseudo-atomic flag" dstate)
+ (disassem:note _"Set pseudo-atomic flag" dstate)
(setf *pseudo-atomic-set* t))
((= rd alloc-offset)
;; "ADD n, %ALLOC" is either allocating space or
@@ -298,17 +299,17 @@
(cond (immed-p
(cond ((= immed-val -4)
(disassem:note
- (format nil "Reset pseudo-atomic")
+ (format nil _"Reset pseudo-atomic")
dstate)
(setf *pseudo-atomic-set* nil))
(t
(disassem:note
- (format nil "Allocating ~D bytes" immed-val)
+ (format nil _"Allocating ~D bytes" immed-val)
dstate))))
(t
;; Some other allocation
(disassem:note
- (format nil "Allocating bytes")
+ (format nil _"Allocating bytes")
dstate))))))
((and (= rs1 zero-offset) *pseudo-atomic-set*)
;; "ADD %ZERO, num, RD" inside a pseudo-atomic is very
@@ -317,7 +318,7 @@
(let ((type (second (assoc (logand immed-val #xff) header-word-type-alist)))
(size (ldb (byte 24 8) immed-val)))
(when type
- (disassem:note (format nil "Header word ~A, size ~D?" type size)
+ (disassem:note (format nil _"Header word ~A, size ~D?" type size)
dstate)))))))
(defun handle-or-inst (rs1 immed-val rd dstate immed-p)
@@ -330,7 +331,7 @@
(= rd alloc-offset)
(not *pseudo-atomic-set*))
;; "OR 4, %ALLOC" sets the flag
- (disassem:note "Set pseudo-atomic flag" dstate)
+ (disassem:note _"Set pseudo-atomic flag" dstate)
(setf *pseudo-atomic-set* t))))))
(defun handle-andn-inst (rs1 immed-val rd dstate immed-p)
@@ -343,7 +344,7 @@
*pseudo-atomic-set*)
;; "ANDN 4, %ALLOC" resets the flag
;;(format t "Got reset~%")
- (disassem:note "Reset pseudo-atomic flag" dstate)
+ (disassem:note _"Reset pseudo-atomic flag" dstate)
(setf *pseudo-atomic-set* nil))))))
(defun handle-jmpl-inst (rs1 immed-val rd dstate)
@@ -383,7 +384,7 @@
(defun handle-andcc-inst (rs1 immed-val rd dstate)
;; ANDCC %ALLOC, 3, %ZERO instruction
(when (and (= rs1 alloc-offset) (= rd zero-offset) (= immed-val 3))
- (disassem:note "pseudo-atomic interrupted?" dstate)))
+ (disassem:note _"pseudo-atomic interrupted?" dstate)))
(eval-when (compile load eval)
(defun reg-arg-printer (value stream dstate)
@@ -455,7 +456,7 @@
(defun branch-condition (condition)
(or (position condition branch-conditions)
- (error "Unknown branch condition: ~S~%Must be one of: ~S"
+ (error _"Unknown branch condition: ~S~%Must be one of: ~S"
condition branch-conditions)))
(defconstant branch-cond-true
@@ -477,7 +478,7 @@
(defun fp-branch-condition (condition)
(or (position condition branch-fp-conditions)
- (error "Unknown fp-branch condition: ~S~%Must be one of: ~S"
+ (error _"Unknown fp-branch condition: ~S~%Must be one of: ~S"
condition branch-fp-conditions)))
@@ -546,12 +547,12 @@
(defun integer-condition (condition-reg)
(declare (type (member :icc :xcc) condition-reg))
(or (position condition-reg integer-condition-registers)
- (error "Unknown integer condition register: ~S~%"
+ (error _"Unknown integer condition register: ~S~%"
condition-reg)))
(defun branch-prediction (pred)
(or (position pred branch-predictions)
- (error "Unknown branch prediction: ~S~%Must be one of: ~S~%"
+ (error _"Unknown branch prediction: ~S~%Must be one of: ~S~%"
pred branch-predictions)))
(defconstant branch-pred-printer
@@ -766,12 +767,12 @@
(let ((posn (position condition-reg cond-move-condition-registers)))
(if posn
(truncate posn 4)
- (error "Unknown conditional move condition register: ~S~%"
+ (error _"Unknown conditional move condition register: ~S~%"
condition-reg))))
(defun cond-move-condition (condition-reg)
(or (position condition-reg cond-move-condition-registers)
- (error "Unknown conditional move condition register: ~S~%" condition-reg)))
+ (error _"Unknown conditional move condition register: ~S~%" condition-reg)))
(defconstant cond-move-printer
`(:name cond :tab
@@ -828,7 +829,7 @@
(defun register-condition (rcond)
(or (position rcond cond-move-integer-conditions)
- (error "Unknown register condition: ~S~%" rcond)))
+ (error _"Unknown register condition: ~S~%" rcond)))
(disassem:define-instruction-format
(format-4-cond-move-integer 32 :default-printer cond-move-integer-printer)
@@ -980,7 +981,7 @@
op3 (reg-tn-encoding src1) 1 src2))
(fixup
(unless (or load-store fixup)
- (error "Fixups aren't allowed."))
+ (error _"Fixups aren't allowed."))
(note-fixup segment :add src2)
(emit-format-3-immed segment op
(if dest-kind
@@ -1697,9 +1698,9 @@
(let ((*package* (find-package :vm)))
(case value
(#.pseudo-atomic-trap
- (disassem:note "Pseudo atomic interrupted trap?" dstate))
+ (disassem:note _"Pseudo atomic interrupted trap?" dstate))
(#.allocation-trap
- (disassem:note "Allocation trap" dstate)))
+ (disassem:note _"Allocation trap" dstate)))
(format stream "~A" value))))
;; The Sparc Compliance Definition 2.4.1 says only trap numbers 16-31
@@ -1741,8 +1742,8 @@
;; src2 shouldn't be given (or should be NIL) in this case.
(assert (null src2))
(unless (typep src1-or-imm '(integer 16 31))
- (cerror "Use it anyway"
- "Immediate trap number ~A specified, but only trap numbers
+ (cerror _"Use it anyway"
+ _"Immediate trap number ~A specified, but only trap numbers
16 to 31 are available to the application"
src1-or-imm))
(emit-format-4-trap segment
Index: src/compiler/sparc/macros.lisp
diff -u src/compiler/sparc/macros.lisp:1.34 src/compiler/sparc/macros.lisp:1.34.26.1
--- src/compiler/sparc/macros.lisp:1.34 Fri Jun 30 14:41:32 2006
+++ src/compiler/sparc/macros.lisp Fri Feb 26 16:36:21 2010
@@ -5,11 +5,11 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/macros.lisp,v 1.34 2006-06-30 18:41:32 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/macros.lisp,v 1.34.26.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
-;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/macros.lisp,v 1.34 2006-06-30 18:41:32 rtoy Rel $
+;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/macros.lisp,v 1.34.26.1 2010-02-26 21:36:21 rtoy Exp $
;;;
;;; This file contains various useful macros for generating SPARC code.
;;;
@@ -17,12 +17,13 @@
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;; Instruction-like macros.
(defmacro move (dst src)
- "Move SRC into DST unless they are location=."
+ _N"Move SRC into DST unless they are location=."
(once-only ((n-dst dst)
(n-src src))
`(unless (location= ,n-dst ,n-src)
@@ -108,7 +109,7 @@
(frob function))
(defmacro load-type (target source &optional (offset 0))
- "Loads the type bits of a pointer into target independent of
+ _N"Loads the type bits of a pointer into target independent of
byte-ordering issues."
(once-only ((n-target target)
(n-source source)
@@ -123,14 +124,14 @@
;;; return instructions.
(defmacro lisp-jump (function)
- "Jump to the lisp function FUNCTION. LIP is an interior-reg temporary."
+ _N"Jump to the lisp function FUNCTION. LIP is an interior-reg temporary."
`(progn
(inst j ,function
(- (ash function-code-offset word-shift) vm:function-pointer-type))
(move code-tn ,function)))
(defmacro lisp-return (return-pc &key (offset 0) (frob-code t))
- "Return to RETURN-PC."
+ _N"Return to RETURN-PC."
`(progn
(inst j ,return-pc
(- (* (1+ ,offset) word-bytes) other-pointer-type))
@@ -139,7 +140,7 @@
'(inst nop))))
(defmacro emit-return-pc (label)
- "Emit a return-pc header word. LABEL is the label to use for this return-pc."
+ _N"Emit a return-pc header word. LABEL is the label to use for this return-pc."
`(progn
(align lowtag-bits)
(emit-label ,label)
@@ -173,7 +174,7 @@
;;; MAYBE-LOAD-STACK-TN -- Interface
;;;
(defmacro maybe-load-stack-tn (reg reg-or-stack)
- "Move the TN Reg-Or-Stack into Reg if it isn't already there."
+ _N"Move the TN Reg-Or-Stack into Reg if it isn't already there."
(once-only ((n-reg reg)
(n-stack reg-or-stack))
`(sc-case ,n-reg
@@ -294,7 +295,7 @@
&key (lowtag other-pointer-type)
stack-p)
&body body)
- "Do stuff to allocate an other-pointer object of fixed Size with a single
+ _N"Do stuff to allocate an other-pointer object of fixed Size with a single
word header having the specified Type-Code. The result is placed in
Result-TN, and Temp-TN is a non-descriptor temp (which may be randomly used
by the body.) The body is placed inside the PSEUDO-ATOMIC, and presumably
@@ -335,13 +336,13 @@
(push (cons start end) tests))))
(dolist (value values)
(cond ((< value min)
- (error "~S is less than the specified minimum of ~S"
+ (error _"~S is less than the specified minimum of ~S"
value min))
((> value max)
- (error "~S is greater than the specified maximum of ~S"
+ (error _"~S is greater than the specified maximum of ~S"
value max))
((not (zerop (rem (- value min) seperation)))
- (error "~S isn't an even multiple of ~S from ~S"
+ (error _"~S isn't an even multiple of ~S from ~S"
value seperation min))
((null start)
(setf start value))
@@ -365,7 +366,7 @@
(let ((start (car test))
(end (cdr test)))
(cond ((and (= start min) (= end max))
- (warn "The values ~S cover the entire range from ~
+ (warn _"The values ~S cover the entire range from ~
~S to ~S [step ~S]."
values min max seperation)
(push `(unless ,not-p (inst b ,target)) insts))
@@ -467,18 +468,18 @@
(headers (set-difference extended immediate-types :test #'eql))
(function-p nil))
(unless type-codes
- (error "Must supply at least on type for test-type."))
+ (error _"Must supply at least on type for test-type."))
(when (and headers (member other-pointer-type lowtags))
- (warn "OTHER-POINTER-TYPE supersedes the use of ~S" headers)
+ (warn _"OTHER-POINTER-TYPE supersedes the use of ~S" headers)
(setf headers nil))
(when (and immediates
(or (member other-immediate-0-type lowtags)
(member other-immediate-1-type lowtags)))
- (warn "OTHER-IMMEDIATE-n-TYPE supersedes the use of ~S" immediates)
+ (warn _"OTHER-IMMEDIATE-n-TYPE supersedes the use of ~S" immediates)
(setf immediates nil))
(when (intersection headers function-subtypes)
(unless (subsetp headers function-subtypes)
- (error "Can't test for mix of function subtypes and normal ~
+ (error _"Can't test for mix of function subtypes and normal ~
header types."))
(setq function-p t))
@@ -545,20 +546,20 @@
(align word-shift)))))
(defmacro error-call (vop error-code &rest values)
- "Cause an error. ERROR-CODE is the error to cause."
+ _N"Cause an error. ERROR-CODE is the error to cause."
(cons 'progn
(emit-error-break vop error-trap error-code values)))
(defmacro cerror-call (vop label error-code &rest values)
- "Cause a continuable error. If the error is continued, execution resumes at
+ _N"Cause a continuable error. If the error is continued, execution resumes at
LABEL."
`(progn
(inst b ,label)
,@(emit-error-break vop cerror-trap error-code values)))
(defmacro generate-error-code (vop error-code &rest values)
- "Generate-Error-Code Error-code Value*
+ _N"Generate-Error-Code Error-code Value*
Emit code for an error with the specified Error-Code and context Values."
`(assemble (*elsewhere*)
(let ((start-lab (gen-label)))
@@ -567,7 +568,7 @@
start-lab)))
(defmacro generate-cerror-code (vop error-code &rest values)
- "Generate-CError-Code Error-code Value*
+ _N"Generate-CError-Code Error-code Value*
Emit code for a continuable error with the specified Error-Code and
context Values. If the error is continued, execution resumes after
the GENERATE-CERROR-CODE form."
Index: src/compiler/sparc/move.lisp
diff -u src/compiler/sparc/move.lisp:1.15 src/compiler/sparc/move.lisp:1.15.38.1
--- src/compiler/sparc/move.lisp:1.15 Thu May 13 10:37:06 2004
+++ src/compiler/sparc/move.lisp Fri Feb 26 16:36:21 2010
@@ -5,11 +5,11 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/move.lisp,v 1.15 2004-05-13 14:37:06 rtoy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/move.lisp,v 1.15.38.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
-;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/move.lisp,v 1.15 2004-05-13 14:37:06 rtoy Rel $
+;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/move.lisp,v 1.15.38.1 2010-02-26 21:36:21 rtoy Exp $
;;;
;;; This file contains the SPARC VM definition of operand loading/saving and
;;; the Move VOP.
@@ -18,6 +18,7 @@
;;; SPARC conversion by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
(define-move-function (load-immediate 1) (vop x y)
@@ -162,7 +163,7 @@
(:args (x :scs (any-reg descriptor-reg)))
(:results (y :scs (signed-reg unsigned-reg)))
(:arg-types tagged-num)
- (:note "fixnum untagging")
+ (:note _N"fixnum untagging")
(:generator 1
(inst sran y x fixnum-tag-bits)))
@@ -174,7 +175,7 @@
(define-vop (move-to-word-c)
(:args (x :scs (constant)))
(:results (y :scs (signed-reg unsigned-reg)))
- (:note "constant load")
+ (:note _N"constant load")
(:generator 1
(inst li y (tn-value x))))
@@ -187,7 +188,7 @@
(define-vop (move-to-word/integer)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (signed-reg unsigned-reg)))
- (:note "integer to untagged word coercion")
+ (:note _N"integer to untagged word coercion")
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 4
(let ((done (gen-label)))
@@ -205,7 +206,7 @@
(define-vop (move-to-word/integer)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (signed-reg unsigned-reg)))
- (:note "integer to untagged word coercion")
+ (:note _N"integer to untagged word coercion")
(:temporary (:scs (non-descriptor-reg)) temp)
(:generator 4
(let ((done (gen-label)))
@@ -231,7 +232,7 @@
(:args (x :scs (signed-reg unsigned-reg)))
(:results (y :scs (any-reg descriptor-reg)))
(:result-types tagged-num)
- (:note "fixnum tagging")
+ (:note _N"fixnum tagging")
(:generator 1
(inst slln y x fixnum-tag-bits)))
;;;
@@ -246,7 +247,7 @@
(:args (arg :scs (signed-reg unsigned-reg) :target x))
(:results (y :scs (any-reg descriptor-reg)))
(:temporary (:scs (non-descriptor-reg) :from (:argument 0)) x temp)
- (:note "signed word to integer coercion")
+ (:note _N"signed word to integer coercion")
(:generator 20
(move x arg)
(let ((done (gen-label)))
@@ -284,7 +285,7 @@
(:args (arg :scs (signed-reg unsigned-reg) :target x))
(:results (y :scs (any-reg descriptor-reg)))
(:temporary (:scs (non-descriptor-reg) :from (:argument 0)) x temp)
- (:note "unsigned word to integer coercion")
+ (:note _N"unsigned word to integer coercion")
(:generator 20
(move x arg)
(let ((done (gen-label))
@@ -315,7 +316,7 @@
(:args (arg :scs (signed-reg unsigned-reg) :target x))
(:results (y :scs (any-reg descriptor-reg)))
(:temporary (:scs (non-descriptor-reg) :from (:argument 0)) x temp)
- (:note "unsigned word to integer coercion")
+ (:note _N"unsigned word to integer coercion")
(:generator 20
(move x arg)
(let ((done (gen-label)))
@@ -351,7 +352,7 @@
:load-if (not (location= x y))))
(:effects)
(:affected)
- (:note "word integer move")
+ (:note _N"word integer move")
(:generator 0
(move y x)))
;;;
@@ -367,7 +368,7 @@
:load-if (not (sc-is y sap-reg))))
(:results (y))
(:temporary (:scs (non-descriptor-reg)) temp)
- (:note "word integer argument move")
+ (:note _N"word integer argument move")
(:generator 0
(sc-case y
((signed-reg unsigned-reg)
@@ -421,7 +422,7 @@
(:args (x :scs (any-reg descriptor-reg)))
(:results (y :scs (signed64-reg unsigned64-reg)))
(:arg-types tagged-num)
- (:note "fixnum untagging")
+ (:note _N"fixnum untagging")
(:generator 0
;; Sign-extend the fixnum and then remove the tag. (Can't just
;; remove the tag because we don't know for sure if X has been
@@ -436,7 +437,7 @@
(define-vop (move-to-64bit-word-c)
(:args (x :scs (constant)))
(:results (y :scs (signed64-reg unsigned64-reg)))
- (:note "constant load")
+ (:note _N"constant load")
(:generator 1
(inst li64 y (tn-value x))))
@@ -447,7 +448,7 @@
(define-vop (move-to-64bit-word/integer)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (signed64-reg)))
- (:note "integer to untagged word coercion")
+ (:note _N"integer to untagged word coercion")
(:temporary (:scs (signed64-reg)) temp)
(:generator 4
(let ((done (gen-label)))
@@ -517,7 +518,7 @@
(:args (arg :scs (signed64-reg) :target x))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (signed64-reg) :from (:argument 0)) x temp)
- (:note "signed 64-bit word to integer coercion")
+ (:note _N"signed 64-bit word to integer coercion")
(:generator 20
(move x arg)
(let ((fixnum (gen-label))
@@ -557,7 +558,7 @@
(:args (arg :scs (unsigned64-reg) :target x))
(:results (y :scs (descriptor-reg)))
(:temporary (:scs (unsigned64-reg) :from (:argument 0)) x temp)
- (:note "unsigned 64-bit word to integer coercion")
+ (:note _N"unsigned 64-bit word to integer coercion")
(:generator 20
(move x arg)
(let ((two-words (gen-label))
@@ -596,7 +597,7 @@
(define-vop (move-to-unsigned-64bit-word/integer)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (unsigned64-reg)))
- (:note "integer to untagged word coercion")
+ (:note _N"integer to untagged word coercion")
(:temporary (:scs (unsigned64-reg)) temp)
(:generator 4
(let ((done (gen-label)))
@@ -643,7 +644,7 @@
:load-if (not (location= x y))))
(:effects)
(:affected)
- (:note "word integer move")
+ (:note _N"word integer move")
(:generator 0
(move y x)))
@@ -657,7 +658,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y sap-reg))))
(:results (y))
- (:note "word integer argument move")
+ (:note _N"word integer argument move")
(:generator 0
(sc-case y
((signed64-reg unsigned64-reg)
Index: src/compiler/sparc/parms.lisp
diff -u src/compiler/sparc/parms.lisp:1.59 src/compiler/sparc/parms.lisp:1.59.2.1
--- src/compiler/sparc/parms.lisp:1.59 Tue Nov 24 19:04:40 2009
+++ src/compiler/sparc/parms.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/parms.lisp,v 1.59 2009-11-25 00:04:40 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/parms.lisp,v 1.59.2.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -19,6 +19,7 @@
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
(use-package "C")
@@ -86,41 +87,41 @@
(eval-when (compile load eval)
(defconstant word-bits 32
- "Number of bits per word where a word holds one lisp descriptor.")
+ _N"Number of bits per word where a word holds one lisp descriptor.")
(defconstant byte-bits 8
- "Number of bits per byte where a byte is the smallest addressable object.")
+ _N"Number of bits per byte where a byte is the smallest addressable object.")
(defconstant char-bits #-unicode 8 #+unicode 16
- "Number of bits needed to represent a character")
+ _N"Number of bits needed to represent a character")
(defconstant char-bytes (truncate char-bits byte-bits)
- "Number of bytes needed to represent a character")
+ _N"Number of bytes needed to represent a character")
(defconstant word-shift (1- (integer-length (/ word-bits byte-bits)))
- "Number of bits to shift between word addresses and byte addresses.")
+ _N"Number of bits to shift between word addresses and byte addresses.")
(defconstant word-bytes (/ word-bits byte-bits)
- "Number of bytes in a word.")
+ _N"Number of bytes in a word.")
(defconstant lowtag-bits 3
- "Number of bits at the low end of a pointer used for type information.")
+ _N"Number of bits at the low end of a pointer used for type information.")
(defconstant lowtag-mask (1- (ash 1 lowtag-bits))
- "Mask to extract the low tag bits from a pointer.")
+ _N"Mask to extract the low tag bits from a pointer.")
(defconstant lowtag-limit (ash 1 lowtag-bits)
- "Exclusive upper bound on the value of the low tag bits from a
+ _N"Exclusive upper bound on the value of the low tag bits from a
pointer.")
(defconstant fixnum-tag-bits (1- lowtag-bits)
- "Number of tag bits used for a fixnum")
+ _N"Number of tag bits used for a fixnum")
(defconstant fixnum-tag-mask (1- (ash 1 fixnum-tag-bits))
- "Mask to get the fixnum tag")
+ _N"Mask to get the fixnum tag")
(defconstant positive-fixnum-bits (- word-bits fixnum-tag-bits 1)
- "Maximum number of bits in a positive fixnum")
+ _N"Maximum number of bits in a positive fixnum")
(defconstant float-sign-shift 31)
Index: src/compiler/sparc/sap.lisp
diff -u src/compiler/sparc/sap.lisp:1.10 src/compiler/sparc/sap.lisp:1.10.54.1
--- src/compiler/sparc/sap.lisp:1.10 Sat Aug 12 03:33:42 2000
+++ src/compiler/sparc/sap.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/sap.lisp,v 1.10 2000-08-12 07:33:42 dtc Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/sap.lisp,v 1.10.54.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -14,6 +14,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
;;;; Moves and coercions:
@@ -23,7 +24,7 @@
(define-vop (move-to-sap)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (sap-reg)))
- (:note "pointer to SAP coercion")
+ (:note _N"pointer to SAP coercion")
(:generator 1
(loadw y x sap-pointer-slot other-pointer-type)))
@@ -38,7 +39,7 @@
(:args (sap :scs (sap-reg) :to :save))
(:temporary (:scs (non-descriptor-reg)) ndescr)
(:results (res :scs (descriptor-reg)))
- (:note "SAP to pointer coercion")
+ (:note _N"SAP to pointer coercion")
(:generator 20
(with-fixed-allocation (res ndescr sap-type sap-size)
(storew sap res sap-pointer-slot other-pointer-type))))
@@ -55,7 +56,7 @@
:load-if (not (location= x y))))
(:results (y :scs (sap-reg)
:load-if (not (location= x y))))
- (:note "SAP move")
+ (:note _N"SAP move")
(:effects)
(:affected)
(:generator 0
@@ -73,7 +74,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y sap-reg))))
(:results (y))
- (:note "SAP argument move")
+ (:note _N"SAP argument move")
(:generator 0
(sc-case y
(sap-reg
Index: src/compiler/sparc/static-fn.lisp
diff -u src/compiler/sparc/static-fn.lisp:1.7 src/compiler/sparc/static-fn.lisp:1.7.42.1
--- src/compiler/sparc/static-fn.lisp:1.7 Mon Oct 27 13:30:27 2003
+++ src/compiler/sparc/static-fn.lisp Fri Feb 26 16:36:21 2010
@@ -5,11 +5,11 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.7 2003-10-27 18:30:27 toy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.7.42.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
-;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.7 2003-10-27 18:30:27 toy Rel $
+;;; $Header: /project/cmucl/cvsroot/src/compiler/sparc/static-fn.lisp,v 1.7.42.1 2010-02-26 21:36:21 rtoy Exp $
;;;
;;; This file contains the VOPs and macro magic necessary to call static
;;; functions.
@@ -17,6 +17,7 @@
;;; Written by William Lott.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
@@ -54,7 +55,7 @@
(assert (and (<= num-args register-arg-count)
(<= num-results register-arg-count))
(num-args num-results)
- "Either too many args (~D) or too many results (~D). Max = ~D"
+ _"Either too many args (~D) or too many results (~D). Max = ~D"
num-args num-results register-arg-count)
(let ((num-temps (max num-args num-results)))
(collect ((temp-names) (temps) (arg-names) (args) (result-names) (results))
Index: src/compiler/sparc/system.lisp
diff -u src/compiler/sparc/system.lisp:1.17 src/compiler/sparc/system.lisp:1.17.42.1
--- src/compiler/sparc/system.lisp:1.17 Thu Jan 15 22:24:49 2004
+++ src/compiler/sparc/system.lisp Fri Feb 26 16:36:21 2010
@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/sparc/system.lisp,v 1.17 2004-01-16 03:24:49 toy Rel $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/sparc/system.lisp,v 1.17.42.1 2010-02-26 21:36:21 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -16,6 +16,7 @@
;;; Mips conversion by William Lott and Christopher Hoover.
;;;
(in-package "SPARC")
+(intl:textdomain "cmucl-sparc-vm")
@@ -279,7 +280,7 @@
#+sparc-v9
(defun read-cycle-counter ()
- "Read the instruction cycle counter available on UltraSparcs. The
+ _N"Read the instruction cycle counter available on UltraSparcs. The
64-bit counter is returned as two 32-bit unsigned integers. The low 32-bit
result is the first value."
(read-cycle-counter))
More information about the cmucl-commit
mailing list