- cmucl-cvs - mailman3.common-lisp.net

[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 02 Aug '10

02 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

[cmucl-cvs] CMUCL commit: src/tools (linker-x86.sh)
by Raymond Toy 02 Aug '10

02 Aug '10

Date: Monday, August 2, 2010 @ 10:21:59 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Modified: linker-x86.sh Should work with gcc too. A simple test indicates that the given compiler options will work with gcc and produce a working executable. ---------------+ linker-x86.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Index: src/tools/linker-x86.sh diff -u src/tools/linker-x86.sh:1.7 src/tools/linker-x86.sh:1.8 --- src/tools/linker-x86.sh:1.7 Sun Aug 1 11:23:28 2010 +++ src/tools/linker-x86.sh Mon Aug 2 10:21:59 2010 @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: linker-x86.sh,v 1.7 2010-08-01 15:23:28 rtoy Exp $ +# $Id: linker-x86.sh,v 1.8 2010-08-02 14:21:59 rtoy Exp $ # This file written by Raymond Toy as part of CMU Common Lisp and is # placed in the public domain. @@ -91,10 +91,12 @@ OS_LIBS= ;; SunOS*) - if [ "$CCOMPILER" != "cc" ]; then - echo Using $CCOMPILER is not currently supported - exit 1 - fi + # A quick test indicates that gcc will accept the following + # options too, so this will work whether we have Sun C or gcc. + # Note, that this probably only works if gcc uses Sun ld and not + # GNU ld. Most (all?) prebuilt versions of gcc for Solaris use + # Sun ld. + # We don't need anything special to set the starting address. # map_core_sections does that for us on sparc.

1 0

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

02 Aug '10

Date: Monday, August 2, 2010 @ 02:03:49 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: elf.c Add a comment. -------+ elf.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.26 src/lisp/elf.c:1.27 --- src/lisp/elf.c:1.26 Sun Aug 1 23:58:59 2010 +++ src/lisp/elf.c Mon Aug 2 02:03:49 2010 @@ -8,7 +8,7 @@ Above changes put into main CVS branch. 05-Jul-2007. - $Id: elf.c,v 1.26 2010-08-02 03:58:59 agoncharov Exp $ + $Id: elf.c,v 1.27 2010-08-02 06:03:49 rtoy Exp $ */ #include <stdio.h> @@ -479,7 +479,16 @@ for (j = 0; j < 3; j++) { 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. + * + * For other systems, we don't care what the + * address is. We infer the address from the + * segment name. + */ addr = section_addr[j]; /* Found a core section. Map it! */ if ((os_vm_address_t) os_map(exec_fd, sh.sh_offset,

1 0

[cmucl-cvs] Testing
by Raymond Toy 01 Aug '10

01 Aug '10

testing

1 0

[cmucl-cvs] testing
by Raymond Toy 01 Aug '10

01 Aug '10

testing

1 0