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

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

18 Dec '10

Date: Saturday, December 18, 2010 @ 11:19:40 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: solaris-os.c Add function real_segv_handler to handle "real protection" violations. Useful for debugging so we can easily stop in such cases. --------------+ solaris-os.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) Index: src/lisp/solaris-os.c diff -u src/lisp/solaris-os.c:1.26.4.2 src/lisp/solaris-os.c:1.26.4.3 --- src/lisp/solaris-os.c:1.26.4.2 Wed Dec 15 07:45:51 2010 +++ src/lisp/solaris-os.c Sat Dec 18 11:19:39 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.2 2010-12-15 12:45:51 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.3 2010-12-18 16:19:39 rtoy Exp $ * * OS-dependent routines. This file (along with os.h) exports an * OS-independent interface to the operating system VM facilities. @@ -211,6 +211,11 @@ interrupt_handle_now(signal, code, context); } +void real_segv_handler(HANDLER_ARGS) +{ + segv_handle_now(signal, code, context); +} + void segv_handler(HANDLER_ARGS) { @@ -265,7 +270,7 @@ fprintf(stderr, "segv_handler: Real protection violation: %p, PC = %p\n", addr, context->uc_mcontext.gregs[1]); - segv_handle_now(signal, code, context); + real_segv_handler(signal, code, context); } #else void

1 0

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

18 Dec '10

Date: Saturday, December 18, 2010 @ 11:16:48 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Modified: x86-validate.h On Darwin, SIGSTKSZ is 128K, not 8K like on most other systems. Adjust the CONTROL_STACK_SIZE and SIGNAL_STACK_START appropriately. ----------------+ x86-validate.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) Index: src/lisp/x86-validate.h diff -u src/lisp/x86-validate.h:1.31 src/lisp/x86-validate.h:1.32 --- src/lisp/x86-validate.h:1.31 Fri May 21 15:26:53 2010 +++ src/lisp/x86-validate.h Sat Dec 18 11:16:47 2010 @@ -3,7 +3,7 @@ * This code was written as part of the CMU Common Lisp project at * Carnegie Mellon University, and has been placed in the public domain. * - * $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.31 2010-05-21 19:26:53 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.32 2010-12-18 16:16:47 rtoy Exp $ * */ @@ -132,10 +132,21 @@ #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ #define CONTROL_STACK_START (0x40000000) +#if defined(DARWIN) +/* + * According to /usr/include/sys/signal.h, MINSIGSTKSZ is 32K and + * SIGSTKSZ is 128K. We should account for that appropriately. + */ +#define CONTROL_STACK_SIZE (0x07fdf000) /* 128MB - SIGSTKSZ - 1 page */ + +#define SIGNAL_STACK_START (0x47fe0000) /* One page past the end of the control stack */ +#define SIGNAL_STACK_SIZE SIGSTKSZ +#else #define CONTROL_STACK_SIZE (0x07fd8000) /* 128MB - SIGSTKSZ */ #define SIGNAL_STACK_START (0x47fd8000) #define SIGNAL_STACK_SIZE SIGSTKSZ +#endif #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) #ifdef GENCGC

1 0

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

16 Dec '10

Date: Thursday, December 16, 2010 @ 22:04:45 Author: rtoy Path: /project/cmucl/cvsroot/src/code Tag: cross-sol-x86-branch Modified: unix.lisp On Solaris/x86, the uname function is really called nuname. -----------+ unix.lisp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: src/code/unix.lisp diff -u src/code/unix.lisp:1.131 src/code/unix.lisp:1.131.4.1 --- src/code/unix.lisp:1.131 Fri Nov 12 11:53:17 2010 +++ src/code/unix.lisp Thu Dec 16 22:04: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/unix.lisp,v 1.131 2010-11-12 16:53:17 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/code/unix.lisp,v 1.131.4.1 2010-12-17 03:04:45 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -3391,7 +3391,8 @@ (defun unix-uname () (with-alien ((names (struct utsname))) - (syscall* (#-freebsd "uname" + (syscall* (#-(or freebsd solaris) "uname" + #+solaris "nuname" ; See /usr/include/sys/utsname.h #+freebsd "__xuname" #+freebsd int (* (struct utsname))) (values (cast (slot names 'sysname) c-string)

1 0

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

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:53:45 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: gencgc.c Enable GC assertions and some debugging prints. ----------+ gencgc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) Index: src/lisp/gencgc.c diff -u src/lisp/gencgc.c:1.110 src/lisp/gencgc.c:1.110.6.1 --- src/lisp/gencgc.c:1.110 Mon Jul 26 13:17:13 2010 +++ src/lisp/gencgc.c Wed Dec 15 07:53:45 2010 @@ -7,7 +7,7 @@ * * Douglas Crosher, 1996, 1997, 1998, 1999. * - * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110 2010-07-26 17:17:13 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/gencgc.c,v 1.110.6.1 2010-12-15 12:53:45 rtoy Exp $ * */ @@ -150,6 +150,7 @@ /* Define for activating assertions. */ +#define GC_ASSERTIONS 1 #if defined(DARWIN) #define GC_ASSERTIONS 1 #endif @@ -240,7 +241,7 @@ * The verbose level. All non-error messages are disabled at level 0; * and only a few rare messages are printed at level 1. */ -unsigned gencgc_verbose = 0; +unsigned gencgc_verbose = 1; unsigned counters_verbose = 0; /* @@ -266,7 +267,7 @@ * makes GC very, very slow, so don't enable this unless you really * need it!) */ -boolean pre_verify_gen_0 = FALSE; +boolean pre_verify_gen_0 = TRUE; /* * Enable checking for bad pointers after gc_free_heap called from purify. @@ -274,7 +275,7 @@ #if 0 && defined(DARWIN) boolean verify_after_free_heap = TRUE; #else -boolean verify_after_free_heap = FALSE; +boolean verify_after_free_heap = TRUE; #endif /* @@ -287,7 +288,7 @@ * Enable the checking of code objects for fixup errors after they are * transported. (Only used for x86.) */ -boolean check_code_fixups = FALSE; +boolean check_code_fixups = TRUE; /* * To enable unmapping of a page and re-mmaping it to have it zero filled. @@ -307,8 +308,8 @@ boolean gencgc_zero_check = TRUE; boolean gencgc_enable_verify_zero_fill = TRUE; #else -boolean gencgc_zero_check = FALSE; -boolean gencgc_enable_verify_zero_fill = FALSE; +boolean gencgc_zero_check = TRUE; +boolean gencgc_enable_verify_zero_fill = TRUE; #endif /* @@ -318,7 +319,7 @@ #if 0 && defined(DARWIN) boolean gencgc_zero_check_during_free_heap = TRUE; #else -boolean gencgc_zero_check_during_free_heap = FALSE; +boolean gencgc_zero_check_during_free_heap = TRUE; #endif /*

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/tools/cross-scripts (cross-x86-osx-solaris.lisp)
by Raymond Toy 15 Dec '10

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:46:29 Author: rtoy Path: /project/cmucl/cvsroot/src/tools/cross-scripts Tag: cross-sol-x86-branch Modified: cross-x86-osx-solaris.lisp Update to match the foreign linkage space as set in x86/parms.lisp. ----------------------------+ cross-x86-osx-solaris.lisp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: src/tools/cross-scripts/cross-x86-osx-solaris.lisp diff -u src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.2 src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.3 --- src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.2 Tue Dec 14 16:27:49 2010 +++ src/tools/cross-scripts/cross-x86-osx-solaris.lisp Wed Dec 15 07:46:29 2010 @@ -49,7 +49,7 @@ (setf *features* (remove :bsd *features*)) ;; Set up the linkage space stuff appropriately for sparc. (setf (c::backend-foreign-linkage-space-start c::*target-backend*) - #xC0000000 + #x30000000 (c::backend-foreign-linkage-entry-size c::*target-backend*) 8)

1 0

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

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:45:52 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: solaris-os.c Ifdef out solaris_register_address if we're on an x86, since this isn't used. --------------+ solaris-os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: src/lisp/solaris-os.c diff -u src/lisp/solaris-os.c:1.26.4.1 src/lisp/solaris-os.c:1.26.4.2 --- src/lisp/solaris-os.c:1.26.4.1 Mon Dec 13 23:25:11 2010 +++ src/lisp/solaris-os.c Wed Dec 15 07:45:51 2010 @@ -1,5 +1,5 @@ /* - * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.1 2010-12-14 04:25:11 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/solaris-os.c,v 1.26.4.2 2010-12-15 12:45:51 rtoy Exp $ * * OS-dependent routines. This file (along with os.h) exports an * OS-independent interface to the operating system VM facilities. @@ -298,6 +298,7 @@ /* function definitions for register lvalues */ +#ifndef i386 int * solaris_register_address(struct ucontext *context, int reg) { @@ -316,6 +317,7 @@ } else return 0; } +#endif /* function defintions for backward compatibilty and static linking */ @@ -499,6 +501,8 @@ unsigned long * os_sigcontext_reg(ucontext_t *scp, int index) { + fprintf(stderr, "os_sigcontext_reg index = %d\n", index); + switch (index) { case 0: return (unsigned long *) &scp->uc_mcontext.gregs[EAX]; @@ -523,6 +527,7 @@ unsigned long * os_sigcontext_pc(ucontext_t *scp) { + fprintf(stderr, "os_sigcontext_pc = %p\n", scp->uc_mcontext.gregs[EIP]); return (unsigned long *) &scp->uc_mcontext.gregs[EIP]; }

1 0

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

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:45:08 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: interrupt.c Use the mmap'ed area for the altstack, as is done for all x86's. -------------+ interrupt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: src/lisp/interrupt.c diff -u src/lisp/interrupt.c:1.60.12.1 src/lisp/interrupt.c:1.60.12.2 --- src/lisp/interrupt.c:1.60.12.1 Mon Dec 13 23:25:11 2010 +++ src/lisp/interrupt.c Wed Dec 15 07:45:08 2010 @@ -1,4 +1,4 @@ -/* $Header: /project/cmucl/cvsroot/src/lisp/interrupt.c,v 1.60.12.1 2010-12-14 04:25:11 rtoy Exp $ */ +/* $Header: /project/cmucl/cvsroot/src/lisp/interrupt.c,v 1.60.12.2 2010-12-15 12:45:08 rtoy Exp $ */ /* Interrupt handling magic. */ @@ -396,7 +396,7 @@ * Noise to install handlers. * \****************************************************************/ -#if defined(SOLARIS) || !(defined(i386) || defined(__x86_64)) +#if !(defined(i386) || defined(__x86_64)) #define SIGNAL_STACK_SIZE SIGSTKSZ static char altstack[SIGNAL_STACK_SIZE]; #endif @@ -422,7 +422,7 @@ if (signal == PROTECTION_VIOLATION_SIGNAL) { stack_t sigstack; -#if !defined(SOLARIS) && (defined( i386 ) || defined(__x86_64)) +#if (defined( i386 ) || defined(__x86_64)) sigstack.ss_sp = (void *) SIGNAL_STACK_START; #else sigstack.ss_sp = (void *) altstack;

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src (compiler/x86/parms.lisp lisp/x86-validate.h)
by Raymond Toy 15 Dec '10

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:43:46 Author: rtoy Path: /project/cmucl/cvsroot/src Tag: cross-sol-x86-branch Modified: compiler/x86/parms.lisp lisp/x86-validate.h Move the spaces around a bit. compiler/x86/parms.lisp: o Move the linkage space to #x30000000, which is in the gap between the static space and the control stack. lisp/x86-validate.h: o Document the memory map for Solaris. o Set the altstack to the end of the control stack. . -------------------------+ compiler/x86/parms.lisp | 7 ++++--- lisp/x86-validate.h | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) Index: src/compiler/x86/parms.lisp diff -u src/compiler/x86/parms.lisp:1.41.2.1 src/compiler/x86/parms.lisp:1.41.2.2 --- src/compiler/x86/parms.lisp:1.41.2.1 Mon Dec 13 23:25:11 2010 +++ src/compiler/x86/parms.lisp Wed Dec 15 07:43:46 2010 @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group(a)cs.cmu.edu. ;;; (ext:file-comment - "$Header: /project/cmucl/cvsroot/src/compiler/x86/parms.lisp,v 1.41.2.1 2010-12-14 04:25:11 rtoy Exp $") + "$Header: /project/cmucl/cvsroot/src/compiler/x86/parms.lisp,v 1.41.2.2 2010-12-15 12:43:46 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -65,7 +65,7 @@ (setf (c::backend-foreign-linkage-space-start *target-backend*) #+linux #x58000000 - #+solaris #xC0000000 + #+solaris #x30000000 #-(or linux solaris) #xB0000000 (c::backend-foreign-linkage-entry-size *target-backend*) 8) @@ -218,7 +218,8 @@ #-FreeBSD #x28000000) (defconstant target-dynamic-space-start #+linux #x58100000 - #-linux #x48000000) + #+solaris #x40000000 + #-(or linux solaris) #x48000000) (defconstant target-foreign-linkage-space-start (c:backend-foreign-linkage-space-start *target-backend*)) (defconstant target-foreign-linkage-entry-size Index: src/lisp/x86-validate.h diff -u src/lisp/x86-validate.h:1.31.8.1 src/lisp/x86-validate.h:1.31.8.2 --- src/lisp/x86-validate.h:1.31.8.1 Mon Dec 13 23:25:11 2010 +++ src/lisp/x86-validate.h Wed Dec 15 07:43:46 2010 @@ -3,7 +3,7 @@ * This code was written as part of the CMU Common Lisp project at * Carnegie Mellon University, and has been placed in the public domain. * - * $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.31.8.1 2010-12-14 04:25:11 rtoy Exp $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-validate.h,v 1.31.8.2 2010-12-15 12:43:46 rtoy Exp $ * */ @@ -189,6 +189,23 @@ #endif #ifdef SOLARIS +/* + * The memory map for Solaris/x86 looks roughly like + * + * 0x08045000->0x08050000 C stack? + * 0x08050000-> Code + C heap + * 0x10000000->0x20000000 256 MB read-only space + * 0x20000000->0x28000000 128M Binding stack growing up. + * 0x28000000->0x30000000 256M Static Space. + * 0x30000000->0x31000000 16M Foreign linkage table + * 0x38000000->0x40000000 128M Control stack growing down. + * 0x40000000->0xD0000000 2304M Dynamic Space. + * + * Starting at 0xd0ce0000 there is some mapped anon memory. libc + * seems to start at 0xd0d40000 and other places. Looks like memory + * above 0xd0ffe000 or so is not mapped. + */ + #define READ_ONLY_SPACE_START (SpaceStart_TargetReadOnly) #define READ_ONLY_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ @@ -200,6 +217,7 @@ #define CONTROL_STACK_START 0x38000000 #define CONTROL_STACK_SIZE (0x07fff000 - 8192) +#define SIGNAL_STACK_START CONTROL_STACK_END #define SIGNAL_STACK_SIZE SIGSTKSZ #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic)

1 0

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

15 Dec '10

Date: Wednesday, December 15, 2010 @ 07:36:56 Author: rtoy Path: /project/cmucl/cvsroot/src/code Tag: cross-sol-x86-branch Modified: sunos-os.lisp Register lisp feature :solaris and :svr4 features if they're already set. ---------------+ sunos-os.lisp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: src/code/sunos-os.lisp diff -u src/code/sunos-os.lisp:1.15 src/code/sunos-os.lisp:1.15.8.1 --- src/code/sunos-os.lisp:1.15 Tue Apr 20 13:57:45 2010 +++ src/code/sunos-os.lisp Wed Dec 15 07:36:56 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/sunos-os.lisp,v 1.15 2010-04-20 17:57:45 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/code/sunos-os.lisp,v 1.15.8.1 2010-12-15 12:36:56 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -21,6 +21,11 @@ (pushnew :sunos *features*) +#+solaris +(register-lisp-feature :solaris) +#+svr4 +(register-lisp-feature :svr4) + #+executable (register-lisp-runtime-feature :executable)

1 0

[cmucl-cvs] CMUCL commit: cross-sol-x86-branch src/tools/cross-scripts (cross-x86-osx-solaris.lisp)
by Raymond Toy 14 Dec '10

14 Dec '10

Date: Tuesday, December 14, 2010 @ 16:27:49 Author: rtoy Path: /project/cmucl/cvsroot/src/tools/cross-scripts Tag: cross-sol-x86-branch Modified: cross-x86-osx-solaris.lisp Add :svr4 and either :x87 or :sse2 to the backend features. ----------------------------+ cross-x86-osx-solaris.lisp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: src/tools/cross-scripts/cross-x86-osx-solaris.lisp diff -u src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.1 src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.2 --- src/tools/cross-scripts/cross-x86-osx-solaris.lisp:1.1.2.1 Mon Dec 13 23:25:11 2010 +++ src/tools/cross-scripts/cross-x86-osx-solaris.lisp Tue Dec 14 16:27:49 2010 @@ -30,9 +30,11 @@ :double-double ; double-double float support :linkage-table - :solaris :svr4 + :solaris :svr4 :sunos ;; The :sse2 and :x87 features will get set by the compiling ;; lisp, so don't set it here! + #+x87 :x87 + #+sse2 :sse2 ) ;; Features to remove from current *features* here. Normally don't ;; need to list anything here unless you are trying to remove a

1 0