CMUCL commit: intl-branch src/compiler/x86 (14 files)
Raymond Toy
rtoy at common-lisp.net
Fri Feb 26 16:44:30 CET 2010
Date: Friday, February 26, 2010 @ 10:44:30
Author: rtoy
Path: /project/cmucl/cvsroot/src/compiler/x86
Tag: intl-branch
Modified: alloc.lisp arith.lisp array.lisp c-call.lisp call.lisp cell.lisp
char.lisp debug.lisp float-sse2.lisp float.lisp insts.lisp
macros.lisp memory.lisp move.lisp
o Put these in the cmucl-x86-vm text domain.
o Mark the notes as translatable.
-----------------+
alloc.lisp | 4 -
arith.lisp | 86 +++++++++++------------
array.lisp | 8 +-
c-call.lisp | 8 +-
call.lisp | 6 -
cell.lisp | 4 -
char.lisp | 16 ++--
debug.lisp | 4 -
float-sse2.lisp | 106 ++++++++++++++---------------
float.lisp | 194 +++++++++++++++++++++++++++---------------------------
insts.lisp | 4 -
macros.lisp | 20 ++---
memory.lisp | 4 -
move.lisp | 24 +++---
14 files changed, 244 insertions(+), 244 deletions(-)
Index: src/compiler/x86/alloc.lisp
diff -u src/compiler/x86/alloc.lisp:1.13.36.1 src/compiler/x86/alloc.lisp:1.13.36.2
--- src/compiler/x86/alloc.lisp:1.13.36.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/alloc.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/alloc.lisp,v 1.13.36.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/alloc.lisp,v 1.13.36.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -20,7 +20,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;; Dynamic-Extent
Index: src/compiler/x86/arith.lisp
diff -u src/compiler/x86/arith.lisp:1.22.18.1 src/compiler/x86/arith.lisp:1.22.18.2
--- src/compiler/x86/arith.lisp:1.22.18.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/arith.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/arith.lisp,v 1.22.18.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/arith.lisp,v 1.22.18.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -20,7 +20,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;; Unary operations.
@@ -34,14 +34,14 @@
(define-vop (fixnum-unop fast-safe-arith-op)
(:args (x :scs (any-reg) :target res))
(: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) :target res))
(: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))
@@ -89,7 +89,7 @@
(sc-is r control-stack)
(location= x r)))))
(: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)
@@ -105,7 +105,7 @@
(sc-is r unsigned-stack)
(location= x r)))))
(: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)
@@ -121,7 +121,7 @@
(sc-is r signed-stack)
(location= x r)))))
(: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 control-stack)))
@@ -130,7 +130,7 @@
(:results (r :scs (any-reg)
:load-if (not (location= x r))))
(: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 unsigned-stack)))
@@ -139,7 +139,7 @@
(:results (r :scs (unsigned-reg)
:load-if (not (location= x r))))
(: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 signed-stack)))
@@ -148,7 +148,7 @@
(:results (r :scs (signed-reg)
:load-if (not (location= x r))))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic"))
+ (:note _N"inline (signed-byte 32) arithmetic"))
(eval-when (compile load eval)
@@ -220,7 +220,7 @@
(sc-is r control-stack)
(location= x r)))))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:generator 2
(cond ((and (sc-is x any-reg) (sc-is y any-reg) (sc-is r any-reg)
(not (location= x r)))
@@ -237,7 +237,7 @@
(:results (r :scs (any-reg)
:load-if (not (location= x r))))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:generator 1
(cond ((and (sc-is x any-reg) (sc-is r any-reg) (not (location= x r)))
(inst lea r (make-ea :dword :base x :disp (fixnumize y))))
@@ -259,7 +259,7 @@
(sc-is y signed-reg)
(location= x r)))))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:generator 5
(cond ((and (sc-is x signed-reg) (sc-is y signed-reg) (sc-is r signed-reg)
(not (location= x r)))
@@ -276,7 +276,7 @@
(:results (r :scs (signed-reg)
:load-if (not (location= x r))))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:generator 4
(cond ((and (sc-is x signed-reg) (sc-is r signed-reg)
(not (location= x r)))
@@ -302,7 +302,7 @@
(sc-is r unsigned-stack)
(location= x r)))))
(:result-types unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:generator 5
(cond ((and (sc-is x unsigned-reg) (sc-is y unsigned-reg)
(sc-is r unsigned-reg) (not (location= x r)))
@@ -319,7 +319,7 @@
(:results (r :scs (unsigned-reg)
:load-if (not (location= x r))))
(:result-types unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:generator 4
(cond ((and (sc-is x unsigned-reg)
(sc-is r unsigned-reg)
@@ -371,7 +371,7 @@
(:arg-types tagged-num tagged-num)
(:results (r :scs (any-reg) :from (:argument 0)))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:generator 4
(move r x)
(inst sar r 2)
@@ -385,7 +385,7 @@
(:arg-types tagged-num (:constant (signed-byte 30)))
(:results (r :scs (any-reg)))
(:result-types tagged-num)
- (:note "inline fixnum arithmetic")
+ (:note _N"inline fixnum arithmetic")
(:generator 3
(inst imul r x y)))
@@ -397,7 +397,7 @@
(:arg-types signed-num signed-num)
(:results (r :scs (signed-reg) :from (:argument 0)))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:generator 5
(move r x)
(inst imul r y)))
@@ -410,7 +410,7 @@
(:arg-types signed-num (:constant (signed-byte 32)))
(:results (r :scs (signed-reg)))
(:result-types signed-num)
- (:note "inline (signed-byte 32) arithmetic")
+ (:note _N"inline (signed-byte 32) arithmetic")
(:generator 4
(inst imul r x y)))
@@ -426,7 +426,7 @@
(:ignore edx)
(:results (result :scs (unsigned-reg)))
(:result-types unsigned-num)
- (:note "inline (unsigned-byte 32) arithmetic")
+ (:note _N"inline (unsigned-byte 32) arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 6
@@ -447,7 +447,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 31
@@ -477,7 +477,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 30
@@ -502,7 +502,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 33
@@ -530,7 +530,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 32
@@ -553,7 +553,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 33
@@ -581,7 +581,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")
(:vop-var vop)
(:save-p :compute-only)
(:generator 32
@@ -609,7 +609,7 @@
(sc-is result control-stack)
(location= number result)))))
(:result-types tagged-num)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 2
(cond ((and (= amount 1) (not (location= number result)))
(inst lea result (make-ea :dword :index number :scale 2)))
@@ -646,7 +646,7 @@
(location= number result)))))
(:result-types tagged-num)
(:policy :fast-safe)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 3
(move result number)
(move ecx amount)
@@ -667,7 +667,7 @@
(sc-is result unsigned-stack)
(location= number result)))))
(:result-types unsigned-num)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 3
(cond ((and (= amount 1) (not (location= number result)))
(inst lea result (make-ea :dword :index number :scale 2)))
@@ -700,7 +700,7 @@
(sc-is result signed-stack)
(location= number result)))))
(:result-types signed-num)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 3
(cond ((and (= amount 1) (not (location= number result)))
(inst lea result (make-ea :dword :index number :scale 2)))
@@ -735,7 +735,7 @@
(location= number result)))))
(:result-types unsigned-num)
(:policy :fast-safe)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 4
(move result number)
(move ecx amount)
@@ -757,7 +757,7 @@
(location= number result)))))
(:result-types signed-num)
(:policy :fast-safe)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 4
(move result number)
(move ecx amount)
@@ -773,7 +773,7 @@
(:results (result :scs (unsigned-reg) :from (:argument 0)))
(:result-types unsigned-num)
(:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 5
(move result number)
(move ecx amount)
@@ -803,7 +803,7 @@
(:results (result :scs (signed-reg) :from (:argument 0)))
(:result-types signed-num)
(:temporary (:sc signed-reg :offset ecx-offset :from (:argument 1)) ecx)
- (:note "inline ASH")
+ (:note _N"inline ASH")
(:generator 5
(move result number)
(move ecx amount)
@@ -827,7 +827,7 @@
;;; note documentation for this function is wrong - rtfm
(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 res))
(:arg-types signed-num)
@@ -850,7 +850,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)
@@ -907,7 +907,7 @@
(sc-is y any-reg))))
(y :scs (any-reg control-stack)))
(: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 control-stack)))
@@ -920,7 +920,7 @@
(sc-is y signed-reg))))
(y :scs (signed-reg signed-stack)))
(: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 signed-stack)))
@@ -933,7 +933,7 @@
(sc-is y unsigned-reg))))
(y :scs (unsigned-reg unsigned-stack)))
(: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 unsigned-stack)))
@@ -1012,7 +1012,7 @@
(sc-is y any-reg))))
(y :scs (any-reg control-stack)))
(:arg-types tagged-num tagged-num)
- (:note "inline fixnum comparison")
+ (:note _N"inline fixnum comparison")
(:translate eql)
(:generator 4
(inst cmp x y)
@@ -1147,7 +1147,7 @@
(define-vop (shift-towards-start shift-towards-someplace)
(:translate shift-towards-start)
- (:note "SHIFT-TOWARDS-START")
+ (:note _N"SHIFT-TOWARDS-START")
(:generator 1
(move r num)
(move ecx amount)
@@ -1155,7 +1155,7 @@
(define-vop (shift-towards-end shift-towards-someplace)
(:translate shift-towards-end)
- (:note "SHIFT-TOWARDS-END")
+ (:note _N"SHIFT-TOWARDS-END")
(:generator 1
(move r num)
(move ecx amount)
Index: src/compiler/x86/array.lisp
diff -u src/compiler/x86/array.lisp:1.25.12.1 src/compiler/x86/array.lisp:1.25.12.2
--- src/compiler/x86/array.lisp:1.25.12.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/array.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/array.lisp,v 1.25.12.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/array.lisp,v 1.25.12.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -19,7 +19,7 @@
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997,1998,1999.
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;; Allocator for the array header.
@@ -179,7 +179,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))
@@ -218,7 +218,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) :target ptr)
Index: src/compiler/x86/c-call.lisp
diff -u src/compiler/x86/c-call.lisp:1.20.14.1 src/compiler/x86/c-call.lisp:1.20.14.2
--- src/compiler/x86/c-call.lisp:1.20.14.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/c-call.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/c-call.lisp,v 1.20.14.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/c-call.lisp,v 1.20.14.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -23,7 +23,7 @@
(in-package :x86)
(use-package :alien)
(use-package :alien-internals)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;; The move-argument vop is going to store args on the stack for
;; call-out. These tn's will be used for that. move-arg is normally
@@ -122,7 +122,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))
(alien-values-type-values type))))
@@ -267,7 +267,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))
(segment (make-segment))
Index: src/compiler/x86/call.lisp
diff -u src/compiler/x86/call.lisp:1.21.22.1 src/compiler/x86/call.lisp:1.21.22.2
--- src/compiler/x86/call.lisp:1.21.22.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/call.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/call.lisp,v 1.21.22.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/call.lisp,v 1.21.22.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -19,7 +19,7 @@
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997.
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;
@@ -1422,7 +1422,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
(move count supplied)
;; SP at this point points at the last arg pushed.
Index: src/compiler/x86/cell.lisp
diff -u src/compiler/x86/cell.lisp:1.15.38.1 src/compiler/x86/cell.lisp:1.15.38.2
--- src/compiler/x86/cell.lisp:1.15.38.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/cell.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/cell.lisp,v 1.15.38.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/cell.lisp,v 1.15.38.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -21,7 +21,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;; Data object ref/set stuff.
Index: src/compiler/x86/char.lisp
diff -u src/compiler/x86/char.lisp:1.8.22.1 src/compiler/x86/char.lisp:1.8.22.2
--- src/compiler/x86/char.lisp:1.8.22.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/char.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/char.lisp,v 1.8.22.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/char.lisp,v 1.8.22.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -23,7 +23,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;;; Moves and coercions:
@@ -33,7 +33,7 @@
(define-vop (move-to-base-char)
(:args (x :scs (any-reg control-stack) :target y))
(:results (y :scs (base-char-reg)))
- (:note "character untagging")
+ (:note _N"character untagging")
(:generator 1
(move y x)
(inst shr y type-bits)))
@@ -47,7 +47,7 @@
(define-vop (move-from-base-char)
(:args (x :scs (base-char-reg base-char-stack) :target y))
(:results (y :scs (any-reg descriptor-reg)))
- (:note "character tagging")
+ (:note _N"character tagging")
(:generator 1
(move y x)
(inst shl y type-bits)
@@ -65,7 +65,7 @@
:load-if (not (location= x y))))
(:results (y :scs (base-char-reg base-char-stack)
:load-if (not (location= x y))))
- (:note "character move")
+ (:note _N"character move")
(:effects)
(:affected)
(:generator 0
@@ -83,7 +83,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y base-char-reg))))
(:results (y))
- (:note "character arg move")
+ (:note _N"character arg move")
(:generator 0
(sc-case y
(base-char-reg
@@ -137,7 +137,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)
@@ -161,7 +161,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/x86/debug.lisp
diff -u src/compiler/x86/debug.lisp:1.4.54.1 src/compiler/x86/debug.lisp:1.4.54.2
--- src/compiler/x86/debug.lisp:1.4.54.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/debug.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/debug.lisp,v 1.4.54.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/debug.lisp,v 1.4.54.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -19,7 +19,7 @@
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997.
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
(define-vop (debug-cur-sp)
(:translate current-sp)
Index: src/compiler/x86/float-sse2.lisp
diff -u src/compiler/x86/float-sse2.lisp:1.10.4.2 src/compiler/x86/float-sse2.lisp:1.10.4.3
--- src/compiler/x86/float-sse2.lisp:1.10.4.2 Wed Feb 24 19:33:12 2010
+++ src/compiler/x86/float-sse2.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/float-sse2.lisp,v 1.10.4.2 2010-02-25 00:33:12 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/float-sse2.lisp,v 1.10.4.3 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -15,7 +15,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;; Popping the FP stack.
;;;
@@ -184,7 +184,7 @@
(single-reg (inst xorps y y))
(double-reg (inst xorpd y y))))
(t
- (warn "Ignoring bogus i387 Constant ~a" value)))))
+ (warn _"Ignoring bogus i387 Constant ~a" value)))))
;;;; Complex float move functions
@@ -304,7 +304,7 @@
(define-vop (float-move)
(:args (x))
(:results (y))
- (:note "float move")
+ (:note _N"float move")
(:generator 0
(unless (location= x y)
(inst movq y x))))
@@ -371,7 +371,7 @@
(:args (x :scs (single-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:single-float-type vm:single-float-size node)
(inst movss (ea-for-sf-desc y) x))))
@@ -382,7 +382,7 @@
(:args (x :scs (double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:double-float-type vm:double-float-size node)
(inst movsd (ea-for-df-desc y) x))))
@@ -394,7 +394,7 @@
(:args (x :scs (long-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:long-float-type vm:long-float-size node)
(with-tn at fp-top(x)
@@ -423,7 +423,7 @@
(define-vop (move-to-single)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (single-reg)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(inst movss y (ea-for-sf-desc x))))
(define-move-vop move-to-single :move (descriptor-reg) (single-reg))
@@ -431,7 +431,7 @@
(define-vop (move-to-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (double-reg)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(inst movsd y (ea-for-df-desc x))))
(define-move-vop move-to-double :move (descriptor-reg) (double-reg))
@@ -440,7 +440,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
(with-empty-tn at fp-top(y)
(inst fldl (ea-for-lf-desc x)))))
@@ -456,7 +456,7 @@
(:args (x :scs (complex-single-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-single-float-type
vm:complex-single-float-size node)
@@ -468,7 +468,7 @@
(:args (x :scs (complex-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-double-float-type
vm:complex-double-float-size node)
@@ -482,7 +482,7 @@
(:args (x :scs (complex-long-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-long-float-type
vm:complex-long-float-size node)
@@ -501,7 +501,7 @@
(:args (x :scs (complex-double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex double-double float to pointer coercion")
+ (:note _N"complex double-double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm::complex-double-double-float-type
vm::complex-double-double-float-size node)
@@ -523,7 +523,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
(inst movlps y (ea-for-csf-real-desc x))))
@@ -533,7 +533,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
(inst movupd y (ea-for-cdf-real-desc x))))
@@ -555,7 +555,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y ,sc))))
(:results (y))
- (:note "float argument move")
+ (:note _N"float argument move")
(:generator ,(case format (:single 2) (:double 3) (:long 4))
(sc-case y
(,sc
@@ -590,7 +590,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y complex-single-reg))))
(:results (y))
- (:note "complex float argument move")
+ (:note _N"complex float argument move")
(:generator 3
(sc-case y
(complex-single-reg
@@ -607,7 +607,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y complex-double-reg))))
(:results (y))
- (:note "complex float argument move")
+ (:note _N"complex float argument move")
(:generator 3
(sc-case y
(complex-double-reg
@@ -624,7 +624,7 @@
(:args (x :scs (complex-double-double-reg) :target y)
(fp :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
@@ -701,7 +701,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))
@@ -753,7 +753,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
@@ -769,7 +769,7 @@
(:arg-types ,type)
(:result-types ,type)
(:temporary (:sc ,sc) tmp)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -817,7 +817,7 @@
(:policy :fast-safe)
(:vop-var vop)
(:save-p :compute-only)
- (:note "inline float comparison"))
+ (:note _N"inline float comparison"))
;;; comiss and comisd can cope with one or other arg in memory: we
;;; could (should, indeed) extend these to cope with descriptor args
@@ -934,7 +934,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)
@@ -957,7 +957,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)
@@ -980,7 +980,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
@@ -1307,7 +1307,7 @@
:load-if (not (sc-is r complex-single-stack))))
(:result-types complex-single-float)
(:temporary (:sc complex-single-reg) temp)
- (:note "inline complex single-float creation")
+ (:note _N"inline complex single-float creation")
(:policy :fast-safe)
(:generator 5
(sc-case r
@@ -1330,7 +1330,7 @@
:load-if (not (sc-is r complex-double-stack))))
(:result-types complex-double-float)
(:temporary (:sc complex-double-reg) temp)
- (:note "inline complex double-float creation")
+ (:note _N"inline complex double-float creation")
(:policy :fast-safe)
(:generator 5
(sc-case r
@@ -1351,7 +1351,7 @@
(:result-types single-float)
(:temporary (:sc complex-single-reg) temp)
(:policy :fast-safe)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:generator 3
(sc-case x
(complex-single-reg
@@ -1370,7 +1370,7 @@
(:result-types double-float)
(:temporary (:sc complex-double-reg) temp)
(:policy :fast-safe)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:generator 3
(sc-case x
(complex-double-reg
@@ -1389,7 +1389,7 @@
(:result-types single-float)
(:temporary (:sc complex-single-reg) temp)
(:policy :fast-safe)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:generator 3
(sc-case x
(complex-single-reg
@@ -1413,7 +1413,7 @@
(:result-types double-float)
(:temporary (:sc complex-double-reg) temp)
(:policy :fast-safe)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:generator 3
(sc-case x
(complex-double-reg
@@ -1435,7 +1435,7 @@
(:args (x :scs (double-reg double-stack) :load-if nil))
(:arg-types double-float)
(:policy :fast-safe)
- (:note "inline dummy FP register bias")
+ (:note _N"inline dummy FP register bias")
(:ignore x)
(:generator 0))
@@ -1446,7 +1446,7 @@
(:args (x :scs (single-reg single-stack) :load-if nil))
(:arg-types single-float)
(:policy :fast-safe)
- (:note "inline dummy FP register bias")
+ (:note _N"inline dummy FP register bias")
(:ignore x)
(:generator 0))
@@ -1483,7 +1483,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
@@ -1505,7 +1505,7 @@
(:args (x :scs (double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "double double float to pointer coercion")
+ (:note _N"double double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:double-double-float-type
vm:double-double-float-size node)
@@ -1522,7 +1522,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 ((real-tn (double-double-reg-hi-tn y)))
(inst movsd real-tn (ea-for-cdf-real-desc x)))
@@ -1538,7 +1538,7 @@
(:args (x :scs (double-double-reg) :target y)
(fp :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
@@ -1562,7 +1562,7 @@
(define-vop (move-to-complex-double-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-double-double-reg)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-double-double-reg-real-hi-tn y)))
(inst movsd real-tn (ea-for-cddf-real-hi-desc x)))
@@ -1586,7 +1586,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
@@ -1637,7 +1637,7 @@
(:arg-types double-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "double-double high part")
+ (:note _N"double-double high part")
(:variant 0))
(define-vop (lo/double-double-value double-double-value)
@@ -1647,7 +1647,7 @@
(:arg-types double-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "double-double low part")
+ (:note _N"double-double low part")
(:variant 1))
(define-vop (make-complex-double-double-float)
@@ -1660,7 +1660,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)
(:generator 5
(sc-case r
@@ -1735,12 +1735,12 @@
(define-vop (realpart/complex-double-double-float complex-double-double-float-value)
(:translate realpart)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:variant :real))
(define-vop (imagpart/complex-double-double-float complex-double-double-float-value)
(:translate imagpart)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:variant :imag))
); progn
@@ -1854,7 +1854,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)
(:temporary (:sc ,complex-reg) tmp)
(:generator ,cost
@@ -1901,7 +1901,7 @@
(:arg-types ,c-type ,r-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float/float arithmetic")
+ (:note _N"inline complex float/float arithmetic")
(:translate ,op)
(:temporary (:sc ,complex-reg) tmp)
(:temporary (:sc ,real-reg) rtmp)
@@ -1963,7 +1963,7 @@
(:arg-types ,r-type ,c-type)
(:result-types ,c-type)
(:policy :fast-safe)
- (:note "inline complex float/float arithmetic")
+ (:note _N"inline complex float/float arithmetic")
(:translate ,op)
(:temporary (:sc ,complex-reg) tmp)
(:temporary (:sc ,real-reg) rtmp)
@@ -2009,7 +2009,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 (,complex-sc-type)) t0)
(:generator ,cost
@@ -2025,7 +2025,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 (,complex-sc-type)) t0)
(:generator ,cost
@@ -2044,7 +2044,7 @@
(:arg-types complex-double-float double-float)
(:result-types complex-double-float)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate /)
(:temporary (:sc complex-double-reg) t0)
(:generator 4
@@ -2060,7 +2060,7 @@
(:arg-types complex-single-float single-float)
(:result-types complex-single-float)
(:policy :fast-safe)
- (:note "inline complex float arithmetic")
+ (:note _N"inline complex float arithmetic")
(:translate /)
(:temporary (:sc complex-single-reg) t0 t1)
(:generator 5
Index: src/compiler/x86/float.lisp
diff -u src/compiler/x86/float.lisp:1.58.14.1 src/compiler/x86/float.lisp:1.58.14.2
--- src/compiler/x86/float.lisp:1.58.14.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/float.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/float.lisp,v 1.58.14.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/float.lisp,v 1.58.14.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -22,7 +22,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
@@ -242,7 +242,7 @@
(inst fldlg2))
((= value (log 2l0 2.718281828459045235360287471352662L0))
(inst fldln2))
- (t (warn "Ignoring bogus i387 Constant ~a" value))))))
+ (t (warn _"Ignoring bogus i387 Constant ~a" value))))))
;;;; Complex float move functions
@@ -409,7 +409,7 @@
(define-vop (float-move)
(:args (x))
(:results (y))
- (:note "float move")
+ (:note _N"float move")
(:generator 0
(unless (location= x y)
(cond ((zerop (tn-offset y))
@@ -444,7 +444,7 @@
(define-vop (complex-float-move)
(:args (x :target y :load-if (not (location= x y))))
(:results (y :load-if (not (location= x y))))
- (:note "complex float move")
+ (:note _N"complex float move")
(:generator 0
(unless (location= x y)
;; Note the complex-float-regs are aligned to every second
@@ -497,7 +497,7 @@
(:args (x :scs (single-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:single-float-type vm:single-float-size node)
(with-tn at fp-top(x)
@@ -509,7 +509,7 @@
(:args (x :scs (double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:double-float-type vm:double-float-size node)
(with-tn at fp-top(x)
@@ -522,7 +522,7 @@
(:args (x :scs (long-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "float to pointer coercion")
+ (:note _N"float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:long-float-type vm:long-float-size node)
(with-tn at fp-top(x)
@@ -565,7 +565,7 @@
(define-vop (move-to-single)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (single-reg)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(with-empty-tn at fp-top(y)
(inst fld (ea-for-sf-desc x)))))
@@ -574,7 +574,7 @@
(define-vop (move-to-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (double-reg)))
- (:note "pointer to float coercion")
+ (:note _N"pointer to float coercion")
(:generator 2
(with-empty-tn at fp-top(y)
(inst fldd (ea-for-df-desc x)))))
@@ -584,7 +584,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
(with-empty-tn at fp-top(y)
(inst fldl (ea-for-lf-desc x)))))
@@ -600,7 +600,7 @@
(:args (x :scs (complex-single-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-single-float-type
vm:complex-single-float-size node)
@@ -617,7 +617,7 @@
(:args (x :scs (complex-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-double-float-type
vm:complex-double-float-size node)
@@ -635,7 +635,7 @@
(:args (x :scs (complex-long-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex float to pointer coercion")
+ (:note _N"complex float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:complex-long-float-type
vm:complex-long-float-size node)
@@ -654,7 +654,7 @@
(:args (x :scs (complex-double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "complex double-double float to pointer coercion")
+ (:note _N"complex double-double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm::complex-double-double-float-type
vm::complex-double-double-float-size node)
@@ -682,7 +682,7 @@
(define-vop (,name)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (,sc)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-double-reg-real-tn y)))
(with-empty-tn at fp-top(real-tn)
@@ -719,7 +719,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y ,sc))))
(:results (y))
- (:note "float argument move")
+ (:note _N"float argument move")
(:generator ,(case format (:single 2) (:double 3) (:long 4))
(sc-case y
(,sc
@@ -771,7 +771,7 @@
(fp :scs (any-reg)
:load-if (not (sc-is y ,sc))))
(:results (y))
- (:note "complex float argument move")
+ (:note _N"complex float argument move")
(:generator ,(ecase format (:single 2) (:double 3) (:long 4))
(sc-case y
(,sc
@@ -846,7 +846,7 @@
(:args (x :scs (complex-double-double-reg) :target y)
(fp :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
@@ -976,7 +976,7 @@
(:arg-types single-float single-float)
(:result-types single-float)
(:policy :fast-safe)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:node-var node)
@@ -1136,7 +1136,7 @@
(:arg-types double-float double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:node-var node)
@@ -1281,7 +1281,7 @@
(:arg-types long-float long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:node-var node)
@@ -1386,7 +1386,7 @@
(:temporary (:sc double-reg :offset fr0-offset
:from :argument :to :result) fr0)
(:ignore fr0)
- (:note "inline float arithmetic")
+ (:note _N"inline float arithmetic")
(:vop-var vop)
(:save-p :compute-only)
(:generator 1
@@ -1431,7 +1431,7 @@
(:policy :fast-safe)
(:vop-var vop)
(:save-p :compute-only)
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:ignore temp)
(:generator 3
(note-this-location vop :internal-error)
@@ -1483,7 +1483,7 @@
(:info target not-p)
(:policy :fast-safe)
(:guard (not (backend-featurep :ppro)))
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:ignore temp fr0)
(:generator 3
;; Handle a few special cases
@@ -1572,7 +1572,7 @@
(:info target not-p)
(:policy :fast-safe)
(:guard (not (backend-featurep :ppro)))
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:ignore temp fr0)
(:generator 3
;; Handle a few special cases
@@ -1660,7 +1660,7 @@
(:info target not-p)
(:policy :fast-safe)
(:guard (not (backend-featurep :ppro)))
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:ignore temp)
(:generator 3
(cond
@@ -1718,7 +1718,7 @@
(:policy :fast-safe)
(:vop-var vop)
(:save-p :compute-only)
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:ignore temp y)
(:guard (not (backend-featurep :sse2)))
(:generator 2
@@ -1785,7 +1785,7 @@
(:info target not-p)
(:policy :fast-safe)
(:guard (backend-featurep :ppro))
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:generator 3
;; Handle a few special cases
(cond
@@ -1825,7 +1825,7 @@
(:info target not-p)
(:policy :fast-safe)
(:guard (backend-featurep :ppro))
- (:note "inline float comparison")
+ (:note _N"inline float comparison")
(:generator 3
;; Handle a few special cases
(cond
@@ -1870,7 +1870,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)
@@ -1899,7 +1899,7 @@
(:arg-types signed-num)
(:result-types single-float)
(:policy :fast-safe)
- (:note "inline float coercion")
+ (:note _N"inline float coercion")
(:translate %single-float)
(:vop-var vop)
(:save-p :compute-only)
@@ -1927,7 +1927,7 @@
(:arg-types unsigned-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)
@@ -1951,7 +1951,7 @@
(:arg-types unsigned-num)
(:result-types single-float)
(:policy :fast-safe)
- (:note "inline float coercion")
+ (:note _N"inline float coercion")
(:translate %single-float)
(:vop-var vop)
(:save-p :compute-only)
@@ -1974,7 +1974,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)
@@ -2019,7 +2019,7 @@
(:arg-types double-float)
(:result-types single-float)
(:policy :fast-safe)
- (:note "inline float coercion")
+ (:note _N"inline float coercion")
(:translate %single-float)
(:temporary (:sc single-stack) sf-temp)
(:vop-var vop)
@@ -2074,7 +2074,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
@@ -2122,7 +2122,7 @@
(:result-types unsigned-num)
(:translate ,trans)
(:policy :fast-safe)
- (:note "inline float truncate")
+ (:note _N"inline float truncate")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -2464,7 +2464,7 @@
(:result-types double-float)
(:translate ,trans)
(:policy :fast-safe)
- (:note "inline NPX function")
+ (:note _N"inline NPX function")
(:vop-var vop)
(:save-p :compute-only)
(:node-var node)
@@ -2504,7 +2504,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -2550,7 +2550,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline sin/cos function")
+ (:note _N"inline sin/cos function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax)
@@ -2595,7 +2595,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax)
@@ -2653,7 +2653,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline sin/cos function")
+ (:note _N"inline sin/cos function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax fr0)
@@ -2691,7 +2691,7 @@
(:result-types double-float)
(:ignore eax)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax fr0)
@@ -2739,7 +2739,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline exp function")
+ (:note _N"inline exp function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -2792,7 +2792,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline exp function")
+ (:note _N"inline exp function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore temp)
@@ -2849,7 +2849,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline expm1 function")
+ (:note _N"inline expm1 function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore temp fr0)
@@ -2906,7 +2906,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline log function")
+ (:note _N"inline log function")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -2958,7 +2958,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline log10 function")
+ (:note _N"inline log10 function")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -3013,7 +3013,7 @@
(:arg-types double-float double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline pow function")
+ (:note _N"inline pow function")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -3129,7 +3129,7 @@
(:arg-types double-float signed-num)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline scalbn function")
+ (:note _N"inline scalbn function")
(:ignore fr0)
(:guard (not (backend-featurep :sse2)))
(:generator 5
@@ -3195,7 +3195,7 @@
(:arg-types double-float double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline scalb function")
+ (:note _N"inline scalb function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -3303,7 +3303,7 @@
(:policy :fast-safe)
(:guard (or (not (backend-featurep :pentium))
(not (backend-featurep :sse2))))
- (:note "inline log1p function")
+ (:note _N"inline log1p function")
(:ignore temp)
(:generator 5
;; x is in a FP reg, not fr0, fr1.
@@ -3358,7 +3358,7 @@
(:policy :fast-safe)
(:guard (and (backend-featurep :pentium)
(not (backend-featurep :sse2))))
- (:note "inline log1p with limited x range function")
+ (:note _N"inline log1p with limited x range function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -3408,7 +3408,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline logb function")
+ (:note _N"inline logb function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -3456,7 +3456,7 @@
(:arg-types double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline atan function")
+ (:note _N"inline atan function")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -3504,7 +3504,7 @@
(:arg-types double-float double-float)
(:result-types double-float)
(:policy :fast-safe)
- (:note "inline atan2 function")
+ (:note _N"inline atan2 function")
(:vop-var vop)
(:save-p :compute-only)
(:guard (not (backend-featurep :sse2)))
@@ -3627,7 +3627,7 @@
(:result-types long-float)
(:translate ,trans)
(:policy :fast-safe)
- (:note "inline NPX function")
+ (:note _N"inline NPX function")
(:vop-var vop)
(:save-p :compute-only)
(:node-var node)
@@ -3664,7 +3664,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -3709,7 +3709,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline sin/cos function")
+ (:note _N"inline sin/cos function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax)
@@ -3754,7 +3754,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax)
@@ -3812,7 +3812,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline sin/cos function")
+ (:note _N"inline sin/cos function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax fr0)
@@ -3849,7 +3849,7 @@
(:result-types long-float)
(:ignore eax)
(:policy :fast-safe)
- (:note "inline tan function")
+ (:note _N"inline tan function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore eax fr0)
@@ -3899,7 +3899,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline exp function")
+ (:note _N"inline exp function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore temp)
@@ -3955,7 +3955,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline expm1 function")
+ (:note _N"inline expm1 function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore temp fr0)
@@ -4011,7 +4011,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline log function")
+ (:note _N"inline log function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -4062,7 +4062,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline log10 function")
+ (:note _N"inline log10 function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -4116,7 +4116,7 @@
(:arg-types long-float long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline pow function")
+ (:note _N"inline pow function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -4231,7 +4231,7 @@
(:arg-types long-float signed-num)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline scalbn function")
+ (:note _N"inline scalbn function")
(:ignore fr0)
(:generator 5
;; Setup x in fr0 and y in fr1
@@ -4296,7 +4296,7 @@
(:arg-types long-float long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline scalb function")
+ (:note _N"inline scalb function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -4402,7 +4402,7 @@
(:result-types long-float)
(:policy :fast-safe)
(:guard (not (backend-featurep :pentium)))
- (:note "inline log1p function")
+ (:note _N"inline log1p function")
(:ignore temp)
(:generator 5
;; x is in a FP reg, not fr0, fr1.
@@ -4456,7 +4456,7 @@
(:result-types long-float)
(:policy :fast-safe)
(:guard (backend-featurep :pentium))
- (:note "inline log1p function")
+ (:note _N"inline log1p function")
(:generator 5
(sc-case x
(long-reg
@@ -4503,7 +4503,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline logb function")
+ (:note _N"inline logb function")
(:vop-var vop)
(:save-p :compute-only)
(:ignore fr0)
@@ -4550,7 +4550,7 @@
(:arg-types long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline atan function")
+ (:note _N"inline atan function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -4597,7 +4597,7 @@
(:arg-types long-float long-float)
(:result-types long-float)
(:policy :fast-safe)
- (:note "inline atan2 function")
+ (:note _N"inline atan2 function")
(:vop-var vop)
(:save-p :compute-only)
(:generator 5
@@ -4705,7 +4705,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)
(:generator 5
(sc-case r
@@ -4749,7 +4749,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)
(:generator 5
(sc-case r
@@ -4794,7 +4794,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)
(:generator 5
(sc-case r
@@ -4897,7 +4897,7 @@
(:arg-types complex-single-float)
(:results (r :scs (single-reg)))
(:result-types single-float)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:variant 0))
(define-vop (realpart/complex-double-float complex-float-value)
@@ -4907,7 +4907,7 @@
(:arg-types complex-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:variant 0))
#+long-float
@@ -4918,7 +4918,7 @@
(:arg-types complex-long-float)
(:results (r :scs (long-reg)))
(:result-types long-float)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:variant 0))
(define-vop (imagpart/complex-single-float complex-float-value)
@@ -4928,7 +4928,7 @@
(:arg-types complex-single-float)
(:results (r :scs (single-reg)))
(:result-types single-float)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:variant 1))
(define-vop (imagpart/complex-double-float complex-float-value)
@@ -4938,7 +4938,7 @@
(:arg-types complex-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:variant 1))
#+long-float
@@ -4949,7 +4949,7 @@
(:arg-types complex-long-float)
(:results (r :scs (long-reg)))
(:result-types long-float)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:variant 1))
@@ -4964,7 +4964,7 @@
(:args (x :scs (double-reg double-stack) :load-if nil))
(:arg-types double-float)
(:policy :fast-safe)
- (:note "inline dummy FP register bias")
+ (:note _N"inline dummy FP register bias")
(:ignore x)
(:generator 0))
@@ -4975,7 +4975,7 @@
(:args (x :scs (single-reg single-stack) :load-if nil))
(:arg-types single-float)
(:policy :fast-safe)
- (:note "inline dummy FP register bias")
+ (:note _N"inline dummy FP register bias")
(:ignore x)
(:generator 0))
@@ -5021,7 +5021,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
@@ -5052,7 +5052,7 @@
(:args (x :scs (double-double-reg) :to :save))
(:results (y :scs (descriptor-reg)))
(:node-var node)
- (:note "double double float to pointer coercion")
+ (:note _N"double double float to pointer coercion")
(:generator 13
(with-fixed-allocation (y vm:double-double-float-type
vm:double-double-float-size node)
@@ -5071,7 +5071,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 ((real-tn (double-double-reg-hi-tn y)))
(with-empty-tn at fp-top(real-tn)
@@ -5089,7 +5089,7 @@
(:args (x :scs (double-double-reg) :target y)
(fp :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
@@ -5129,7 +5129,7 @@
(define-vop (move-to-complex-double-double)
(:args (x :scs (descriptor-reg)))
(:results (y :scs (complex-double-double-reg)))
- (:note "pointer to complex float coercion")
+ (:note _N"pointer to complex float coercion")
(:generator 2
(let ((real-tn (complex-double-double-reg-real-hi-tn y)))
(with-empty-tn at fp-top(real-tn)
@@ -5157,7 +5157,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
@@ -5235,7 +5235,7 @@
(:arg-types double-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "double-double high part")
+ (:note _N"double-double high part")
(:variant 0))
(define-vop (lo/double-double-value double-double-value)
@@ -5245,7 +5245,7 @@
(:arg-types double-double-float)
(:results (r :scs (double-reg)))
(:result-types double-float)
- (:note "double-double low part")
+ (:note _N"double-double low part")
(:variant 1))
(define-vop (make-complex-double-double-float)
@@ -5258,7 +5258,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)
(:generator 5
(sc-case r
@@ -5389,12 +5389,12 @@
(define-vop (realpart/complex-double-double-float complex-double-double-float-value)
(:translate realpart)
- (:note "complex float realpart")
+ (:note _N"complex float realpart")
(:variant :real))
(define-vop (imagpart/complex-double-double-float complex-double-double-float-value)
(:translate imagpart)
- (:note "complex float imagpart")
+ (:note _N"complex float imagpart")
(:variant :imag))
); progn
Index: src/compiler/x86/insts.lisp
diff -u src/compiler/x86/insts.lisp:1.33.14.1 src/compiler/x86/insts.lisp:1.33.14.2
--- src/compiler/x86/insts.lisp:1.33.14.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/insts.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/insts.lisp,v 1.33.14.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/insts.lisp,v 1.33.14.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -20,7 +20,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
(use-package :new-assem)
Index: src/compiler/x86/macros.lisp
diff -u src/compiler/x86/macros.lisp:1.26.18.1 src/compiler/x86/macros.lisp:1.26.18.2
--- src/compiler/x86/macros.lisp:1.26.18.1 Mon Feb 8 12:15:51 2010
+++ src/compiler/x86/macros.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/macros.lisp,v 1.26.18.1 2010-02-08 17:15:51 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/macros.lisp,v 1.26.18.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -19,7 +19,7 @@
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997,1998,1999.
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;; We can load/store into fp registers through the top of
@@ -50,7 +50,7 @@
;;; 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)
@@ -103,7 +103,7 @@
(- other-pointer-type))))
(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)
@@ -253,7 +253,7 @@
(values))
(defun allocation (alloc-tn size &optional inline dynamic-extent)
- "Allocate an object with a size in bytes given by Size.
+ _N"Allocate an object with a size in bytes given by Size.
The size may be an integer or a TN.
If Inline is a VOP node-var then it is used to make an appropriate
speed vs size decision. If Dynamic-Extent is true, and otherwise
@@ -271,7 +271,7 @@
(defmacro with-fixed-allocation ((result-tn type-code size &optional inline)
&rest forms)
- "Allocate an other-pointer object of fixed Size with a single
+ _N"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."
`(pseudo-atomic
@@ -311,20 +311,20 @@
(inst byte (aref ,vector i)))))))))
(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
,@(emit-error-break vop cerror-trap error-code values)
(inst jmp ,label)))
(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)))
@@ -333,7 +333,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/x86/memory.lisp
diff -u src/compiler/x86/memory.lisp:1.9.48.1 src/compiler/x86/memory.lisp:1.9.48.2
--- src/compiler/x86/memory.lisp:1.9.48.1 Mon Feb 8 12:15:52 2010
+++ src/compiler/x86/memory.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/memory.lisp,v 1.9.48.1 2010-02-08 17:15:52 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/memory.lisp,v 1.9.48.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -21,7 +21,7 @@
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
;;; Cell-Ref and Cell-Set are used to define VOPs like CAR, where the offset to
;;; be read or written is a property of the VOP used. Cell-Setf is similar to
Index: src/compiler/x86/move.lisp
diff -u src/compiler/x86/move.lisp:1.8.48.1 src/compiler/x86/move.lisp:1.8.48.2
--- src/compiler/x86/move.lisp:1.8.48.1 Mon Feb 8 12:15:52 2010
+++ src/compiler/x86/move.lisp Fri Feb 26 10:44:30 2010
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group at cs.cmu.edu.
;;;
(ext:file-comment
- "$Header: /project/cmucl/cvsroot/src/compiler/x86/move.lisp,v 1.8.48.1 2010-02-08 17:15:52 rtoy Exp $")
+ "$Header: /project/cmucl/cvsroot/src/compiler/x86/move.lisp,v 1.8.48.2 2010-02-26 15:44:30 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
@@ -20,7 +20,7 @@
;;; Enhancements/debugging by Douglas T. Crosher 1996,1997.
;;;
(in-package :x86)
-(intl:textdomain "cmucl")
+(intl:textdomain "cmucl-x86-vm")
(define-move-function (load-immediate 1) (vop x y)
((immediate)
@@ -210,7 +210,7 @@
(:results (y :scs (signed-reg unsigned-reg)
:load-if (not (location= x y))))
(:arg-types tagged-num)
- (:note "fixnum untagging")
+ (:note _N"fixnum untagging")
(:generator 1
(move y x)
(inst sar y 2)))
@@ -222,7 +222,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 mov y (tn-value x))))
;;;
@@ -234,7 +234,7 @@
(define-vop (move-to-word/integer)
(:args (x :scs (descriptor-reg) :target eax))
(:results (y :scs (signed-reg unsigned-reg)))
- (:note "integer to untagged word coercion")
+ (:note _N"integer to untagged word coercion")
(:temporary (:sc unsigned-reg :offset eax-offset
:from (:argument 0) :to (:result 0) :target y) eax)
(:generator 4
@@ -261,7 +261,7 @@
(:results (y :scs (any-reg descriptor-reg)
:load-if (not (location= x y))))
(:result-types tagged-num)
- (:note "fixnum tagging")
+ (:note _N"fixnum tagging")
(:generator 1
(cond ((and (sc-is x signed-reg unsigned-reg)
(not (location= x y)))
@@ -288,7 +288,7 @@
:from (:argument 0) :to (:result 0)) ecx)
(:ignore ecx)
(:results (y :scs (any-reg descriptor-reg)))
- (:note "signed word to integer coercion")
+ (:note _N"signed word to integer coercion")
(:generator 20
(move eax x)
(inst call (make-fixup 'move-from-signed :assembly-routine))
@@ -298,7 +298,7 @@
(define-vop (move-from-signed)
(:args (x :scs (signed-reg unsigned-reg) :to :result))
(:results (y :scs (any-reg descriptor-reg) :from :argument))
- (:note "signed word to integer coercion")
+ (:note _N"signed word to integer coercion")
(:node-var node)
(:generator 20
(assert (not (location= x y)))
@@ -335,7 +335,7 @@
:from (:argument 0) :to (:result 0)) ecx)
(:ignore ecx)
(:results (y :scs (any-reg descriptor-reg)))
- (:note "unsigned word to integer coercion")
+ (:note _N"unsigned word to integer coercion")
(:generator 20
(move eax x)
(inst call (make-fixup 'move-from-unsigned :assembly-routine))
@@ -347,7 +347,7 @@
(:temporary (:sc unsigned-reg) alloc)
(:results (y :scs (any-reg descriptor-reg)))
(:node-var node)
- (:note "unsigned word to integer coercion")
+ (:note _N"unsigned word to integer coercion")
(:generator 20
(assert (not (location= x y)))
(assert (not (location= x alloc)))
@@ -401,7 +401,7 @@
(sc-is y signed-stack unsigned-stack))))))
(:effects)
(:affected)
- (:note "word integer move")
+ (:note _N"word integer move")
(:generator 0
(move y x)))
;;;
@@ -414,7 +414,7 @@
(:args (x :scs (signed-reg unsigned-reg) :target y)
(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
((signed-reg unsigned-reg)
More information about the cmucl-commit
mailing list