cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[cmucl-cvs] CMUCL commit: src/docs/cmu-user (unicode.tex)
by Raymond Toy 04 Aug '10

04 Aug '10

Date: Tuesday, August 3, 2010 @ 23:39:07 Author: rtoy Path: /project/cmucl/cvsroot/src/docs/cmu-user Modified: unicode.tex o Document the parameters to OPEN that are specific to Unicode. o Document LIST-ALL-EXTERNAL-FORMATS and DESCRIBE-EXTERNAL-FORMAT. -------------+ unicode.tex | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 58 insertions(+), 8 deletions(-) Index: src/docs/cmu-user/unicode.tex diff -u src/docs/cmu-user/unicode.tex:1.11 src/docs/cmu-user/unicode.tex:1.12 --- src/docs/cmu-user/unicode.tex:1.11 Mon Jul 12 09:58:42 2010 +++ src/docs/cmu-user/unicode.tex Tue Aug 3 23:39:07 2010 @@ -80,14 +80,6 @@ parameter to specify the format. The default external format is \kwd{default}. -\begin{defun}{stream:}{set-system-external-format}{\var{terminal} \ampoptional{} \var{filenames}} - This function changes the external format used for - \var{*standard-input*}, \var{*standard-output*}, and - \var{*standard-error*} to the external format specified by - \var{terminal}. Additionally, the Unix file name encoding can be - set to the value specified by \var{filenames} if non-\nil. -\end{defun} - \subsection{Available External Formats} The available external formats are listed below in @@ -451,8 +443,66 @@ \file{ext-formats:unidata.bin}. If this file is not found, Unicode support is severely reduced; you can only use ASCII characters. +\begin{defun}{}{open}{\args \var{filename} \amprest \var{options} + \keys{\kwd{direction} \kwd{element-type} \kwd{if-exists} + \kwd{if-does-not-exist} \morekeys \kwd{class} \kwd{mapped} + \kwd{input-handle} \kwd{output-handle} + \yetmorekeys \kwd{external-format} \kwd{decoding-error} + \kwd{encoding-error}} + + The main options are covered elsewhere. Here we describe the + options specific to Unicode. The option \kwd{external-format} + specifies the external format to use for reading and writing the + file. The external format is a keyword. + + The options \kwd{decoding-error} and \kwd{encoding-error} are used + to specify how encoding and decoding errors are handled. The + default value on \nil means the external format handles errors + itself and typically replaces invalid sequences with the Unicode + replacement character. + + Otherwise, the value for \code{decoding-error} is either a + character, a symbol or a function. If a character is + specified. it is used as the replacement character for any invalid + decoding. If a symbol or a function is given, it must be a + function of three arguments: a message string to be printed, the + offending octet, and the number of octets read. If the function + returns, it should return two values: the code point to use as the + replacement character and the number of octets read. In addition, + \true{} may be specified. This indicates that a continuable error + is signaled, which, if continued, the Unicode replacement + character is used. + + For \code{encoding-error}, a character, symbol, or function can be + specified, like \code{decoding-error}, with the same meaning. The + function, however, takes two arguments: a format message string + and the incorrect codepoint. If the function returns, it should + be the replacement codepoint. +\end{defun} + \subsubsection{Utilities} +\begin{defun}{stream:}{set-system-external-format}{\var{terminal} \ampoptional{} \var{filenames}} + This function changes the external format used for + \var{*standard-input*}, \var{*standard-output*}, and + \var{*standard-error*} to the external format specified by + \var{terminal}. Additionally, the Unix file name encoding can be + set to the value specified by \var{filenames} if non-\nil. +\end{defun} + +\begin{defun}{extensions:}{list-all-external-formats}{} + list all of the vailable external formats. A list is returned where + each element is a list of the external format name and a list of + aliases for the format. No distinction is made between external + formats and composing external formats. +\end{defun} + +\begin{defun}{extensions:}{describe-external-format}{external-format} + Print a description of the given \var{external-format}. This may + cause the external format to be loaded (silently) if it is not + already loaded. +\end{defun} + Since strings are UTF-16 and hence may contain surrogate pairs, some utility functions are provided to make access easier.

1 0

[cmucl-cvs] CMUCL commit: src/code (fd-stream.lisp)
by Raymond Toy 04 Aug '10

04 Aug '10

Date: Tuesday, August 3, 2010 @ 23:37:51 Author: rtoy Path: /project/cmucl/cvsroot/src/code Modified: fd-stream.lisp Correct the docstring for OPEN for the :ENCODING-ERROR and :DECODING-ERROR arguments. ----------------+ fd-stream.lisp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) Index: src/code/fd-stream.lisp diff -u src/code/fd-stream.lisp:1.114 src/code/fd-stream.lisp:1.115 --- src/code/fd-stream.lisp:1.114 Tue Jul 20 18:53:11 2010 +++ src/code/fd-stream.lisp Tue Aug 3 23:37:51 2010 @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.114 2010-07-20 22:53:11 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.115 2010-08-04 03:37:51 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -2201,15 +2201,23 @@ :if-does-not-exist - one of :error, :create or nil :external-format - an external format name :decoding-error - How to handle decoding errors from the external format. - Should be a symbol or function of 3 arguments. If it - returns, it should return a code point to use as the - replacment. NIL means use the default replacement scheme - specified by the external format. The function arguments - are a format message string, the offending octet, and the - number of octets read in the current encoding. + If a character, then that character is used as + the replacment character for all errors. If T, + then a continuable error is signaled. If + continued, the Unicode replacement character is + used. Otherwise, it should be a symbol or + function of 3 arguments. If it returns, it + should return a code point to use as the + replacment. The function arguments are a + format message string, the offending octet, and + the number of octets read in the current + encoding. :encoding-error - Like :decoding-error, but for errors when encoding the - stream. The function arguments are a format message - string and the incorrect codepoint. + stream. If a character, that character is used + as the replacment code point. Otherwise, it + should be a symbol or function oof two + arguments: a format message string and the + incorrect codepoint. See the manual for details." (declare (ignore element-type external-format input-handle output-handle

1 0

[cmucl-cvs] CMUCL commit: src/code (extfmts.lisp)
by Raymond Toy 04 Aug '10

04 Aug '10

Date: Tuesday, August 3, 2010 @ 22:56:36 Author: rtoy Path: /project/cmucl/cvsroot/src/code Modified: extfmts.lisp Inhibit warnings around funcalls to error. This was generating too compiler noise for something we don't really care if it's slow. --------------+ extfmts.lisp | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) Index: src/code/extfmts.lisp diff -u src/code/extfmts.lisp:1.35 src/code/extfmts.lisp:1.36 --- src/code/extfmts.lisp:1.35 Mon Jul 12 09:58:42 2010 +++ src/code/extfmts.lisp Tue Aug 3 22:56:36 2010 @@ -5,7 +5,7 @@ ;;; domain. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.35 2010-07-12 13:58:42 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/extfmts.lisp,v 1.36 2010-08-04 02:56:36 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -753,11 +753,15 @@ ;; illegal. So are codepoints that are too large. (if ,error (if (lisp::surrogatep code) - (funcall ,error - (format nil (intl:gettext "Surrogate codepoint #x~~4,'0X is illegal for ~A") - ,external-format) - code nil) - (funcall ,error (intl:gettext "Illegal codepoint on input: #x~X") code nil)) + (locally + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error + (format nil (intl:gettext "Surrogate codepoint #x~~4,'0X is illegal for ~A") + ,external-format) + code nil)) + (locally + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error (intl:gettext "Illegal codepoint on input: #x~X") code nil))) #-(and unicode (not unicode-bootstrap)) #\? #+(and unicode (not unicode-bootstrap)) #\U+FFFD)) #+unicode @@ -788,18 +792,22 @@ (,wryte (if (lisp::surrogatep (char-code ,nchar) :low) (surrogates-to-codepoint (car ,nstate) ,nchar) (if ,error - (funcall ,error - (intl:gettext "Cannot convert invalid surrogate #x~X to character") - ,nchar) + (locally + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error + (intl:gettext "Cannot convert invalid surrogate #x~X to character") + ,nchar)) +replacement-character-code+))) (setf (car ,nstate) nil)) ;; A lone trailing (low) surrogate gets replaced with ;; the replacement character. (,wryte (if (lisp::surrogatep (char-code ,nchar) :low) (if ,error - (funcall ,error - (intl:gettext "Cannot convert lone trailing surrogate #x~X to character") - ,nchar) + (locally + (declare (optimize (ext:inhibit-warnings 3))) + (funcall ,error + (intl:gettext "Cannot convert lone trailing surrogate #x~X to character") + ,nchar)) +replacement-character-code+) (char-code ,nchar)))))))))

1 0

[cmucl-cvs] CMUCL commit: cmucl-www/cmucl-www/www (index.html news/index.html)
by Raymond Toy 03 Aug '10

03 Aug '10

Date: Tuesday, August 3, 2010 @ 14:21:18 Author: rtoy Path: /project/cmucl/cvsroot/cmucl-www/cmucl-www/www Modified: index.html news/index.html Add news about the 20b prerelease 1 and 2010-08 snapshot (and lack thereof). -----------------+ index.html | 68 ++++++++++++++++++++++++++++++++++++++++++++++-------- news/index.html | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 9 deletions(-) Index: cmucl-www/cmucl-www/www/index.html diff -u cmucl-www/cmucl-www/www/index.html:1.9 cmucl-www/cmucl-www/www/index.html:1.10 --- cmucl-www/cmucl-www/www/index.html:1.9 Sat Jul 31 10:57:29 2010 +++ cmucl-www/cmucl-www/www/index.html Tue Aug 3 14:21:18 2010 @@ -68,17 +68,67 @@ Also see <a href="news/index.html">News</a> for older news. <dl> -<dt>2010-07 snapshot</dt> +<dt>2010-08 snapshot and 20b prerelease 1</dt> <dd> + CMUCL 20b prelease 1 has been released, in preparation for the + upcoming 20b release. Therefore there will not + be a 2010-08 snapshot. <ul> - <li> DELETE-FILE, ENSURE-DIRECTORIES-EXIST, FILE-AUTHOR, - FILE-WRITE-DATE, and OPEN now merge the given pathname with - *DEFAULT-PATHNAME-DEFAULTS* as required by CLHS sec 19.2.3. - </li> - <li> When printing out argument values in the debugger and also - during TRACE, the incorrect values were returned for the SSE2 core. - This was caused by using the x87 values instead of the sse2 values - in the sigcontext. This is fixed now. </li> + <li> Error handling has been added to external formats. Previously, + all external formats would silently replace bad encodings with a + suitable replacement character. Now, the user can specify how + the errors are handled by using the <tt>:DECODING-ERROR</tt> and + <tt>:ENCODING-ERROR</tt> parameters to <tt>OPEN</tt>. The default is the previous + behavior. + + For decoding-error, a character, symbol, or function + can be given. If a character, then that character is used as + the replacement character. For a symbol or function, it must be + a function of 3 arguments: a message string, the offending + octet (or nil), and the number of octets read in the encoding. + If the function returns, it must be the codepoint of the desired + replacement. + + For encoding-error, a character, symbol, or function can be + given. If a character, then that character is used as the + replacement character. For a symbol or function, it must be a + function of 2 arguments: a message string and the offending + codepoint. If the function returns, it must be the codepoint of + the desired replacement. + </li> + <li> Add <tt>EXT:LIST-ALL-EXTERNAL-FORMATS</tt> to list all known external + formats and their aliases. + </li> + <li> ADD <tt>EXT:DESCRIBE-EXTERNAL-FORMAT</tt> to print a description of the + specified exernal format. To support this, the macros + <tt>DEFINE-EXTERNAL-FORMAT</tt> and <tt>DEFINE-COMPOSING-EXTERNAL-FORMAT</tt> have + changed. + </li> + <li> The sparc port now supports the :executable feature.</li> + <li> The Mac OS X port now support the :executable feature.</li> + <li> A critical bug in the fast unicode stream buffering routine has + been fixed. This bug manifests itself by causing valid + sequences to be incorrectly decoded, resulting in a replacement + character. + <li> UTF-8 correctly catches overlong sequences now. Previously, + overlong sequences were missed. + <li> When UTF-8 decoder encounters an overlong sequence, a surrogate + code point, or a too-large codepoint, the entire sequence is + converted to the replacement character. Previously, all of the + octets except the first were put back, and the data read again. + <li> Some GC improvements for sparc and ppc. (Changes for ppc + untested). GC could incorrectly move the PC and other + registers, causing a segfault. + <li> A bug inadvertently introduced in the 2010-04 non-unicode + snapshot has been fixed. The bug prevented the non-unicode + versions of CMUCL from loading the external format aliases + file. + <li> With SSE2, the imaginary part of a (complex single-float) is now + returned correctly. + <li> The method used to create executable images for Linux has been + cleaned up and should be far more robust against different + versions of the OS. The same is true on sparc as well as Mac OS + X. </ul> </dd> </dl> Index: cmucl-www/cmucl-www/www/news/index.html diff -u cmucl-www/cmucl-www/www/news/index.html:1.35 cmucl-www/cmucl-www/www/news/index.html:1.36 --- cmucl-www/cmucl-www/www/news/index.html:1.35 Sat Jul 31 10:57:29 2010 +++ cmucl-www/cmucl-www/www/news/index.html Tue Aug 3 14:21:18 2010 @@ -11,6 +11,70 @@ <dl> +<dt>2010-08 snapshot and 20b prerelease 1</dt> +<dd> + CMUCL 20b prelease 1 has been released, in preparation for the + upcoming 20b release. Therefore there will not + be a 2010-08 snapshot. + <ul> + <li> Error handling has been added to external formats. Previously, + all external formats would silently replace bad encodings with a + suitable replacement character. Now, the user can specify how + the errors are handled by using the <tt>:DECODING-ERROR</tt> and + <tt>:ENCODING-ERROR</tt> parameters to <tt>OPEN</tt>. The default is the previous + behavior. + + For decoding-error, a character, symbol, or function + can be given. If a character, then that character is used as + the replacement character. For a symbol or function, it must be + a function of 3 arguments: a message string, the offending + octet (or nil), and the number of octets read in the encoding. + If the function returns, it must be the codepoint of the desired + replacement. + + For encoding-error, a character, symbol, or function can be + given. If a character, then that character is used as the + replacement character. For a symbol or function, it must be a + function of 2 arguments: a message string and the offending + codepoint. If the function returns, it must be the codepoint of + the desired replacement. + </li> + <li> Add <tt>EXT:LIST-ALL-EXTERNAL-FORMATS</tt> to list all known external + formats and their aliases. + </li> + <li> ADD <tt>EXT:DESCRIBE-EXTERNAL-FORMAT</tt> to print a description of the + specified exernal format. To support this, the macros + <tt>DEFINE-EXTERNAL-FORMAT</tt> and <tt>DEFINE-COMPOSING-EXTERNAL-FORMAT</tt> have + changed. + </li> + <li> The sparc port now supports the :executable feature.</li> + <li> The Mac OS X port now support the :executable feature.</li> + <li> A critical bug in the fast unicode stream buffering routine has + been fixed. This bug manifests itself by causing valid + sequences to be incorrectly decoded, resulting in a replacement + character. + <li> UTF-8 correctly catches overlong sequences now. Previously, + overlong sequences were missed. + <li> When UTF-8 decoder encounters an overlong sequence, a surrogate + code point, or a too-large codepoint, the entire sequence is + converted to the replacement character. Previously, all of the + octets except the first were put back, and the data read again. + <li> Some GC improvements for sparc and ppc. (Changes for ppc + untested). GC could incorrectly move the PC and other + registers, causing a segfault. + <li> A bug inadvertently introduced in the 2010-04 non-unicode + snapshot has been fixed. The bug prevented the non-unicode + versions of CMUCL from loading the external format aliases + file. + <li> With SSE2, the imaginary part of a (complex single-float) is now + returned correctly. + <li> The method used to create executable images for Linux has been + cleaned up and should be far more robust against different + versions of the OS. The same is true on sparc as well as Mac OS + X. + </ul> +</dd> + <dt>2010-07 snapshot</dt> <dd> <ul>

1 0

[cmucl-cvs] CMUCL commit: src/docs/cmu-user (.cvsignore)
by Raymond Toy 03 Aug '10

03 Aug '10

Date: Tuesday, August 3, 2010 @ 08:00:20 Author: rtoy Path: /project/cmucl/cvsroot/src/docs/cmu-user Modified: .cvsignore Ignore some more filess created from running tex and/or hevea. ------------+ .cvsignore | 6 ++++++ 1 file changed, 6 insertions(+) Index: src/docs/cmu-user/.cvsignore diff -u src/docs/cmu-user/.cvsignore:1.7 src/docs/cmu-user/.cvsignore:1.8 --- src/docs/cmu-user/.cvsignore:1.7 Wed Jun 30 12:42:43 2010 +++ src/docs/cmu-user/.cvsignore Tue Aug 3 08:00:19 2010 @@ -17,3 +17,9 @@ *.vnd cmu-user-html.tgz cmu-user-letter.ps +cmu-user.haux +cmu-user.hcnd +cmu-user.hfnd +cmu-user.htnd +cmu-user.htoc +cmu-user.hvnd

1 0

[cmucl-cvs] CMUCL commit: src/docs/cmu-user (extensions.tex)
by Raymond Toy 03 Aug '10

03 Aug '10

Date: Monday, August 2, 2010 @ 20:44:03 Author: rtoy Path: /project/cmucl/cvsroot/src/docs/cmu-user Modified: extensions.tex o Add entry for ld-library-path search-list. o Add documentation for static arrays. ----------------+ extensions.tex | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) Index: src/docs/cmu-user/extensions.tex diff -u src/docs/cmu-user/extensions.tex:1.46 src/docs/cmu-user/extensions.tex:1.47 --- src/docs/cmu-user/extensions.tex:1.46 Sat Jul 31 09:36:48 2010 +++ src/docs/cmu-user/extensions.tex Mon Aug 2 20:44:03 2010 @@ -1561,7 +1561,7 @@ variable). \item[\code{path:}] The Unix command path (\code{PATH} environment variable). -\item[\code{ld-library-path:}] The Unix \code{LD_LIBRARY_PATH} +\item[\code{ld-library-path:}] The Unix \code{LD\_LIBRARY\_PATH} environment variable. \item[\code{target:}] The root of the tree where \cmucl{} was compiled. \item[\code{modules:}] The list of directories where \cmucl{}'s @@ -3007,3 +3007,53 @@ gettext at \href{http://www.gnu.org/software/gettext/manual/gettext.html}{\texttt{http://www.gnu.org/software/gettext/manual/gettext.html}}. \fi + +\section{Static Arrays} +\label{sec:static-arrays} + +\cmucl{} supports static arrays which are arrays that are not moved by +the garbage collector. To create such an array, use the +\kwd{allocation} option to \code{make-array} with a value of +\kwd{malloc}. These arrays appear as normal Lisp arrays, but are +actually allocated from the \code{C} heap (hence the \kwd{malloc}). +Thus, the number and size of such arrays are limited by the available +\code{C} heap. + +Also, only certain types of arrays can be allocated. The static array +cannot be adjustable and cannot be displaced to. The array must also +be a \code{simple-array} of one dimension. The element type is also +constrained to be one of the types in +Table~\ref{tbl:static-array-types}. + +\begin{table}[tbhp] + \begin{center} + \begin{tabular}{|c|} + \hline + \code{(unsigned-byte 8)} \\ + \hline + \code{(unsigned-byte 16)} \\ + \hline + \code{(unsigned-byte 32)} \\ + \hline + \code{(signed-byte 8)} \\ + \hline + \code{(signed-byte 16)} \\ + \hline + \code{(signed-byte 32)} \\ + \hline + \code{single-float} \\ + \hline + \code{double-float} \\ + \hline + \code{(complex single-float)} \\ + \hline + \code{(complex double-float)} \\ + \hline + \end{tabular} + \caption{Allowed element types for static arrays} + \label{tbl:static-array-types} + \end{center} +\end{table} + +The arrays are properly handled by GC. GC will not move the arrays, +but they will be properly removed up if they become garbage.

1 0

[cmucl-cvs] CMUCL commit: src/docs/cmu-user (introduction.tex)
by Raymond Toy 03 Aug '10

03 Aug '10

Date: Monday, August 2, 2010 @ 20:42:46 Author: rtoy Path: /project/cmucl/cvsroot/src/docs/cmu-user Modified: introduction.tex o Update link to CL Hyperspec. o Document new -help and --help command line options. ------------------+ introduction.tex | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: src/docs/cmu-user/introduction.tex diff -u src/docs/cmu-user/introduction.tex:1.9 src/docs/cmu-user/introduction.tex:1.10 --- src/docs/cmu-user/introduction.tex:1.9 Tue Mar 10 21:19:27 2009 +++ src/docs/cmu-user/introduction.tex Mon Aug 2 20:42:46 2010 @@ -44,10 +44,10 @@ about \cmucl. Users will also need a separate manual describing the \clisp{} standard, for example, the \ifpdf -\href{http://www.xanalys.com/software_tools/reference/HyperSpec/FrontMatter/index-text.html} +\href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm} {Hyperspec}. \else -\emph{Hyperspec} at \href{http://www.xanalys.com/software_tools}{www.xanalys.com} +\emph{Hyperspec} at \href{http://www.lispworks.com/documentation/HyperSpec/Front/index.htm} \fi @@ -80,6 +80,10 @@ switches: \begin{Lentry} +\item[\code{--help}] Same as \code{-help}. + +\item[\code{-help}] Print ou the command line options and exit. + \item[\code{-batch}] specifies batch mode, where all input is directed from standard-input. An error code of 0 is returned upon encountering an EOF and 1 otherwise.

1 0

[cmucl-cvs] CMUCL commit: src/docs/cmu-user (3 files)
by Raymond Toy 03 Aug '10

03 Aug '10

Date: Monday, August 2, 2010 @ 19:56:18 Author: rtoy Path: /project/cmucl/cvsroot/src/docs/cmu-user Added: contents_motif.gif next_motif.gif previous_motif.gif Initial version. --------------------+ contents_motif.gif | <<Binary file>> next_motif.gif | <<Binary file>> previous_motif.gif | <<Binary file>> 3 files changed, 3 insertions(+) Index: src/docs/cmu-user/contents_motif.gif <<Binary file>> Index: src/docs/cmu-user/next_motif.gif <<Binary file>> Index: src/docs/cmu-user/previous_motif.gif <<Binary file>>

1 0

[cmucl-cvs] CMUCL commit: src/lisp (elf.c mach-o.c)
by Raymond Toy 02 Aug '10

02 Aug '10

Date: Monday, August 2, 2010 @ 17:59:43 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: elf.c mach-o.c More comment cleanups. ----------+ elf.c | 47 ++++++++++++++++++++++++----------------------- mach-o.c | 12 +++++++++--- 2 files changed, 33 insertions(+), 26 deletions(-) Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.28 src/lisp/elf.c:1.29 --- src/lisp/elf.c:1.28 Mon Aug 2 17:45:36 2010 +++ src/lisp/elf.c Mon Aug 2 17:59:43 2010 @@ -8,7 +8,7 @@ Above changes put into main CVS branch. 05-Jul-2007. - $Id: elf.c,v 1.28 2010-08-02 21:45:36 rtoy Exp $ + $Id: elf.c,v 1.29 2010-08-02 21:59:43 rtoy Exp $ */ #include <stdio.h> @@ -466,17 +466,18 @@ if (!strncmp(nambuf, section_names[j], 6)) { os_vm_address_t addr; /* - * On Solaris, the section header sets the addr - * field to 0 because the linker script says the - * sections are NOTE sections. Hence, we need to - * look up the section addresses ourselves. + * Found a core section. Map it! * - * For other systems, we don't care what the - * address is. We infer the address from the - * segment name. + * Although the segment may contain the correct + * address for the start of the segment, we don't + * care. We infer the address from the segment + * name. (The names better be unique!!!!) This + * approach allows for a possibly simpler linking + * operation because we don't have to figure out + * how to get the linker to give segments the + * correct address. */ addr = section_addr[j]; - /* Found a core section. Map it! */ if ((os_vm_address_t) os_map(exec_fd, sh.sh_offset, addr, sh.sh_size) == (os_vm_address_t) -1) { @@ -484,20 +485,20 @@ exit(-1); } switch(j) { - case 0: /* Dynamic space. */ - /* Dynamic space variables are set in lisp.c. */ - image_dynamic_space_size = sh.sh_size; - break; - case 1: /* Static space. */ - image_static_space_size = sh.sh_size; - break; - case 2: /* Read-only space. */ - image_read_only_space_size = sh.sh_size; - break; - default: - /* Should never get here. */ - abort(); - break; + case 0: /* Dynamic space. */ + /* Dynamic space variables are set in lisp.c. */ + image_dynamic_space_size = sh.sh_size; + break; + case 1: /* Static space. */ + image_static_space_size = sh.sh_size; + break; + case 2: /* Read-only space. */ + image_read_only_space_size = sh.sh_size; + break; + default: + /* Should never get here. */ + abort(); + break; } sections_remaining--; Index: src/lisp/mach-o.c diff -u src/lisp/mach-o.c:1.6 src/lisp/mach-o.c:1.7 --- src/lisp/mach-o.c:1.6 Mon Aug 2 17:45:36 2010 +++ src/lisp/mach-o.c Mon Aug 2 17:59:43 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.6 2010-08-02 21:45:36 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.7 2010-08-02 21:59:43 rtoy Exp $ * * This code was written by Raymond Toy as part of CMU Common Lisp and * has been placed in the public domain. @@ -413,11 +413,17 @@ #endif if (lc.cmd == LC_SEGMENT) { - /* Read the rest of the command, which is a segment command. */ + /* + * Got a segment command, so read the rest of the command so + * we can see if it's the segment for one of our Lisp + * spaces. + */ #ifdef DEBUG_MACH_O fprintf(stderr, "Reading next %ld bytes for SEGMENT\n", sizeof(sc) - sizeof(lc)); #endif + eread(exec_fd, &sc.segname, sizeof(sc) - sizeof(lc), __func__); + #ifdef DEBUG_MACH_O fprintf(stderr, "LC_SEGMENT: name = %s\n", sc.segname); #endif @@ -475,7 +481,7 @@ #endif elseek(exec_fd, lc.cmdsize - sizeof(sc), SEEK_CUR, __func__); } else { - /* Seek to the next command */ + /* Not a segment command, so seek to the next command */ #ifdef DEBUG_MACH_O fprintf(stderr, "Seeking by %ld bytes\n", lc.cmdsize - sizeof(lc)); #endif

1 0

[cmucl-cvs] CMUCL commit: src (4 files)
by Raymond Toy 02 Aug '10

02 Aug '10

Date: Monday, August 2, 2010 @ 17:45:36 Author: rtoy Path: /project/cmucl/cvsroot/src Modified: lisp/elf.c lisp/mach-o.c lisp/save.c tools/linker-x86.sh Let the linker remove the object files we created for the Lisp spaces. lisp/elf.c: lisp/mach-o.c: o Remove obj_cleanup function. lisp/save.c: o Don't call obj_cleanup anymore (because it doesn't exist.) toosl/linker-x86.sh: o Remove CORRO.o CORSTA.o CORDYN.o on exit. ---------------------+ lisp/elf.c | 16 +--------------- lisp/mach-o.c | 19 +------------------ lisp/save.c | 5 +---- tools/linker-x86.sh | 4 ++-- 4 files changed, 5 insertions(+), 39 deletions(-) Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.27 src/lisp/elf.c:1.28 --- src/lisp/elf.c:1.27 Mon Aug 2 02:03:49 2010 +++ src/lisp/elf.c Mon Aug 2 17:45:36 2010 @@ -8,7 +8,7 @@ Above changes put into main CVS branch. 05-Jul-2007. - $Id: elf.c,v 1.27 2010-08-02 06:03:49 rtoy Exp $ + $Id: elf.c,v 1.28 2010-08-02 21:45:36 rtoy Exp $ */ #include <stdio.h> @@ -313,20 +313,6 @@ return ret; } -void -obj_cleanup(const char *dirname) -{ - char filename[FILENAME_MAX + 1]; - int i; - - /* Get rid of lisp space files. */ - for(i = 0; i < 3; i++) { - /* Delete core space .o files. */ - sprintf(filename, "%s/%s.o", dirname, section_names[i]); - unlink(filename); - } -} - int obj_run_linker(long init_func_address, char *file) { Index: src/lisp/mach-o.c diff -u src/lisp/mach-o.c:1.5 src/lisp/mach-o.c:1.6 --- src/lisp/mach-o.c:1.5 Sun Aug 1 11:23:28 2010 +++ src/lisp/mach-o.c Mon Aug 2 17:45:36 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.5 2010-08-01 15:23:28 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/mach-o.c,v 1.6 2010-08-02 21:45:36 rtoy Exp $ * * This code was written by Raymond Toy as part of CMU Common Lisp and * has been placed in the public domain. @@ -281,23 +281,6 @@ } /* - * Remove the 3 space files that we created. - */ -void -obj_cleanup(const char *dirname) -{ - char filename[FILENAME_MAX + 1]; - int i; - - /* Get rid of lisp space files. */ - for(i = 0; i < 3; i++) { - /* Delete core space .o files. */ - sprintf(filename, "%s/%s.o", dirname, section_names[i]); - unlink(filename); - } -} - -/* * Link everything together to create the executable. */ int Index: src/lisp/save.c diff -u src/lisp/save.c:1.27 src/lisp/save.c:1.28 --- src/lisp/save.c:1.27 Fri Jul 30 20:03:23 2010 +++ src/lisp/save.c Mon Aug 2 17:45:36 2010 @@ -1,6 +1,6 @@ /* - $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.27 2010-07-31 00:03:23 rtoy Exp $ + $Header: /project/cmucl/cvsroot/src/lisp/save.c,v 1.28 2010-08-02 21:45:36 rtoy Exp $ This code was written as part of the CMU Common Lisp project at Carnegie Mellon University, and has been placed in the public domain. @@ -358,9 +358,6 @@ printf("Linking executable...\n"); fflush(stdout); obj_run_linker(init_function, filename); -#if 0 - obj_cleanup(dir_name); -#endif printf("done.\n"); exit(0); } Index: src/tools/linker-x86.sh diff -u src/tools/linker-x86.sh:1.8 src/tools/linker-x86.sh:1.9 --- src/tools/linker-x86.sh:1.8 Mon Aug 2 10:21:59 2010 +++ src/tools/linker-x86.sh Mon Aug 2 17:45:36 2010 @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: linker-x86.sh,v 1.8 2010-08-02 14:21:59 rtoy Exp $ +# $Id: linker-x86.sh,v 1.9 2010-08-02 21:45:36 rtoy Exp $ # This file written by Raymond Toy as part of CMU Common Lisp and is # placed in the public domain. @@ -114,7 +114,7 @@ esac # Remove the C file when we're done. -trap 'rm -f $OUTDIR/$OPT_IFADDR' 0 +trap 'rm -f $OUTDIR/$OPT_IFADDR $OUTDIR/CORRO.o $OUTDIR/CORSTA.o $OUTDIR/CORDYN.o' 0 (cd $OUTDIR echo "long initial_function_addr = $IFADDR;" > $OPT_IFADDR

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs