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

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 2 commits: Rename local control_stack_size to current_stack_size to prevent
by Raymond Toy 04 Oct '15

04 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 0e258fd9 by Raymond Toy at 2015-10-04T15:05:08Z Rename local control_stack_size to current_stack_size to prevent confusion with the global control_stack_size. - - - - - 1d8db41a by Raymond Toy at 2015-10-04T15:05:22Z Replace BINDING_STACK_START and CONTROL_STACK_START appropriately. - - - - - 2 changed files: - src/lisp/Linux-os.c - src/lisp/gencgc.c Changes: ===================================== src/lisp/Linux-os.c ===================================== --- a/src/lisp/Linux-os.c +++ b/src/lisp/Linux-os.c @@ -454,17 +454,17 @@ sigsegv_handler(HANDLER_ARGS) #ifdef i386 interrupt_handle_now(signal, contextstruct); #else -#define CONTROL_STACK_TOP (((char*) CONTROL_STACK_START) + control_stack_size) +#define CONTROL_STACK_TOP (((char*) control_stack) + control_stack_size) addr = arch_get_bad_addr(signal, code, context); if (addr != NULL && context->sc_regs[reg_ALLOC] & (1 << 63)) { context->sc_regs[reg_ALLOC] -= (1 << 63); interrupt_handle_pending(context); - } else if (addr > CONTROL_STACK_TOP && addr < BINDING_STACK_START) { + } else if (addr > CONTROL_STACK_TOP && addr < (os_vm_address_t)binding_stack) { fprintf(stderr, "Possible stack overflow at 0x%08lX!\n", addr); /* try to fix control frame pointer */ - while (!(CONTROL_STACK_START <= *current_control_frame_pointer && + while (!((lispobj)control_stack <= *current_control_frame_pointer && *current_control_frame_pointer <= CONTROL_STACK_TOP)) ((char *) current_control_frame_pointer) -= sizeof(lispobj); ldb_monitor(); ===================================== src/lisp/gencgc.c ===================================== --- a/src/lisp/gencgc.c +++ b/src/lisp/gencgc.c @@ -7501,16 +7501,16 @@ scavenge_interrupt_handlers(void) static void scavenge_control_stack(void) { - unsigned long control_stack_size; + unsigned long current_stack_size; - control_stack_size = current_control_stack_pointer - control_stack; + current_stack_size = current_control_stack_pointer - control_stack; #ifdef PRINTNOISE printf("Scavenging the control stack (%d bytes) ...\n", - control_stack_size * sizeof(lispobj)); + current_stack_size * sizeof(lispobj)); #endif - scavenge(control_stack, control_stack_size); + scavenge(control_stack, current_stack_size); #ifdef PRINTNOISE printf("Done scavenging the control stack.\n"); View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/ec4c78fb89c45860344d819d…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Define SIGNAL_STACK_SIZE
by Raymond Toy 04 Oct '15

04 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: ec4c78fb by Raymond Toy at 2015-10-04T12:58:54Z Define SIGNAL_STACK_SIZE - - - - - 2 changed files: - src/lisp/ppc-validate.h - src/lisp/sparc-validate.h Changes: ===================================== src/lisp/ppc-validate.h ===================================== --- a/src/lisp/ppc-validate.h +++ b/src/lisp/ppc-validate.h @@ -49,6 +49,8 @@ #define CONTROL_STACK_END (CONTROL_STACK_START + control_stack_size) #endif +#define SIGNAL_STACK_SIZE SIGSTKSZ + #if 0 #define BINDING_STACK_START (0x38000000) #endif ===================================== src/lisp/sparc-validate.h ===================================== --- a/src/lisp/sparc-validate.h +++ b/src/lisp/sparc-validate.h @@ -109,6 +109,8 @@ #define CONTROL_STACK_END (CONTROL_STACK_START + control_stack_size) #endif +#define SIGNAL_STACK_SIZE SIGSTKSZ + #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) /* This isn't used with GENCGC */ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/ec4c78fb89c45860344d819de…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 6 commits: Don't define a SIGNAL_STACK mapped region. Use altstack, like on
by Raymond Toy 04 Oct '15

04 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: cf1990dc by Raymond Toy at 2015-10-04T12:42:34Z Don't define a SIGNAL_STACK mapped region. Use altstack, like on other platforms. - - - - - b2dc0b2c by Raymond Toy at 2015-10-04T12:42:55Z Don't define a SIGNAL_STACK mapped region. Use altstack, like on other platforms. - - - - - 316d2279 by Raymond Toy at 2015-10-04T12:43:26Z Use control_stack, not CONTROL_STACK_START. - - - - - bdb299d3 by Raymond Toy at 2015-10-04T12:44:04Z Put -O2 on it's own line to make switching this off and on slightly easier. - - - - - 9de8cd88 by Raymond Toy at 2015-10-04T12:47:42Z Remove definitions of BINDING_STACK_START and CONTROL_STACK_START. - - - - - e4553e8a by Raymond Toy at 2015-10-04T12:54:25Z Replace BINDING_STACK_START and CONTROL_STACK_START appropriately. - - - - - 9 changed files: - src/lisp/Config.x86_common - src/lisp/Darwin-os.c - src/lisp/gencgc.c - src/lisp/interrupt.c - src/lisp/ppc-validate.h - src/lisp/sparc-validate.h - src/lisp/x86-assem.S - src/lisp/x86-validate-darwin.h - src/lisp/x86-validate-linux.h Changes: ===================================== src/lisp/Config.x86_common ===================================== --- a/src/lisp/Config.x86_common +++ b/src/lisp/Config.x86_common @@ -43,7 +43,8 @@ CPP_INCLUDE_OPTIONS := -I. -I$(PATH1) -I- endif CPPFLAGS := $(CPP_DEFINE_OPTIONS) $(CPP_INCLUDE_OPTIONS) -CFLAGS += -Wstrict-prototypes -Wall -O2 -g -fno-omit-frame-pointer +CFLAGS += -Wstrict-prototypes -Wall -g -fno-omit-frame-pointer +CFLAGS += -O2 ASFLAGS = -g ASSEM_SRC = x86-assem.S ===================================== src/lisp/Darwin-os.c ===================================== --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -464,8 +464,8 @@ valid_addr(os_vm_address_t addr) #ifndef GENCGC || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)) + || in_range_p(addr, (lispobj)control_stack, control_stack_size) + || in_range_p(addr, (lispobj)binding_stack, binding_stack_size)) return TRUE; return FALSE; } ===================================== src/lisp/gencgc.c ===================================== --- a/src/lisp/gencgc.c +++ b/src/lisp/gencgc.c @@ -166,7 +166,7 @@ check_escaped_stack_object(lispobj * where, lispobj obj) if (Pointerp(obj) && (p = (void *) PTR(obj), - (p >= (void *) CONTROL_STACK_START + (p >= (void *) control_stack && p < (void *) control_stack_end))) { char *space; @@ -195,7 +195,7 @@ check_escaped_stack_object(lispobj * where, lispobj obj) lose("Escaped stack-allocated object 0x%08lx at %p in %s\n", (unsigned long) obj, where, space); #ifndef i386 - else if ((where >= (lispobj *) CONTROL_STACK_START + else if ((where >= (lispobj *) control_stack && where < (lispobj *) (control_stack_end)) || (space == NULL)) { /* Do nothing if it the reference is from the control stack, @@ -2136,17 +2136,19 @@ read_only_space_p(lispobj obj) static inline boolean control_stack_space_p(lispobj obj) { - lispobj end = CONTROL_STACK_START + control_stack_size; + char *object = (char *) obj; + char *end = (char *)control_stack + control_stack_size; - return (obj >= CONTROL_STACK_START) && (obj < end); + return (object >= (char *) control_stack) && (object < end); } static inline boolean binding_stack_space_p(lispobj obj) { - lispobj end = BINDING_STACK_START + binding_stack_size; + char *object = (char *) obj; + char *end = (char *)binding_stack + binding_stack_size; - return (obj >= BINDING_STACK_START) && (obj < end); + return (object >= (char *) binding_stack) && (object < end); } static inline boolean @@ -2157,7 +2159,12 @@ signal_space_p(lispobj obj) return (obj >= SIGNAL_STACK_START) && (obj < end); #else - return FALSE; + extern char altstack[]; + + char* object = (char*) obj; + char* end = altstack + SIGNAL_STACK_SIZE; + + return (object >= altstack && object < end); #endif } @@ -7322,11 +7329,11 @@ verify_gc(void) int static_space_size = (lispobj *) SymbolValue(STATIC_SPACE_FREE_POINTER) - (lispobj *) static_space; int binding_stack_size = (lispobj *) get_binding_stack_pointer() - - (lispobj *) BINDING_STACK_START; + - (lispobj *) binding_stack; verify_space((lispobj *) READ_ONLY_SPACE_START, read_only_space_size); verify_space((lispobj *) static_space, static_space_size); - verify_space((lispobj *) BINDING_STACK_START, binding_stack_size); + verify_space((lispobj *) binding_stack, binding_stack_size); verify_space((lispobj *) (void *) &scavenger_hooks, 1); } @@ -7523,7 +7530,7 @@ garbage_collect_generation(int generation, int raise) #ifdef GC_ASSERTIONS #if defined(i386) || defined(__x86_64) - invalid_stack_start = (void *) CONTROL_STACK_START; + invalid_stack_start = (void *) control_stack; invalid_stack_end = (void *) &raise; #else /* not i386 */ invalid_stack_start = (void *) &raise; ===================================== src/lisp/interrupt.c ===================================== --- a/src/lisp/interrupt.c +++ b/src/lisp/interrupt.c @@ -408,10 +408,10 @@ interrupt_maybe_gc(HANDLER_ARGS) * Noise to install handlers. * \****************************************************************/ -#if !(defined(i386) || defined(__x86_64)) -#define SIGNAL_STACK_SIZE SIGSTKSZ -static char altstack[SIGNAL_STACK_SIZE]; -#endif +//#if !(defined(i386) || defined(__x86_64)) +//#define SIGNAL_STACK_SIZE SIGSTKSZ +char altstack[SIGNAL_STACK_SIZE]; +//#endif void interrupt_install_low_level_handler(int signal, void handler(HANDLER_ARGS)) @@ -434,7 +434,7 @@ interrupt_install_low_level_handler(int signal, void handler(HANDLER_ARGS)) if (signal == PROTECTION_VIOLATION_SIGNAL) { stack_t sigstack; -#if (defined( i386 ) || defined(__x86_64)) +#if defined(SIGNAL_STACK_START) sigstack.ss_sp = (void *) SIGNAL_STACK_START; #else sigstack.ss_sp = (void *) altstack; ===================================== src/lisp/ppc-validate.h ===================================== --- a/src/lisp/ppc-validate.h +++ b/src/lisp/ppc-validate.h @@ -41,11 +41,17 @@ #define STATIC_SPACE_START (0x10000000) #define STATIC_SPACE_SIZE (0x07ff8000) /* 128 MB, almost */ +#if 0 #define CONTROL_STACK_START (0x30000000) +#endif #define CONTROL_STACK_SIZE (0x07ff8000) /* 128 MB, almost */ +#if 0 #define CONTROL_STACK_END (CONTROL_STACK_START + control_stack_size) +#endif +#if 0 #define BINDING_STACK_START (0x38000000) +#endif #define BINDING_STACK_SIZE (0x07ff8000) /* 128 MB, almost */ #if 0 ===================================== src/lisp/sparc-validate.h ===================================== --- a/src/lisp/sparc-validate.h +++ b/src/lisp/sparc-validate.h @@ -92,15 +92,22 @@ #define READ_ONLY_SPACE_START (SpaceStart_TargetReadOnly) #define READ_ONLY_SPACE_SIZE ((2*MB_128) - SPARSE_BLOCK_SIZE) /* 256 MB - 32 KB, 256 MB max */ +#if 0 #define BINDING_STACK_START (0x20000000) +#endif + #define BINDING_STACK_SIZE (MB_128 - SPARSE_BLOCK_SIZE) /* 128 MB - 32 KB, 128 MB max */ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE ((2*MB_128) - SPARSE_BLOCK_SIZE) /* 256 MB - 32 KB, 256 MB max */ +#if 0 #define CONTROL_STACK_START (0x38000000) +#endif #define CONTROL_STACK_SIZE (MB_128 - SPARSE_BLOCK_SIZE) /* 128 MB - 32 KB, 128 MB max */ +#if 0 #define CONTROL_STACK_END (CONTROL_STACK_START + control_stack_size) +#endif #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) ===================================== src/lisp/x86-assem.S ===================================== --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -143,7 +143,8 @@ FUNCDEF(call_into_lisp) movl %eax, GNAME(foreign_function_call_active) movl %esp,%ebx # remember current stack - cmpl $CONTROL_STACK_START,%esp + cmpl GNAME(control_stack), %esp + jbe ChangeToLispStack cmpl GNAME(control_stack_end), %esp jbe OnLispStack ===================================== src/lisp/x86-validate-darwin.h ===================================== --- a/src/lisp/x86-validate-darwin.h +++ b/src/lisp/x86-validate-darwin.h @@ -18,10 +18,14 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ +#if 0 #define BINDING_STACK_START (0x38000000) +#endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ +#if 0 #define CONTROL_STACK_START (0x40000000) +#endif /* * According to /usr/include/sys/signal.h, MINSIGSTKSZ is 32K and @@ -29,7 +33,9 @@ */ #define CONTROL_STACK_SIZE (0x07fdf000) /* 128MB - SIGSTKSZ - 1 page */ +#if 0 #define SIGNAL_STACK_START (0x47fe0000) /* One page past the end of the control stack */ +#endif #define SIGNAL_STACK_SIZE SIGSTKSZ #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) ===================================== src/lisp/x86-validate-linux.h ===================================== --- a/src/lisp/x86-validate-linux.h +++ b/src/lisp/x86-validate-linux.h @@ -36,13 +36,19 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ +#if 0 #define BINDING_STACK_START (0x20000000) +#endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ +#if 0 #define CONTROL_STACK_START 0x38000000 +#endif #define CONTROL_STACK_SIZE (0x07fff000 - 8192) +#if 0 #define SIGNAL_STACK_START CONTROL_STACK_END +#endif #define SIGNAL_STACK_SIZE SIGSTKSZ #define DYNAMIC_0_SPACE_START (SpaceStart_TargetDynamic) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/32ae8b143a2c6caa09d8c97a…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Fix silly typos.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 32ae8b14 by Raymond Toy at 2015-10-03T14:30:14Z Fix silly typos. - - - - - 1 changed file: - src/lisp/solaris-os.c Changes: ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -435,7 +435,7 @@ static unsigned long *space_size[] = { #define HOLE_SIZE 0x2000 void -make_hole(void *start_start, size_t space_size) +make_hole(char *space_start, size_t space_size) { os_vm_address_t hole; @@ -463,8 +463,8 @@ make_holes(void) * stacks are handled in make_stack_holes. */ - make_hole(spaces[0], sapce_sizes[0]); /* Read-only space */ - make_hole(spaces[1], space_sizes[1]); /* Static space */ + make_hole(spaces[0], *space_size[0]); /* Read-only space */ + make_hole(spaces[1], *space_size[1]); /* Static space */ /* Round up the dynamic_space_size to the nearest SPARSE_BLOCK_SIZE */ dynamic_space_size = round_up_sparse_size(dynamic_space_size); View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/32ae8b143a2c6caa09d8c97ae…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Simplify make_hole: just pass in address and size.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: bcb73a5e by Raymond Toy at 2015-10-03T14:26:17Z Simplify make_hole: just pass in address and size. - - - - - 1 changed file: - src/lisp/solaris-os.c Changes: ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -435,13 +435,13 @@ static unsigned long *space_size[] = { #define HOLE_SIZE 0x2000 void -make_hole(int k) +make_hole(void *start_start, size_t space_size) { os_vm_address_t hole; /* Make holes of the appropriate size for desired spaces */ - hole = spaces[k] + *space_size[k]; + hole = space_start + space_size; if (os_validate(hole, HOLE_SIZE) == NULL) { fprintf(stderr, @@ -463,8 +463,8 @@ make_holes(void) * stacks are handled in make_stack_holes. */ - make_hole(0); /* Read-only space */ - make_hole(1); /* Static space */ + make_hole(spaces[0], sapce_sizes[0]); /* Read-only space */ + make_hole(spaces[1], space_sizes[1]); /* Static space */ /* Round up the dynamic_space_size to the nearest SPARSE_BLOCK_SIZE */ dynamic_space_size = round_up_sparse_size(dynamic_space_size); @@ -495,8 +495,8 @@ make_holes(void) void make_stack_holes(void) { - make_hole(2); - make_hole(3); + make_hole(control_stack, control_stack_size); + make_hole(binding_stack, binding_stack_size); } void * View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/bcb73a5e954df5b6003b0ac8c…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 4 commits: Replace CONTROL_STACK_START with control_stack.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 57a7df13 by Raymond Toy at 2015-10-03T14:10:24Z Replace CONTROL_STACK_START with control_stack. Cast to appropriate pointer types too. - - - - - e0ae3367 by Raymond Toy at 2015-10-03T14:11:08Z Replace CONTROL_STACK_START with control_stack and BINDING_STACK_START with binding_stack. - - - - - 748991e2 by Raymond Toy at 2015-10-03T14:11:33Z Cast os_validate to the appropriate type to get rid of warning. - - - - - e4897224 by Raymond Toy at 2015-10-03T14:11:43Z Declare validate_stacks(). - - - - - 4 changed files: - src/lisp/backtrace.c - src/lisp/solaris-os.c - src/lisp/validate.c - src/lisp/validate.h Changes: ===================================== src/lisp/backtrace.c ===================================== --- a/src/lisp/backtrace.c +++ b/src/lisp/backtrace.c @@ -252,7 +252,7 @@ backtrace(int nframes) static int stack_pointer_p(unsigned long p) { - return (p < CONTROL_STACK_START + control_stack_size + return ((void *)p < (void *)control_stack + control_stack_size && p > (unsigned long) &p && (p & 3) == 0); } ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -199,8 +199,8 @@ boolean valid_addr(os_vm_address_t addr) #ifndef GENCGC || in_range_p(addr, DYNAMIC_1_SPACE_START, dynamic_space_size) #endif - || in_range_p(addr, CONTROL_STACK_START, control_stack_size) - || in_range_p(addr, BINDING_STACK_START, binding_stack_size)); + || in_range_p(addr, control_stack, control_stack_size) + || in_range_p(addr, binding_stack, binding_stack_size)); } /* ---------------------------------------------------------------- */ @@ -412,8 +412,7 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr) * of the dynamic space can be controlled from the command line. */ static os_vm_address_t spaces[] = { - READ_ONLY_SPACE_START, STATIC_SPACE_START, - BINDING_STACK_START, CONTROL_STACK_START + READ_ONLY_SPACE_START, STATIC_SPACE_START }; /* ===================================== src/lisp/validate.c ===================================== --- a/src/lisp/validate.c +++ b/src/lisp/validate.c @@ -116,14 +116,14 @@ validate_stacks() { /* Control Stack */ /* Map the conrol stack wherever we have space */ - control_stack = os_validate(NULL, control_stack_size); + control_stack = (lispobj*) os_validate(NULL, control_stack_size); #if (defined(i386) || defined(__x86_64)) control_stack_end = (void*)control_stack + control_stack_size; #endif /* Binding Stack */ - binding_stack = os_validate(NULL, binding_stack_size); + binding_stack = (lispobj*) os_validate(NULL, binding_stack_size); #ifdef sparc make_stack_holes(); ===================================== src/lisp/validate.h ===================================== --- a/src/lisp/validate.h +++ b/src/lisp/validate.h @@ -37,5 +37,6 @@ #endif extern void validate(void); +extern void validate_stacks(void); #endif /* _VALIDATE_H_ */ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/65b5ed7715ded275fd4d360e…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 3 commits: Fix typo: index -> k.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 67befdb5 by Raymond Toy at 2015-10-03T13:55:50Z Fix typo: index -> k. - - - - - 1aa6477b by Raymond Toy at 2015-10-03T13:56:20Z The start of the control stack is control_stack, not control_stack_start. - - - - - 65b5ed77 by Raymond Toy at 2015-10-03T13:56:47Z The start of the control stack is control_stack, not control_stack_start. - - - - - 4 changed files: - src/lisp/globals.c - src/lisp/globals.h - src/lisp/os-common.c - src/lisp/solaris-os.c Changes: ===================================== src/lisp/globals.c ===================================== --- a/src/lisp/globals.c +++ b/src/lisp/globals.c @@ -28,8 +28,6 @@ lispobj *dynamic_1_space; unsigned dynamic_space_size; lispobj *control_stack; - -lispobj *control_stack_start; #if (defined(i386) || defined(__x86_64)) lispobj *control_stack_end; #endif ===================================== src/lisp/globals.h ===================================== --- a/src/lisp/globals.h +++ b/src/lisp/globals.h @@ -37,8 +37,6 @@ extern unsigned long binding_stack_size; extern unsigned long static_space_size; extern unsigned long control_stack_size; -extern lispobj *control_stack_start; - #if (defined(i386) || defined(__x86_64)) extern lispobj *control_stack_end; #endif ===================================== src/lisp/os-common.c ===================================== --- a/src/lisp/os-common.c +++ b/src/lisp/os-common.c @@ -424,7 +424,7 @@ guard_zones(char **yellow_start, char **red_start) * control stack area. */ - char *end = (char *) control_stack_start + control_stack_size; + char *end = (char *) control_stack + control_stack_size; *red_start = end - RED_ZONE_SIZE; *yellow_start = *red_start - YELLOW_ZONE_SIZE; ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -436,7 +436,7 @@ static unsigned long *space_size[] = { #define HOLE_SIZE 0x2000 void -make_hole(int index) +make_hole(int k) { os_vm_address_t hole; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/4b838e3f56bbfb80f9d7eee8…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 2 commits: Updates to handle random stack locations better.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 1869d093 by Raymond Toy at 2015-10-03T07:55:34Z Updates to handle random stack locations better. * Print out some better messages from os_protect * Add make_hole to actually make a hole * make_holes only does the read-only and static spaces. * make_stack_holes handles the binding and control stacks. - - - - - 4b838e3f by Raymond Toy at 2015-10-03T07:56:07Z Make holes in the stacks, as before. - - - - - 2 changed files: - src/lisp/solaris-os.c - src/lisp/validate.c Changes: ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -169,8 +169,14 @@ os_flush_icache(os_vm_address_t address, os_vm_size_t length) void os_protect(os_vm_address_t address, os_vm_size_t length, os_vm_prot_t prot) { - if (mprotect((void *) address, length, prot) == -1) - perror("mprotect"); + if (mprotect((void *) address, length, prot) == -1) { + char msg[1000]; + + snprintf(msg, sizeof(msg), "mprotect: os_protect(0x%p, %u, 0x%x): ", + address, length, prot); + + perror(msg); + } } static boolean @@ -430,27 +436,37 @@ static unsigned long *space_size[] = { #define HOLE_SIZE 0x2000 void -make_holes(void) +make_hole(int index) { - int k; os_vm_address_t hole; /* Make holes of the appropriate size for desired spaces */ - for (k = 0; k < sizeof(spaces) / sizeof(spaces[0]); ++k) { - - hole = spaces[k] + *space_size[k]; + hole = spaces[k] + *space_size[k]; - if (os_validate(hole, HOLE_SIZE) == NULL) { - fprintf(stderr, - "ensure_space: Failed to validate hole of %d bytes at 0x%08lX\n", - HOLE_SIZE, (unsigned long) hole); - exit(1); - } - /* Make it inaccessible */ - os_protect(hole, HOLE_SIZE, 0); + if (os_validate(hole, HOLE_SIZE) == NULL) { + fprintf(stderr, + "ensure_space: Failed to validate hole of %d bytes at 0x%08lX\n", + HOLE_SIZE, (unsigned long) hole); + exit(1); } + /* Make it inaccessible */ + os_protect(hole, HOLE_SIZE, 0); +} + +void +make_holes(void) +{ + os_vm_address_t hole; + + /* + * Make holes of the appropriate size for desired spaces. The + * stacks are handled in make_stack_holes. + */ + make_hole(0); /* Read-only space */ + make_hole(1); /* Static space */ + /* Round up the dynamic_space_size to the nearest SPARSE_BLOCK_SIZE */ dynamic_space_size = round_up_sparse_size(dynamic_space_size); @@ -477,6 +493,13 @@ make_holes(void) #endif } +void +make_stack_holes(void) +{ + make_hole(2); + make_hole(3); +} + void * os_dlsym(const char *sym_name, lispobj lib_list) { ===================================== src/lisp/validate.c ===================================== --- a/src/lisp/validate.c +++ b/src/lisp/validate.c @@ -18,6 +18,7 @@ #ifdef sparc extern void make_holes(void); +extern void make_stack_holes(void); #endif static void @@ -124,6 +125,10 @@ validate_stacks() /* Binding Stack */ binding_stack = os_validate(NULL, binding_stack_size); +#ifdef sparc + make_stack_holes(); +#endif + #ifdef RED_ZONE_HIT os_guard_control_stack(0, 1); #endif View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/586ca74df2c5289c9154e688…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 4 commits: Update cmucl version to 21a.
by Raymond Toy 03 Oct '15

03 Oct '15

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 53aac568 by Raymond Toy at 2015-09-30T21:56:04Z Update cmucl version to 21a. Add bootfile for building cmucl with the new version too. - - - - - db9bcbd3 by Raymond Toy at 2015-09-30T21:56:20Z Remove [In progress] note. - - - - - 0743dd00 by Raymond Toy at 2015-09-30T22:17:04Z Note changes for -quiet flag. - - - - - 586ca74d by Raymond Toy at 2015-10-02T18:50:45Z Merge branch 'master' into rtoy-mmap-anon-control-and-binding-stacks - - - - - 3 changed files: - + src/bootfiles/20f/boot-21a.lisp - src/compiler/byte-comp.lisp - src/general-info/release-21a.txt Changes: ===================================== src/bootfiles/20f/boot-21a.lisp ===================================== --- /dev/null +++ b/src/bootfiles/20f/boot-21a.lisp @@ -0,0 +1,68 @@ +;;;; +;;;; Boot file for changing the fasl file version numbers to 21a. +;;;; + +(in-package :c) + +(setf lisp::*enable-package-locked-errors* nil) + +;;; +;;; Note that BYTE-FASL-FILE-VERSION is a constant. +;;; +;;; (Be sure to change BYTE-FASL-FILE-VERSION in +;;; compiler/byte-comp.lisp to the correct value too!) +;;; +#-cmu21a +(setf (symbol-value 'byte-fasl-file-version) #x21a) +#-cmu21a +(setf (backend-fasl-file-version *target-backend*) #x21a) + +;;; +;;; Don't check fasl versions in the compiling Lisp because we'll +;;; load files compiled with the new version numbers. +;;; +#-cmu21a +(setq lisp::*skip-fasl-file-version-check* t) + +;;; +;;; This is here because BYTE-FASL-FILE-VERSION is constant-folded in +;;; OPEN-FASL-FILE. To make the new version number take effect, we +;;; have to redefine the function. +;;; +#-cmu21a +(defun open-fasl-file (name where &optional byte-p) + (declare (type pathname name)) + (let* ((stream (open name :direction :output + :if-exists :new-version + :element-type '(unsigned-byte 8) + :class 'binary-text-stream)) + (res (make-fasl-file :stream stream))) + (multiple-value-bind + (version f-vers f-imp) + (if byte-p + (values "Byte code" + byte-fasl-file-version + (backend-byte-fasl-file-implementation *backend*)) + (values (backend-version *backend*) + (backend-fasl-file-version *backend*) + (backend-fasl-file-implementation *backend*))) + (format stream + "FASL FILE output from ~A.~@ + Compiled ~A on ~A~@ + Compiler ~A, Lisp ~A~@ + Targeted for ~A, FASL version ~X~%" + where + (ext:format-universal-time nil (get-universal-time)) + (machine-instance) compiler-version + (lisp-implementation-version) + version f-vers) + ;; + ;; Terminate header. + (dump-byte 255 res) + ;; + ;; Specify code format. + (dump-fop 'lisp::fop-long-code-format res) + (dump-byte f-imp res) + (dump-unsigned-32 f-vers res)) + res)) + ===================================== src/compiler/byte-comp.lisp ===================================== --- a/src/compiler/byte-comp.lisp +++ b/src/compiler/byte-comp.lisp @@ -38,7 +38,7 @@ ;; 0-9 followed by a single hex digit in the range a-f. Then the ;; version looks like a decimal number followed by a minor release ;; letter of a to f. -(defconstant byte-fasl-file-version #x20f) +(defconstant byte-fasl-file-version #x21a) (let* ((version-string (format nil "~X" byte-fasl-file-version))) ;; Add :cmu<n> to *features* ===================================== src/general-info/release-21a.txt ===================================== --- a/src/general-info/release-21a.txt +++ b/src/general-info/release-21a.txt @@ -1,7 +1,5 @@ ========================== C M U C L 21 a ============================= -[In Progress] - The CMUCL project is pleased to announce the release of CMUCL 21a. This is a major release which contains numerous enhancements and bug fixes from the 20f release. @@ -45,6 +43,10 @@ New in this release: * Added clx-inspector module. * ASDF documentation included in html, info, and pdf formats in contrib/asdf/doc/. + * If -quiet is given, don't print out the herald, even if the user + init files add things to the herald. (Previously, these would + get printed out.) Also, -quiet no longer removes the herald + items; you can sill print out the entire herald using * ANSI compliance fixes: View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/3ee55ba5b826f2dd944c1426…

1 0

[Git][cmucl/cmucl] Pushed new tag 21a
by Raymond Toy 02 Oct '15

02 Oct '15

Raymond Toy pushed new tag 21a at cmucl / cmucl

1 0