From 897e79915e2ff3e10c38705ff43ba4d0feaf2a4e Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Mon, 19 Apr 2010 18:21:31 +0000 Subject: [PATCH] Remove _N"" reader macro from docstrings when possible. --- compiler/sparc/arith.lisp | 8 ++++---- compiler/sparc/c-call.lisp | 4 ++-- compiler/sparc/insts.lisp | 10 +++++----- compiler/sparc/macros.lisp | 26 +++++++++++++------------- compiler/sparc/parms.lisp | 26 +++++++++++++------------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/compiler/sparc/arith.lisp b/compiler/sparc/arith.lisp index 658ff6040..fa5c30114 100644 --- a/compiler/sparc/arith.lisp +++ b/compiler/sparc/arith.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/arith.lisp,v 1.47 2010/03/19 15:19:01 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/arith.lisp,v 1.48 2010/04/19 18:21:31 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1297,7 +1297,7 @@ ;;; routines. ;;; (defun emit-multiply (multiplier multiplicand result-high result-low) - _N"Emit code to multiply MULTIPLIER with MULTIPLICAND, putting the result + "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) @@ -2577,12 +2577,12 @@ (deftransform * ((x y) ((unsigned-byte 32) (constant-argument (unsigned-byte 32))) (unsigned-byte 32)) - _N"recode as shifts and adds" + "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)) - _N"recode as shifts and adds" + "recode as shifts and adds" (*-transformer y)) diff --git a/compiler/sparc/c-call.lisp b/compiler/sparc/c-call.lisp index 172d0475b..09c4ac5f8 100644 --- a/compiler/sparc/c-call.lisp +++ b/compiler/sparc/c-call.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/c-call.lisp,v 1.28 2010/03/19 15:19:01 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/c-call.lisp,v 1.29 2010/04/19 18:21:31 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -366,7 +366,7 @@ (eq (machine-rep type1) (machine-rep type2))))) (defun make-callback-trampoline (index fn-type) - _N"Cons up a piece of code which calls call-callback with INDEX and a + "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) diff --git a/compiler/sparc/insts.lisp b/compiler/sparc/insts.lisp index 3039df045..2764d1589 100644 --- a/compiler/sparc/insts.lisp +++ b/compiler/sparc/insts.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/insts.lisp,v 1.54 2010/03/19 15:19:01 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/insts.lisp,v 1.55 2010/04/19 18:21:31 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -56,7 +56,7 @@ :opcode-column-width 11) (defvar *disassem-use-lisp-reg-names* t - _N"If non-NIL, print registers using the Lisp register names. + "If non-NIL, print registers using the Lisp register names. Otherwise, use the Sparc register names") (def-vm-support-routine location-number (loc) @@ -102,7 +102,7 @@ Otherwise, use the Sparc register names") (cond ((null name) nil) (t (make-symbol (concatenate 'string "%" name))))) sparc::*register-names*) - _N"The Lisp names for the Sparc integer registers") + "The Lisp names for the Sparc integer registers") (defparameter sparc-reg-symbols (map 'vector @@ -113,7 +113,7 @@ Otherwise, use the Sparc register names") "O0" "O1" "O2" "O3" "O4" "O5" "O6" "O7" "L0" "L1" "L2" "L3" "L4" "L5" "L6" "L7" "I0" "I1" "I2" "I3" "I4" "I5" "I6" "I7")) - _N"The standard names for the Sparc integer registers") + "The standard names for the Sparc integer registers") (defun get-reg-name (index) (if *disassem-use-lisp-reg-names* @@ -121,7 +121,7 @@ Otherwise, use the Sparc register names") (aref sparc-reg-symbols index))) (defvar *note-sethi-inst* nil - _N"An alist for the disassembler indicating the target register and + "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.") diff --git a/compiler/sparc/macros.lisp b/compiler/sparc/macros.lisp index 9b771f170..1f1f4bf87 100644 --- a/compiler/sparc/macros.lisp +++ b/compiler/sparc/macros.lisp @@ -5,11 +5,11 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/macros.lisp,v 1.35 2010/03/19 15:19:01 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/macros.lisp,v 1.36 2010/04/19 18:21:31 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; -;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/macros.lisp,v 1.35 2010/03/19 15:19:01 rtoy Exp $ +;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/macros.lisp,v 1.36 2010/04/19 18:21:31 rtoy Exp $ ;;; ;;; This file contains various useful macros for generating SPARC code. ;;; @@ -23,7 +23,7 @@ ;;; Instruction-like macros. (defmacro move (dst src) - _N"Move SRC into DST unless they are location=." + "Move SRC into DST unless they are location=." (once-only ((n-dst dst) (n-src src)) `(unless (location= ,n-dst ,n-src) @@ -109,7 +109,7 @@ (frob function)) (defmacro load-type (target source &optional (offset 0)) - _N"Loads the type bits of a pointer into target independent of + "Loads the type bits of a pointer into target independent of byte-ordering issues." (once-only ((n-target target) (n-source source) @@ -124,14 +124,14 @@ ;;; return instructions. (defmacro lisp-jump (function) - _N"Jump to the lisp function FUNCTION. LIP is an interior-reg temporary." + "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)) - _N"Return to RETURN-PC." + "Return to RETURN-PC." `(progn (inst j ,return-pc (- (* (1+ ,offset) word-bytes) other-pointer-type)) @@ -140,7 +140,7 @@ '(inst nop)))) (defmacro emit-return-pc (label) - _N"Emit a return-pc header word. LABEL is the label to use for this return-pc." + "Emit a return-pc header word. LABEL is the label to use for this return-pc." `(progn (align lowtag-bits) (emit-label ,label) @@ -174,7 +174,7 @@ ;;; MAYBE-LOAD-STACK-TN -- Interface ;;; (defmacro maybe-load-stack-tn (reg reg-or-stack) - _N"Move the TN Reg-Or-Stack into Reg if it isn't already there." + "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 @@ -295,7 +295,7 @@ &key (lowtag other-pointer-type) stack-p) &body body) - _N"Do stuff to allocate an other-pointer object of fixed Size with a single + "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 @@ -546,20 +546,20 @@ (align word-shift))))) (defmacro error-call (vop error-code &rest values) - _N"Cause an error. ERROR-CODE is the error to cause." + "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) - _N"Cause a continuable error. If the error is continued, execution resumes at + "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) - _N"Generate-Error-Code Error-code Value* + "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))) @@ -568,7 +568,7 @@ start-lab))) (defmacro generate-cerror-code (vop error-code &rest values) - _N"Generate-CError-Code Error-code Value* + "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." diff --git a/compiler/sparc/parms.lisp b/compiler/sparc/parms.lisp index 3c835bb5b..cd4bd5a51 100644 --- a/compiler/sparc/parms.lisp +++ b/compiler/sparc/parms.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/parms.lisp,v 1.60 2010/03/19 15:19:01 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/parms.lisp,v 1.61 2010/04/19 18:21:31 rtoy Rel $") ;;; ;;; ********************************************************************** ;;; @@ -87,41 +87,41 @@ (eval-when (compile load eval) (defconstant word-bits 32 - _N"Number of bits per word where a word holds one lisp descriptor.") + "Number of bits per word where a word holds one lisp descriptor.") (defconstant byte-bits 8 - _N"Number of bits per byte where a byte is the smallest addressable object.") + "Number of bits per byte where a byte is the smallest addressable object.") (defconstant char-bits #-unicode 8 #+unicode 16 - _N"Number of bits needed to represent a character") + "Number of bits needed to represent a character") (defconstant char-bytes (truncate char-bits byte-bits) - _N"Number of bytes needed to represent a character") + "Number of bytes needed to represent a character") (defconstant word-shift (1- (integer-length (/ word-bits byte-bits))) - _N"Number of bits to shift between word addresses and byte addresses.") + "Number of bits to shift between word addresses and byte addresses.") (defconstant word-bytes (/ word-bits byte-bits) - _N"Number of bytes in a word.") + "Number of bytes in a word.") (defconstant lowtag-bits 3 - _N"Number of bits at the low end of a pointer used for type information.") + "Number of bits at the low end of a pointer used for type information.") (defconstant lowtag-mask (1- (ash 1 lowtag-bits)) - _N"Mask to extract the low tag bits from a pointer.") + "Mask to extract the low tag bits from a pointer.") (defconstant lowtag-limit (ash 1 lowtag-bits) - _N"Exclusive upper bound on the value of the low tag bits from a + "Exclusive upper bound on the value of the low tag bits from a pointer.") (defconstant fixnum-tag-bits (1- lowtag-bits) - _N"Number of tag bits used for a fixnum") + "Number of tag bits used for a fixnum") (defconstant fixnum-tag-mask (1- (ash 1 fixnum-tag-bits)) - _N"Mask to get the fixnum tag") + "Mask to get the fixnum tag") (defconstant positive-fixnum-bits (- word-bits fixnum-tag-bits 1) - _N"Maximum number of bits in a positive fixnum") + "Maximum number of bits in a positive fixnum") (defconstant float-sign-shift 31) -- GitLab