From 5942f034856f7371e990f13f79f8aa1ffe8f80d7 Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Wed, 14 Jul 2010 13:19:03 +0000 Subject: [PATCH] commandline.lisp: debug-int.lisp: load.lisp: Put the OS- and/or arch-specific items in the correct textdomain. --- code/commandline.lisp | 5 +++-- code/debug-int.lisp | 30 +++++++++++++++++++----------- code/load.lisp | 5 +++-- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/code/commandline.lisp b/code/commandline.lisp index 7f0e8d3bd..6178ff565 100644 --- a/code/commandline.lisp +++ b/code/commandline.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/code/commandline.lisp,v 1.24 2010/05/16 14:51:55 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.25 2010/07/14 13:19:03 rtoy Rel $") ;;; ;;; ********************************************************************** ;;; @@ -293,6 +293,7 @@ its default core file.") #+x86 +(intl:with-textdomain ("cmucl" "cmucl-x86-vm") (defswitch "fpu" nil "Specifies what kind of floating-point support should be used on x86 systems. If 'x87', Lisp will use the x87 floating-point unit; if @@ -300,7 +301,7 @@ 'auto',which causes Lisp to check to see if SSE2 is available. If so, then SSE2 is used. If the SSE2 core file cannot be found,Lisp will fallback to the x87 core, which can run on any machine." - "mode") + "mode")) (defun help-switch-demon (switch) (declare (ignore switch)) diff --git a/code/debug-int.lisp b/code/debug-int.lisp index 6016f4237..38889e0ab 100644 --- a/code/debug-int.lisp +++ b/code/debug-int.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/code/debug-int.lisp,v 1.140 2010/04/20 17:57:44 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.141 2010/07/14 13:19:03 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1253,6 +1253,7 @@ The result is a symbol or nil if the routine cannot be found." ;;; LRA, and the LRA is the word offset. ;;; #-(or gengc x86 amd64) +(intl:with-textdomain ("cmucl" #+sparc "cmucl-sparc-svr4") (defun compute-calling-frame (caller lra up-frame) (declare (type system:system-area-pointer caller)) (when (cstack-pointer-valid-p caller) @@ -1301,9 +1302,10 @@ The result is a symbol or nil if the routine cannot be found." (code-location-from-pc d-fun pc-offset escaped) (if up-frame (1+ (frame-number up-frame)) 0) - escaped)))))) + escaped))))))) #+(or x86 amd64) +(intl:with-textdomain ("cmucl" "cmucl-x86-vm") (defun compute-calling-frame (caller ra up-frame) (declare (type system:system-area-pointer caller ra)) ; (format t "ccf: ~a ~a ~a~%" caller ra up-frame) @@ -1357,9 +1359,10 @@ The result is a symbol or nil if the routine cannot be found." (code-location-from-pc d-fun pc-offset escaped) (if up-frame (1+ (frame-number up-frame)) 0) - escaped))))) + escaped)))))) #-(or gengc x86 amd64) +(intl:with-textdomain ("cmucl" #+sparc "cmucl-sparc-svr4") (defun find-escaped-frame (frame-pointer) (declare (type system:system-area-pointer frame-pointer)) (dotimes (index lisp::*free-interrupt-context-index* (values nil 0 nil)) @@ -1414,9 +1417,9 @@ The result is a symbol or nil if the routine cannot be found." (values (kernel:lra-code-header real-lra) (kernel:get-header-data real-lra) nil)) - (values code pc-offset scp))))))))))) + (values code pc-offset scp)))))))))))) #+(or x86 amd64) -(defun find-escaped-frame (frame-pointer) +(intl:with-textdomain ("cmucl" "cmucl-x86-vm")(defun find-escaped-frame (frame-pointer) (declare (type system:system-area-pointer frame-pointer)) (dotimes (index lisp::*free-interrupt-context-index* (values nil 0 nil)) (alien:with-alien @@ -1449,9 +1452,10 @@ The result is a symbol or nil if the routine cannot be found." (format t "** pc-offset ~s not in code obj ~s?~%" pc-offset code)) (return - (values code pc-offset scp)))))))))) + (values code pc-offset scp))))))))))) #-(or gengc x86 amd64) +(intl:with-textdomain ("cmucl" #+sparc "cmucl-sparc-svr4") (defun find-pc-from-assembly-fun (code scp) "find the PC" (let ((return-machine-address @@ -1465,7 +1469,7 @@ The result is a symbol or nil if the routine cannot be found." (- (get-lisp-obj-address code) vm:other-pointer-type) code-header-len) - return-machine-address))) + return-machine-address)))) ;;; CODE-OBJECT-FROM-BITS -- internal. ;;; @@ -3075,6 +3079,7 @@ The result is a symbol or nil if the routine cannot be found." ;;; SUB-ACCESS-DEBUG-VAR-SLOT -- Internal. ;;; #-(or x86 amd64) +(intl:with-textdomain ("cmucl" #+sparc "cmucl-sparc-svr4") (defun sub-access-debug-var-slot (fp sc-offset &optional escaped) (macrolet ((with-escaped-value ((var) &body forms) `(if escaped @@ -3269,9 +3274,10 @@ The result is a symbol or nil if the routine cannot be found." (#.vm:sap-stack-sc-number (with-nfp (nfp) (system:sap-ref-sap nfp (* (c:sc-offset-offset sc-offset) - vm:word-bytes))))))) + vm:word-bytes)))))))) #+(or x86 amd64) +(intl:with-textdomain ("cmucl" "cmucl-x86-vm") (defun sub-access-debug-var-slot (fp sc-offset &optional escaped) (declare (type system:system-area-pointer fp)) (macrolet ((with-escaped-value ((var) &body forms) @@ -3446,7 +3452,7 @@ The result is a symbol or nil if the routine cannot be found." vm:word-bytes)))) (#.vm:sap-stack-sc-number (system:sap-ref-sap fp (- (* (1+ (c:sc-offset-offset sc-offset)) - vm:word-bytes))))))) + vm:word-bytes)))))))) ;;; %SET-DEBUG-VARIABLE-VALUE -- Internal. @@ -3499,6 +3505,7 @@ The result is a symbol or nil if the routine cannot be found." ;;; SUB-SET-DEBUG-VAR-SLOT -- Internal. ;;; #-(or x86 amd64) +(intl:with-textdomain ("cmucl" #+sparc "cmucl-sparc-svr4") (defun sub-set-debug-var-slot (fp sc-offset value &optional escaped) (macrolet ((set-escaped-value (val) `(if escaped @@ -3652,9 +3659,10 @@ The result is a symbol or nil if the routine cannot be found." (with-nfp (nfp) (setf (system:sap-ref-sap nfp (* (c:sc-offset-offset sc-offset) vm:word-bytes)) - (the system:system-area-pointer value))))))) + (the system:system-area-pointer value)))))))) #+(or x86 amd64) +(intl:with-textdomain ("cmucl" "cmucl-x86-vm") (defun sub-set-debug-var-slot (fp sc-offset value &optional escaped) (macrolet ((set-escaped-value (val) `(if escaped @@ -3738,7 +3746,7 @@ The result is a symbol or nil if the routine cannot be found." (#.vm:sap-stack-sc-number (setf (system:sap-ref-sap fp (- (* (1+ (c:sc-offset-offset sc-offset)) vm:word-bytes))) - (the system:system-area-pointer value)))))) + (the system:system-area-pointer value))))))) (defsetf debug-variable-value %set-debug-variable-value) diff --git a/code/load.lisp b/code/load.lisp index 1d2a03f5e..2b4543d4a 100644 --- a/code/load.lisp +++ b/code/load.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/code/load.lisp,v 1.96 2010/04/20 17:57:44 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/load.lisp,v 1.97 2010/07/14 13:19:03 rtoy Rel $") ;;; ;;; ********************************************************************** ;;; @@ -1286,6 +1286,7 @@ (defvar *enable-dynamic-space-code* #-gencgc nil #+gencgc t) #+(or x86 amd64) +(intl:with-textdomain ("cmucl" "cmucl-x86-vm") (defun load-code (box-num code-length) (declare (fixnum box-num code-length)) (with-fop-stack t @@ -1344,7 +1345,7 @@ (setf (code-header-ref code (decf index)) (pop stuff))) (system:without-gcing (read-n-bytes *fasl-file* (code-instructions code) 0 code-length)) - code))))) + code)))))) (define-fop (fop-code 58 :nope) (load-code (read-arg 4) (read-arg 4))) -- GitLab