cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/tools (clean-target.sh)
by Raymond Toy 21 Dec '10

21 Dec '10

Date: Monday, December 20, 2010 @ 23:41:29 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Tag: cross-sol-x86-branch Modified: clean-target.sh Oops. Remove the set -x. -----------------+ clean-target.sh | 1 - 1 file changed, 1 deletion(-) Index: src/tools/clean-target.sh diff -u src/tools/clean-target.sh:1.9.8.1 src/tools/clean-target.sh:1.9.8.2 --- src/tools/clean-target.sh:1.9.8.1 Mon Dec 20 23:35:57 2010 +++ src/tools/clean-target.sh Mon Dec 20 23:41:29 2010 @@ -46,7 +46,6 @@ GREP="cat" CORE='-o -name "*.core"' -set -x if [ -n "$KEEP" ]; then case $KEEP in lib) GREP='egrep -v'

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/tools (clean-target.sh)
by Raymond Toy 21 Dec '10

21 Dec '10

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/tools (create-target.sh)
by Raymond Toy 21 Dec '10

21 Dec '10

Date: Monday, December 20, 2010 @ 18:41:16 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Tag: cross-sol-x86-branch Modified: create-target.sh Add support for Solaris/x86. ------------------+ create-target.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: src/tools/create-target.sh diff -u src/tools/create-target.sh:1.13 src/tools/create-target.sh:1.13.12.1 --- src/tools/create-target.sh:1.13 Mon Feb 1 21:45:54 2010 +++ src/tools/create-target.sh Mon Dec 20 18:41:15 2010 @@ -26,7 +26,12 @@ # Only target directory given. Try to deduce the lisp-variant TARGET_DIR="$1" case `uname -s` in - SunOS) LISP_VARIANT=sparc_gcc ;; + SunOS) + case `uname -m` in + i86pc) LISP_VARIANT=x86_solaris_sunc ;; + sun*) LISP_VARIANT=sparc_gcc ;; + esac + ;; Linux) LISP_VARIANT=x86_linux ;; Darwin) case `uname -m` in ppc) LISP_VARIANT=ppc_darwin ;; @@ -71,7 +76,7 @@ OpenBSD*) MOTIF_VARIANT=OpenBSD ;; *_darwin) MOTIF_VARIANT=Darwin ;; sun4_solaris_gcc|sparc_gcc) MOTIF_VARIANT=solaris ;; - sun4_solaris_sunc|sparc_sunc) MOTIF_VARIANT=solaris_sunc ;; + sun4_solaris_sunc|sparc_sunc|x86_solaris_sunc) MOTIF_VARIANT=solaris_sunc ;; sun4c*) MOTIF_VARIANT=sun4c_411 ;; hp700*) MOTIF_VARIANT=hpux_cc ;; pmax_mach) MOTIF_VARIANT=pmax_mach ;;

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/lisp (os-common.c)
by Raymond Toy 21 Dec '10

21 Dec '10

Date: Monday, December 20, 2010 @ 18:35:02 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: os-common.c Fix warning from SunStudio 12.2 about passing a void funtion to a void pointer. Cast to void pointer. -------------+ os-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/lisp/os-common.c diff -u src/lisp/os-common.c:1.32 src/lisp/os-common.c:1.32.2.1 --- src/lisp/os-common.c:1.32 Sat Dec 4 12:32:34 2010 +++ src/lisp/os-common.c Mon Dec 20 18:35:02 2010 @@ -1,6 +1,6 @@ /* - $Header: /project/cmucl/cvsroot/src/lisp/os-common.c,v 1.32 2010-12-04 17:32:34 rtoy Exp $ + $Header: /project/cmucl/cvsroot/src/lisp/os-common.c,v 1.32.2.1 2010-12-20 23:35:02 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. @@ -235,7 +235,7 @@ (char *) c_symbol_name); lose("First element of linkage_data is bogus.\n"); } - arch_make_linkage_entry(i, &resolve_linkage_tramp, 1); + arch_make_linkage_entry(i, (void *) &resolve_linkage_tramp, 1); #endif continue; }

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/lisp (gencgc.c)
by Raymond Toy 21 Dec '10

21 Dec '10

Date: Monday, December 20, 2010 @ 18:32:55 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: gencgc.c Get rid of compiler warnings (SunStudio 12.2/x86) about doing arithmetic with void pointers. Replace with char pointers. ----------+ gencgc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) Index: src/lisp/gencgc.c diff -u src/lisp/gencgc.c:1.110.6.4 src/lisp/gencgc.c:1.110.6.5 --- src/lisp/gencgc.c:1.110.6.4 Mon Dec 20 08:53:40 2010 +++ src/lisp/gencgc.c Mon Dec 20 18:32:55 2010 @@ -7,7 +7,7 @@ * * Douglas Crosher, 1996, 1997, 1998, 1999. * - * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110.6.4 2010-12-20 13:53:40 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110.6.5 2010-12-20 23:32:55 rtoy Exp $ * */ @@ -2906,9 +2906,9 @@ sniff_code_object(struct code *code, unsigned displacement) { int nheader_words, ncode_words, nwords; - void *p; - void *constants_start_addr, *constants_end_addr; - void *code_start_addr, *code_end_addr; + char *p; + char *constants_start_addr, *constants_end_addr; + char *code_start_addr, *code_end_addr; int fixup_found = 0; if (!check_code_fixups) @@ -2932,14 +2932,14 @@ nheader_words = HeaderValue(*(lispobj *) code); nwords = ncode_words + nheader_words; - constants_start_addr = (void *) code + 5 * sizeof(lispobj); - constants_end_addr = (void *) code + nheader_words * sizeof(lispobj); - code_start_addr = (void *) code + nheader_words * sizeof(lispobj); - code_end_addr = (void *) code + nwords * sizeof(lispobj); + constants_start_addr = (char *) code + 5 * sizeof(lispobj); + constants_end_addr = (char *) code + nheader_words * sizeof(lispobj); + code_start_addr = (char *) code + nheader_words * sizeof(lispobj); + code_end_addr = (char *) code + nwords * sizeof(lispobj); /* Work through the unboxed code. */ for (p = code_start_addr; p < code_end_addr; p++) { - void *data = *(void **) p; + char *data = *(char **) p; unsigned d1 = *((unsigned char *) p - 1); unsigned d2 = *((unsigned char *) p - 2); unsigned d3 = *((unsigned char *) p - 3); @@ -3113,8 +3113,8 @@ apply_code_fixups(struct code *old_code, struct code *new_code) { int nheader_words, ncode_words, nwords; - void *constants_start_addr, *constants_end_addr; - void *code_start_addr, *code_end_addr; + char *constants_start_addr, *constants_end_addr; + char *code_start_addr, *code_end_addr; lispobj fixups = NIL; unsigned long displacement = @@ -3141,10 +3141,10 @@ "*** Compiled code object at %x: header_words=%d code_words=%d .\n", new_code, nheader_words, ncode_words); #endif - constants_start_addr = (void *) new_code + 5 * sizeof(lispobj); - constants_end_addr = (void *) new_code + nheader_words * sizeof(lispobj); - code_start_addr = (void *) new_code + nheader_words * sizeof(lispobj); - code_end_addr = (void *) new_code + nwords * sizeof(lispobj); + constants_start_addr = (char *) new_code + 5 * sizeof(lispobj); + constants_end_addr = (char *) new_code + nheader_words * sizeof(lispobj); + code_start_addr = (char *) new_code + nheader_words * sizeof(lispobj); + code_end_addr = (char *) new_code + nwords * sizeof(lispobj); #if 0 fprintf(stderr, "*** Const. start = %x; end= %x; Code start = %x; end = %x\n",

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/lisp (solaris-os.c)
by Raymond Toy 20 Dec '10

20 Dec '10

Date: Monday, December 20, 2010 @ 17:11:53 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: solaris-os.c o Fix a compiler warning. o Get the correct data from the x87 FPU state for the control and status words. Unfortunately, it looks as if Solaris/x86 doesn't save the x87 state in the sigcontext. --------------+ solaris-os.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) Index: src/lisp/solaris-os.c diff -u src/lisp/solaris-os.c:1.26.4.5 src/lisp/solaris-os.c:1.26.4.6 --- src/lisp/solaris-os.c:1.26.4.5 Mon Dec 20 10:12:26 2010 +++ src/lisp/solaris-os.c Mon Dec 20 17:11:52 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.5 2010-12-20 15:12:26 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.6 2010-12-20 22:11:52 rtoy Exp $ * * OS-dependent routines. This file (along with os.h) exports an * OS-independent interface to the operating system VM facilities. @@ -566,7 +566,7 @@ } #ifdef FEATURE_SSE2 else { - reg = &fpregs->fp_reg_set.fpchip_state.xmm[offset - 8]; + reg = (unsigned char*) &fpregs->fp_reg_set.fpchip_state.xmm[offset - 8]; } #endif @@ -583,13 +583,15 @@ fpr = &scp->uc_mcontext.fpregs; - state = fpr->fp_reg_set.fpchip_state.state[0]; - - cw = state & 0xffff; - sw = (state >> 16) & 0xffff; + cw = fpr->fp_reg_set.fpchip_state.state[0] & 0xffff; + sw = fpr->fp_reg_set.fpchip_state.state[1] & 0xffff; modes = ((cw & 0x3f) << 7) | (sw & 0x3f); + DPRINTF(0, (stderr, "cw = 0x%04x\n", cw)); + DPRINTF(0, (stderr, "sw = 0x%04x\n", sw)); + DPRINTF(0, (stderr, "modes = 0x%08x\n", modes)); + #ifdef FEATURE_SSE2 /* * Add in the SSE2 part, if we're running the sse2 core.

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/code (float-trap.lisp)
by Raymond Toy 20 Dec '10

20 Dec '10

Date: Monday, December 20, 2010 @ 17:08:45 Author: rtoy Path: /project/cmucl/cvsroot/src/code Tag: cross-sol-x86-branch Modified: float-trap.lisp It looks like the sigcontext on solaris/x86 doesn't store the entire x87 state, so just signal a general arithemtic error instead of an error about a SIGFPE but no exceptions. -----------------+ float-trap.lisp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) Index: src/code/float-trap.lisp diff -u src/code/float-trap.lisp:1.38 src/code/float-trap.lisp:1.38.8.1 --- src/code/float-trap.lisp:1.38 Tue Apr 20 13:57:44 2010 +++ src/code/float-trap.lisp Mon Dec 20 17:08:45 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/float-trap.lisp,v 1.38 2010-04-20 17:57:44 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/code/float-trap.lisp,v 1.38.8.1 2010-12-20 22:08:45 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -290,6 +290,13 @@ :operation fop :operands operands)) (t + ;; It looks like the sigcontext on Solaris/x86 doesn't + ;; actually save the status word of the FPU. The + ;; operands also seem to be missing. Signal a general + ;; arithmetic error. + #+solaris + (error 'arithmetic-error :operands operands) + #-solaris (error (intl:gettext "SIGFPE with no exceptions currently enabled?"))))))) ;;; WITH-FLOAT-TRAPS-MASKED -- Public

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/lisp (solaris-os.c)
by Raymond Toy 20 Dec '10

20 Dec '10

Date: Monday, December 20, 2010 @ 10:12:26 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: solaris-os.c Add implementation of os_sigcontext_fpu_reg. Tested to work with SSE2. X87 not yet tested. --------------+ solaris-os.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) Index: src/lisp/solaris-os.c diff -u src/lisp/solaris-os.c:1.26.4.4 src/lisp/solaris-os.c:1.26.4.5 --- src/lisp/solaris-os.c:1.26.4.4 Sun Dec 19 23:17:28 2010 +++ src/lisp/solaris-os.c Mon Dec 20 10:12:26 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.4 2010-12-20 04:17:28 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.5 2010-12-20 15:12:26 rtoy Exp $ * * OS-dependent routines. This file (along with os.h) exports an * OS-independent interface to the operating system VM facilities. @@ -541,6 +541,38 @@ return (unsigned long *) &scp->uc_mcontext.gregs[EIP]; } + +unsigned char * +os_sigcontext_fpu_reg(ucontext_t *scp, int offset) +{ + fpregset_t *fpregs = &scp->uc_mcontext.fpregs; + unsigned char *reg = NULL; + + if (offset < 8) { + unsigned char *fpustate; + unsigned char *stregs; + + /* + * Not sure this is right. There is no structure defined for + * the x87 fpu state in /usr/include/sys/regset.h + */ + + /* Point to the fpchip_state */ + fpustate = (unsigned char*) &fpregs->fp_reg_set.fpchip_state.state[0]; + /* Skip to where the x87 fp registers are */ + stregs = fpustate + 24; + + reg = stregs + 16*offset; + } +#ifdef FEATURE_SSE2 + else { + reg = &fpregs->fp_reg_set.fpchip_state.xmm[offset - 8]; + } +#endif + + return reg; +} + unsigned int os_sigcontext_fpu_modes(ucontext_t *scp) {

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/lisp (gencgc.c)
by Raymond Toy 20 Dec '10

20 Dec '10

Date: Monday, December 20, 2010 @ 08:53:40 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: gencgc.c Oops. We should check that closure->function is not zero. ----------+ gencgc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/lisp/gencgc.c diff -u src/lisp/gencgc.c:1.110.6.3 src/lisp/gencgc.c:1.110.6.4 --- src/lisp/gencgc.c:1.110.6.3 Mon Dec 20 08:25:22 2010 +++ src/lisp/gencgc.c Mon Dec 20 08:53:40 2010 @@ -7,7 +7,7 @@ * * Douglas Crosher, 1996, 1997, 1998, 1999. * - * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110.6.3 2010-12-20 13:25:22 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110.6.4 2010-12-20 13:53:40 rtoy Exp $ * */ @@ -3462,7 +3462,7 @@ * (Previously, we'd get a segfault scavenging the object at * address -RAW_ADDR_OFFSET. */ - if (fun) { + if (closure->function) { scavenge(&fun, 1); /* * The function may have moved so update the raw address. But don't

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/pcl (cmucl-documentation.lisp)
by Raymond Toy 20 Dec '10

20 Dec '10

Date: Monday, December 20, 2010 @ 08:40:22 Author: rtoy Path: /project/cmucl/cvsroot/src/pcl Tag: cross-sol-x86-branch Modified: cmucl-documentation.lisp Merge fix from HEAD branch. --------------------------+ cmucl-documentation.lisp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/pcl/cmucl-documentation.lisp diff -u src/pcl/cmucl-documentation.lisp:1.17 src/pcl/cmucl-documentation.lisp:1.17.8.1 --- src/pcl/cmucl-documentation.lisp:1.17 Fri Mar 19 11:19:03 2010 +++ src/pcl/cmucl-documentation.lisp Mon Dec 20 08:40:22 2010 @@ -4,7 +4,7 @@ ;;; the public domain, and is provided 'as is'. (file-comment - "$Header: /project/cmucl/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.17 2010-03-19 15:19:03 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.17.8.1 2010-12-20 13:40:22 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -222,7 +222,7 @@ `(defmethod documentation :around ((x t) (doc-type (eql ',dt))) (let ((doc (call-next-method)) (domain (info ,dt :textdomain x))) - (or (intl:dgettext domain doc) + (or (and doc (intl:dgettext domain doc)) doc))))) (frob function) (frob setf)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs