cmucl-cvs December 2010

cmucl-cvs@common-lisp.net

2 participants
72 discussions

[cmucl-cvs] CMUCL commit: src/lisp (x86-lispregs.h)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Thursday, December 23, 2010 @ 17:56:26 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: x86-lispregs.h Add implementation of SC_EFLAGS for Solaris/x86, but disable for now because it makes breakpoints not work for some reason. ----------------+ x86-lispregs.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) Index: src/lisp/x86-lispregs.h diff -u src/lisp/x86-lispregs.h:1.14 src/lisp/x86-lispregs.h:1.15 --- src/lisp/x86-lispregs.h:1.14 Thu Dec 23 17:23:48 2010 +++ src/lisp/x86-lispregs.h Thu Dec 23 17:56:26 2010 @@ -1,5 +1,5 @@ /* x86-lispregs.h -*- Mode: C; -*- - * $Header: /project/cmucl/cvsroot/src/lisp/x86-lispregs.h,v 1.14 2010-12-23 22:23:48 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-lispregs.h,v 1.15 2010-12-23 22:56:26 rtoy Exp $ */ #ifndef _X86_LISPREGS_H_ @@ -60,6 +60,14 @@ #define SC_EFLAGS(sc) ((sc)->uc_mcontext.gregs[REG_EFL]) #elif defined(__NetBSD__) #define SC_EFLAGS(sc) ((sc)->uc_mcontext.__gregs[_REG_EFL]) +#elif defined(SOLARIS) +/* + * Solaris/x86 has access the the eflags value, but this doesn't + * currently work. Some more work needs to be done in x86-arch.c to + * make this work. But the default code there works fine on + * Solaris/x86. + */ +/* #define SC_EFLAGS(sc) ((sc)->uc_mcontext.gregs[EFL])*/ #endif #endif /* _X86_LISPREGS_H_ */

1 0

[cmucl-cvs] CMUCL commit: src/lisp (x86-arch.c)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Thursday, December 23, 2010 @ 17:55:31 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: x86-arch.c Fix typo. ------------+ x86-arch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: src/lisp/x86-arch.c diff -u src/lisp/x86-arch.c:1.41 src/lisp/x86-arch.c:1.42 --- src/lisp/x86-arch.c:1.41 Thu Dec 23 17:23:48 2010 +++ src/lisp/x86-arch.c Thu Dec 23 17:55:31 2010 @@ -1,6 +1,6 @@ /* x86-arch.c -*- Mode: C; comment-column: 40 -*- * - * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.41 2010-12-23 22:23:48 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.42 2010-12-23 22:55:31 rtoy Exp $ * */ @@ -250,7 +250,7 @@ * single-stepping and stop on the next instruction. */ - DFPRINTF(0, (stderr, "Installing helper instructions\n")); + DPRINTF(0, (stderr, "Installing helper instructions\n")); single_step_save1 = *(pc - 3); single_step_save2 = *(pc - 2); @@ -268,7 +268,7 @@ * the helper. */ - DFPRINTF(0, (stderr, " Setting pc to pushf instruction at %p\n", (void*) ((char*) pc - 9))); + DPRINTF(0, (stderr, " Setting pc to pushf instruction at %p\n", (void*) ((char*) pc - 9))); SC_PC(context) = (int)((char *) pc - 9); #endif } @@ -298,7 +298,7 @@ *(single_stepping - 3) = single_step_save1; *(single_stepping - 2) = single_step_save2; *(single_stepping - 1) = single_step_save3; - DFPRINTF(0, (stderr, "Uninstalling helper instructions\n")); + DPRINTF(0, (stderr, "Uninstalling helper instructions\n")); #endif /*

1 0

[cmucl-cvs] CMUCL commit: src/lisp (x86-arch.c x86-lispregs.h)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Thursday, December 23, 2010 @ 17:23:48 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: x86-arch.c x86-lispregs.h Fix tracing for NetBSD. Function end breakpoints didn't seem to be working when tracing, for example (declaim (ftype (function (double-float) double-float) fact)) (defun fact (x) (declare (double-float x)) (if (= x 1) 1d0 (* x (fact (1- x))))) lisp/x86-lispregs.h o NetBSD has access to the eflags register lisp/x86-arch.c: o Add some debugging prints (disabled). o The stuff near line 262 about pc-9 pointing to the pushf instruction should be conditioned on SC_EFLAGS because that's what decides whether we insert the pushf instructions for single stepping. ----------------+ x86-arch.c | 12 ++++++++---- x86-lispregs.h | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) Index: src/lisp/x86-arch.c diff -u src/lisp/x86-arch.c:1.40 src/lisp/x86-arch.c:1.41 --- src/lisp/x86-arch.c:1.40 Tue Dec 21 21:12:52 2010 +++ src/lisp/x86-arch.c Thu Dec 23 17:23:48 2010 @@ -1,6 +1,6 @@ /* x86-arch.c -*- Mode: C; comment-column: 40 -*- * - * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.40 2010-12-22 02:12:52 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.41 2010-12-23 22:23:48 rtoy Exp $ * */ @@ -250,6 +250,8 @@ * single-stepping and stop on the next instruction. */ + DFPRINTF(0, (stderr, "Installing helper instructions\n")); + single_step_save1 = *(pc - 3); single_step_save2 = *(pc - 2); single_step_save3 = *(pc - 1); @@ -260,12 +262,13 @@ single_stepping = (unsigned int *) pc; -#if !(defined(__linux__) || defined(DARWIN)) +#ifndef SC_EFLAGS /* * pc - 9 points to the pushf instruction that we installed for * the helper. */ + DFPRINTF(0, (stderr, " Setting pc to pushf instruction at %p\n", (void*) ((char*) pc - 9))); SC_PC(context) = (int)((char *) pc - 9); #endif } @@ -277,8 +280,8 @@ unsigned int trap; #if 0 - fprintf(stderr, "x86sigtrap: %8x %x\n", - SC_PC(context), *(unsigned char *) (SC_PC(context) - 1)); + fprintf(stderr, "x86sigtrap: %8x %x\n", + SC_PC(context), *(unsigned char *) (SC_PC(context) - 1)); fprintf(stderr, "sigtrap(%d %d %x)\n", signal, CODE(code), context); #endif @@ -295,6 +298,7 @@ *(single_stepping - 3) = single_step_save1; *(single_stepping - 2) = single_step_save2; *(single_stepping - 1) = single_step_save3; + DFPRINTF(0, (stderr, "Uninstalling helper instructions\n")); #endif /* Index: src/lisp/x86-lispregs.h diff -u src/lisp/x86-lispregs.h:1.13 src/lisp/x86-lispregs.h:1.14 --- src/lisp/x86-lispregs.h:1.13 Mon Dec 29 09:40:34 2008 +++ src/lisp/x86-lispregs.h Thu Dec 23 17:23:48 2010 @@ -1,5 +1,5 @@ /* x86-lispregs.h -*- Mode: C; -*- - * $Header: /project/cmucl/cvsroot/src/lisp/x86-lispregs.h,v 1.13 2008-12-29 14:40:34 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-lispregs.h,v 1.14 2010-12-23 22:23:48 rtoy Exp $ */ #ifndef _X86_LISPREGS_H_ @@ -58,6 +58,8 @@ #endif #elif defined(__linux__) #define SC_EFLAGS(sc) ((sc)->uc_mcontext.gregs[REG_EFL]) +#elif defined(__NetBSD__) +#define SC_EFLAGS(sc) ((sc)->uc_mcontext.__gregs[_REG_EFL]) #endif #endif /* _X86_LISPREGS_H_ */

1 0

[cmucl-cvs] CMUCL commit: src/lisp (NetBSD-os.c)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Thursday, December 23, 2010 @ 12:38:05 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: NetBSD-os.c o Oops. We want the xmm registers if index >= 8. o Add some debugging prints. -------------+ NetBSD-os.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: src/lisp/NetBSD-os.c diff -u src/lisp/NetBSD-os.c:1.17 src/lisp/NetBSD-os.c:1.18 --- src/lisp/NetBSD-os.c:1.17 Wed Dec 22 23:50:02 2010 +++ src/lisp/NetBSD-os.c Thu Dec 23 12:38:05 2010 @@ -15,7 +15,7 @@ * Frobbed for OpenBSD by Pierre R. Mai, 2001. * Frobbed for NetBSD by Pierre R. Mai, 2002. * - * $Header: /project/cmucl/cvsroot/src/lisp/NetBSD-os.c,v 1.17 2010-12-23 04:50:02 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/NetBSD-os.c,v 1.18 2010-12-23 17:38:05 rtoy Exp $ * */ @@ -89,6 +89,8 @@ { unsigned char *reg = NULL; + DPRINTF(0, (stderr, "fpu reg index = %d\n", index)); + if (scp->uc_flags & _UC_FPU) { if (scp->uc_flags & _UC_FXSAVE) { /* @@ -99,10 +101,12 @@ * start of the array, and each XMM register is 16 bytes * long. */ - if (index < 8) { + if (index >= 8) { reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm[160 + 16*(index - 8)]; + DPRINTF(0, (stderr, " sse2 = %g\n", (double) *(double*) reg)); } else { reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm[32 + 16*index]; + DPRINTF(0, (stderr, " sse2 x87 = %g\n", (double) *(long double*) reg)); } } else { @@ -112,6 +116,7 @@ * each. */ reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fpchip_state.__fp_state[28 + 10*index]; + DPRINTF(0, (stderr, " x87 = %g\n", (double) *(long double*) reg)); } } else { reg = NULL;

1 0

[cmucl-cvs] CMUCL commit: src/lisp (NetBSD-os.c)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Wednesday, December 22, 2010 @ 23:50:03 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: NetBSD-os.c Fix os_sigcontext_fpu_reg to return the correct address for SSE2 registers. This works. We also try to get the correct data for the x87 registers, but this is not tested. -------------+ NetBSD-os.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) Index: src/lisp/NetBSD-os.c diff -u src/lisp/NetBSD-os.c:1.16 src/lisp/NetBSD-os.c:1.17 --- src/lisp/NetBSD-os.c:1.16 Sun Jun 27 11:14:54 2010 +++ src/lisp/NetBSD-os.c Wed Dec 22 23:50:02 2010 @@ -15,7 +15,7 @@ * Frobbed for OpenBSD by Pierre R. Mai, 2001. * Frobbed for NetBSD by Pierre R. Mai, 2002. * - * $Header: /project/cmucl/cvsroot/src/lisp/NetBSD-os.c,v 1.16 2010-06-27 15:14:54 rswindells Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/NetBSD-os.c,v 1.17 2010-12-23 04:50:02 rtoy Exp $ * */ @@ -91,9 +91,27 @@ if (scp->uc_flags & _UC_FPU) { if (scp->uc_flags & _UC_FXSAVE) { - reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm[index]; + /* + * fp_xmm is an array of bytes in the format of the FXSAVE + * instruction. The x87 registers are at offset 32 from + * the start and each entry takes 16 bytes (only 10 + * needed). The XMM registers are at offset 160 from the + * start of the array, and each XMM register is 16 bytes + * long. + */ + if (index < 8) { + reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm[160 + 16*(index - 8)]; + } else { + reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm[32 + 16*index]; + } + } else { - reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fpchip_state.__fp_state[index]; + /* + * In this case, we have the FNSAVE format. The x87 + * registers are located at offset 28 and take 10 bytes + * each. + */ + reg = &scp->uc_mcontext.__fpregs.__fp_reg_set.__fpchip_state.__fp_state[28 + 10*index]; } } else { reg = NULL;

1 0

[cmucl-cvs] CMUCL commit: src/lisp (Config.x86_netbsd elf.c lisp.c)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Wednesday, December 22, 2010 @ 22:20:27 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: Config.x86_netbsd elf.c lisp.c Add support for NetBSD for the new executable image implementation. lisp/Config_x86_netbsd: o Define EXEC_FINAL_OBJ, like other x86 ports. lisp/elf.c: o Use the new linker.sh command script to link the executable. lisp/lisp.c: o Use new method of getting the initial_function. -------------------+ Config.x86_netbsd | 2 ++ elf.c | 4 ++-- lisp.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) Index: src/lisp/Config.x86_netbsd diff -u src/lisp/Config.x86_netbsd:1.1 src/lisp/Config.x86_netbsd:1.2 --- src/lisp/Config.x86_netbsd:1.1 Thu Sep 17 12:59:53 2009 +++ src/lisp/Config.x86_netbsd Wed Dec 22 22:20:27 2010 @@ -5,3 +5,5 @@ OS_SRC += NetBSD-os.c elf.c OS_LINK_FLAGS = -dynamic -export-dynamic OS_LIBS = + +EXEC_FINAL_OBJ = exec-final.o Index: src/lisp/elf.c diff -u src/lisp/elf.c:1.31 src/lisp/elf.c:1.32 --- src/lisp/elf.c:1.31 Wed Dec 22 15:16:29 2010 +++ src/lisp/elf.c Wed Dec 22 22:20:27 2010 @@ -8,7 +8,7 @@ Above changes put into main CVS branch. 05-Jul-2007. - $Id: elf.c,v 1.31 2010-12-22 20:16:29 rtoy Exp $ + $Id: elf.c,v 1.32 2010-12-23 03:20:27 rtoy Exp $ */ #include <stdio.h> @@ -361,7 +361,7 @@ free(paths); printf("\t[%s: linking %s... \n", command, file); fflush(stdout); -#if defined(__linux__) || defined(__FreeBSD__) || defined(SOLARIS) +#if defined(__linux__) || defined(__FreeBSD__) || defined(SOLARIS) || defined(__NetBSD__) sprintf(command_line, "%s %s 0x%lx '%s' 0x%lx 0x%lx 0x%lx", command, C_COMPILER, init_func_address, file, (unsigned long) READ_ONLY_SPACE_START, Index: src/lisp/lisp.c diff -u src/lisp/lisp.c:1.79 src/lisp/lisp.c:1.80 --- src/lisp/lisp.c:1.79 Wed Dec 22 21:14:57 2010 +++ src/lisp/lisp.c Wed Dec 22 22:20:27 2010 @@ -1,7 +1,7 @@ /* * main() entry point for a stand alone lisp image. * - * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.79 2010-12-23 02:14:57 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.80 2010-12-23 03:20:27 rtoy Exp $ * */ @@ -452,7 +452,7 @@ lispobj initial_function = 0; if (builtin_image_flag != 0) { -#if defined(SOLARIS) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) +#if defined(SOLARIS) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__) || defined(__NetBSD__))) initial_function = (lispobj) initial_function_addr; #else initial_function = (lispobj) & initial_function_addr;

1 0

[cmucl-cvs] CMUCL commit: src/tools (make-dist.sh)
by Raymond Toy 23 Dec '10

23 Dec '10

Date: Wednesday, December 22, 2010 @ 22:17:43 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Modified: make-dist.sh Recognize NetBSD defaults. --------------+ make-dist.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Index: src/tools/make-dist.sh diff -u src/tools/make-dist.sh:1.18 src/tools/make-dist.sh:1.19 --- src/tools/make-dist.sh:1.18 Tue Dec 21 21:12:52 2010 +++ src/tools/make-dist.sh Wed Dec 22 22:17:43 2010 @@ -9,7 +9,7 @@ # you extracted the two tarballs and the source distribution into that # directory. # -# $Header: /project/cmucl/cvsroot/src/tools/make-dist.sh,v 1.18 2010-12-22 02:12:52 rtoy Exp $ +# $Header: /project/cmucl/cvsroot/src/tools/make-dist.sh,v 1.19 2010-12-23 03:17:43 rtoy Exp $ usage() { echo "make-dist.sh: [-hbg] [-G group] [-O owner] [-I destdir] [-M mandir] dir version [arch os]" @@ -75,7 +75,10 @@ case `uname -m` in i386) ARCH=x86 ;; *) ARCH=ppc ;; - esac + esac ;; + NetBSD) + ARCH=x86 + OS=netbsd esac }

1 0

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

23 Dec '10

Date: Wednesday, December 22, 2010 @ 22:16:56 Author: rtoy Path: /project/cmucl/cvsroot/src/tools Modified: linker.sh Support NetBSD. -----------+ linker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/tools/linker.sh diff -u src/tools/linker.sh:1.15 src/tools/linker.sh:1.16 --- src/tools/linker.sh:1.15 Wed Sep 8 08:06:23 2010 +++ src/tools/linker.sh Wed Dec 22 22:16:56 2010 @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: linker.sh,v 1.15 2010-09-08 12:06:23 rtoy Rel $ +# $Id: linker.sh,v 1.16 2010-12-23 03:16:56 rtoy Exp $ # This file written by Raymond Toy as part of CMU Common Lisp and is # placed in the public domain. @@ -49,7 +49,7 @@ uname_s=`uname` case $uname_s in - Linux|FreeBSD) + Linux|FreeBSD|NetBSD) # How to specify the starting address for each of the sections # These aren't needed for Linux any more. map_core_sections # takes care of getting the addresses.

1 0

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

23 Dec '10

Date: Wednesday, December 22, 2010 @ 21:14:57 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: lisp.c Solaris/sparc and Solaris/x86 both use the same executable style so get the initial_function from the initial_function_addr, not the address of initial_function_addr. --------+ lisp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/lisp/lisp.c diff -u src/lisp/lisp.c:1.78 src/lisp/lisp.c:1.79 --- src/lisp/lisp.c:1.78 Sun Sep 26 16:38:45 2010 +++ src/lisp/lisp.c Wed Dec 22 21:14:57 2010 @@ -1,7 +1,7 @@ /* * main() entry point for a stand alone lisp image. * - * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.78 2010-09-26 20:38:45 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/lisp.c,v 1.79 2010-12-23 02:14:57 rtoy Exp $ * */ @@ -452,7 +452,7 @@ lispobj initial_function = 0; if (builtin_image_flag != 0) { -#if defined(sparc) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) +#if defined(SOLARIS) || (defined(i386) && (defined(__linux__) || defined(DARWIN) || defined(__FreeBSD__))) initial_function = (lispobj) initial_function_addr; #else initial_function = (lispobj) & initial_function_addr;

1 0

[cmucl-cvs] CMUCL commit: src/lisp (elf.h)
by Raymond Toy 22 Dec '10

22 Dec '10

Date: Wednesday, December 22, 2010 @ 15:17:24 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: elf.h Update conditionals so we choose the correct compiler for Solaris/x86 (where we only support Sun C now). -------+ elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: src/lisp/elf.h diff -u src/lisp/elf.h:1.15 src/lisp/elf.h:1.16 --- src/lisp/elf.h:1.15 Wed Sep 8 08:06:23 2010 +++ src/lisp/elf.h Wed Dec 22 15:17:24 2010 @@ -1,4 +1,4 @@ -/* $Id: elf.h,v 1.15 2010-09-08 12:06:23 rtoy Rel $ */ +/* $Id: elf.h,v 1.16 2010-12-22 20:17:24 rtoy Exp $ */ /* This code was written by Fred Gilham and has been placed in the public domain. It is provided "AS-IS" and without warranty of any kind. @@ -32,7 +32,7 @@ * is used everywhere, except on Solaris/sparc, where we can use * either gcc or Sun C. */ -#if defined(__SUNPRO_C) && defined(__sparc) +#if defined(__SUNPRO_C) #define C_COMPILER "cc" #else #define C_COMPILER "gcc"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs December 2010