cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[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

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

14 Dec '10

Date: Tuesday, December 14, 2010 @ 16:27:14 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: x86-arch.c Sun C miscompiles the inline assembly for the cpuid instruction, so on Solaris, use the /dev/cpu/self/cpuid device to get the cpuid data that we need. ------------+ x86-arch.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) Index: src/lisp/x86-arch.c diff -u src/lisp/x86-arch.c:1.39 src/lisp/x86-arch.c:1.39.24.1 --- src/lisp/x86-arch.c:1.39 Tue Jan 6 13:18:43 2009 +++ src/lisp/x86-arch.c Tue Dec 14 16:27:13 2010 @@ -1,6 +1,6 @@ /* x86-arch.c -*- Mode: C; comment-column: 40 -*- * - * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.39 2009-01-06 18:18:43 rtoy Rel $ + * $Header: /project/cmucl/cvsroot/src/lisp/x86-arch.c,v 1.39.24.1 2010-12-14 21:27:13 rtoy Exp $ * */ @@ -24,6 +24,50 @@ unsigned long fast_random_state = 1; +#if defined(SOLARIS) +/* + * Use the /dev/cpu/self/cpuid interface on Solaris. We could use the + * same method below, but the Sun C compiler miscompiles the inline + * assembly. + */ + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +void cpuid(int level, unsigned int* a, unsigned int* b, + unsigned int* c, unsigned int* d) +{ + int device; + uint32_t regs[4]; + static const char devname[] = "/dev/cpu/self/cpuid"; + + *a = *b = *c = *d = 0; + if ((device = open(devname, O_RDONLY)) == -1) { + perror(devname); + goto exit; + } + + if (pread(device, regs, sizeof(regs), 1) != sizeof(regs)) { + perror(devname); + goto exit; + } + + *a = regs[0]; + *b = regs[1]; + *c = regs[2]; + *d = regs[3]; + + exit: + (void) close(device); + + return; +} + +#else #define __cpuid(level, a, b, c, d) \ __asm__ ("xchgl\t%%ebx, %1\n\t" \ "cpuid\n\t" \ @@ -43,6 +87,7 @@ *c = ecx; *d = edx; } +#endif int arch_support_sse2(void)

1 0

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

14 Dec '10

Date: Tuesday, December 14, 2010 @ 16:26:02 Author: rtoy Path: /project/cmucl/cvsroot/src/lisp Tag: cross-sol-x86-branch Modified: Config.sparc_common Add -DFEATURE_SSE2 if we're compiling on x86 and have either FEATURE_X87 or FEATURE_SSE2 defined. ---------------------+ Config.sparc_common | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) Index: src/lisp/Config.sparc_common diff -u src/lisp/Config.sparc_common:1.3.6.1 src/lisp/Config.sparc_common:1.3.6.2 --- src/lisp/Config.sparc_common:1.3.6.1 Mon Dec 13 23:25:11 2010 +++ src/lisp/Config.sparc_common Tue Dec 14 16:26:02 2010 @@ -27,12 +27,24 @@ GC_SRC = gencgc.c endif +# Enable support for SSE2. If FEATURE_X87 is set, we want SSE2 +# support in the C code too so that the same binary is built in both +# cases. If neither is set, then we don't want any SSE2 support at +# all. +ifdef FEATURE_X87 +SSE2 = -DFEATURE_SSE2 +else +ifdef FEATURE_SSE2 +SSE2 = -DFEATURE_SSE2 +endif +endif + # Enable support for Unicode ifdef FEATURE_UNICODE UNICODE = -DUNICODE endif -CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) +CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) CFLAGS = -g $(CC_V8PLUS)

1 0

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

14 Dec '10

Date: Tuesday, December 14, 2010 @ 16:24:09 Author: rtoy Path: /project/cmucl/cvsroot/src/code Tag: cross-sol-x86-branch Modified: signal.lisp Fix up calls to with-textdomain which was missing the second arg when compiled on solaris/x86. -------------+ signal.lisp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: src/code/signal.lisp diff -u src/code/signal.lisp:1.41 src/code/signal.lisp:1.41.8.1 --- src/code/signal.lisp:1.41 Tue Jul 13 23:13:20 2010 +++ src/code/signal.lisp Tue Dec 14 16:24:09 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/signal.lisp,v 1.41 2010-07-14 03:13:20 rtoy Rel $") + "$Header: /project/cmucl/cvsroot/src/code/signal.lisp,v 1.41.8.1 2010-12-14 21:24:09 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -104,7 +104,7 @@ (def-unix-signal :SIGIOT 6 "Iot instruction") ; Compatibility (def-unix-signal :SIGABRT 6 "C abort()") (intl::with-textdomain ("cmucl" #+linux "cmucl-linux-os" - #+sparc "cmucl-sparc-svr4" + #+(or sparc solaris) "cmucl-sparc-svr4" #+bsd "cmucl-bsd-os") #-linux (def-unix-signal :SIGEMT 7 "Emt instruction")) @@ -115,7 +115,7 @@ (def-unix-signal :SIGBUS #-linux 10 #+linux 7 "Bus error") (def-unix-signal :SIGSEGV 11 "Segmentation violation") (intl::with-textdomain ("cmucl" #+linux "cmucl-linux-os" - #+sparc "cmucl-sparc-svr4" + #+(or sparc solaris) "cmucl-sparc-svr4" #+bsd "cmucl-bsd-os") #-linux (def-unix-signal :SIGSYS 12 "Bad argument to system call")) @@ -124,7 +124,7 @@ (def-unix-signal :SIGALRM 14 "Alarm clock") (def-unix-signal :SIGTERM 15 "Software termination signal") (intl::with-textdomain ("cmucl" #+linux "cmucl-linux-os" - #+sparc "cmucl-sparc-svr4" + #+(or sparc solaris) "cmucl-sparc-svr4" #+bsd "cmucl-bsd-os") #+linux (def-unix-signal :SIGSTKFLT 16 "Stack fault on coprocessor")) @@ -163,7 +163,7 @@ ;;; SVR4 (or Solaris?) specific signals (intl::with-textdomain ("cmucl" #+linux "cmucl-linux-os" - #+sparc "cmucl-sparc-svr4" + #+(or sparc solaris) "cmucl-sparc-svr4" #+bsd "cmucl-bsd-os") #+svr4 (def-unix-signal :SIGWAITING 32 "Process's lwps are blocked"))

1 0

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

14 Dec '10

Date: Tuesday, December 14, 2010 @ 16:22:28 Author: rtoy Path: /project/cmucl/cvsroot/src/pcl Modified: cmucl-documentation.lisp Don't call dgettext if there's no documentation string. This used to work, but doesn't anymore because the domain won't normally be NIL anymore. --------------------------+ 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.18 --- src/pcl/cmucl-documentation.lisp:1.17 Fri Mar 19 11:19:03 2010 +++ src/pcl/cmucl-documentation.lisp Tue Dec 14 16:22:27 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.18 2010-12-14 21:22:27 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