cmucl-cvs October 2015

cmucl-cvs@common-lisp.net

1 participants
36 discussions

[Git][cmucl/cmucl][master] Use correct path for git clone.
by Raymond Toy 10 Oct '15

10 Oct '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 8d7c3383 by Raymond Toy at 2015-10-10T13:39:42Z Use correct path for git clone. Noticed by Joram Schrijver who gave the correct path. - - - - - 1 changed file: - BUILDING Changes: ===================================== BUILDING ===================================== --- a/BUILDING +++ b/BUILDING @@ -55,7 +55,7 @@ Setting up a build environment or, if you want to use the git sources directly: - git clone git://common-lisp.net/projects/cmucl/cmucl.git + git clone https://gitlab.common-lisp.net/cmucl/cmucl.git Whatever you do, the sources must be in a directory named src inside the base directory. Since the build tools keep all View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/8d7c33830d953f67d1e8253f7…

1 0

[Git][cmucl/cmucl][master] Include the exit code when printing the process structure.
by Raymond Toy 10 Oct '15

10 Oct '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 3f5fb01a by Raymond Toy at 2015-10-09T22:17:20Z Include the exit code when printing the process structure. It's really nice to see the exit code of the process when printing out the process structure. Fix a typo too: "tings" -> "things". - - - - - 1 changed file: - src/code/run-program.lisp Changes: ===================================== src/code/run-program.lisp ===================================== --- a/src/code/run-program.lisp +++ b/src/code/run-program.lisp @@ -90,15 +90,16 @@ output ; Stream from child's output or nil. error ; Stream from child's error output or nil. status-hook ; Closure to call when PROC changes status. - plist ; Place for clients to stash tings. + plist ; Place for clients to stash things. cookie ; List of the number of pipes from the subproc. ) (defun %print-process (proc stream depth) (declare (ignore depth)) - (format stream "#<process ~D ~S>" + (format stream "#<process ~D ~S code: ~S>" (process-pid proc) - (process-status proc))) + (process-status proc) + (process-exit-code proc))) ;;; PROCESS-STATUS -- Public. ;;; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/3f5fb01a6e5f8e4efb8d3843d…

1 0

[Git][cmucl/cmucl][master] Exit with the return code from obj_run_linker.
by Raymond Toy 10 Oct '15

10 Oct '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 11a7e37b by Raymond Toy at 2015-10-09T21:56:01Z Exit with the return code from obj_run_linker. obj_run_linker() returns the return code from the call to system(). Exit lisp with this return code to indicate if running the executable linker script worked or not. - - - - - 1 changed file: - src/lisp/save.c Changes: ===================================== src/lisp/save.c ===================================== --- a/src/lisp/save.c +++ b/src/lisp/save.c @@ -250,6 +250,7 @@ save_executable(char *filename, lispobj init_function) { char *dir_name; char *dir_copy; + int rc; #if defined WANT_CGC volatile lispobj *func_ptr = &init_function; @@ -357,9 +358,9 @@ save_executable(char *filename, lispobj init_function) printf("Linking executable...\n"); fflush(stdout); - obj_run_linker(init_function, filename); + rc = obj_run_linker(init_function, filename); printf("done.\n"); free(dir_copy); - exit(0); + exit(rc); } #endif View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/11a7e37bb39ee3e24e62c9382…

1 0

[Git][cmucl/cmucl][master] Support asdf's static-image-op.
by Raymond Toy 05 Oct '15

05 Oct '15

Raymond Toy pushed to branch master at cmucl / cmucl Commits: 20abbd7c by Raymond Toy at 2015-10-04T20:26:12Z Support asdf's static-image-op. * src/lisp/GNUMakefile * Don't add exec-final.o to lisp.a. (But still remove exec-init.o from it.) * src/tools/linker.sh * When linking the executable, need to link exec-final.o too. * bin/make-main-dist.sh * Need to install exec-init.o and exec-final.o. exec-init.o is needed to link a normal lisp; exec-final.o is used for the executable image. * Fix modes on some installed files. exec-init.o, exec-final.o, and lisp.a don't need to be executable. - - - - - 3 changed files: - bin/make-main-dist.sh - src/lisp/GNUmakefile - src/tools/linker.sh Changes: ===================================== bin/make-main-dist.sh ===================================== --- a/bin/make-main-dist.sh +++ b/bin/make-main-dist.sh @@ -96,7 +96,9 @@ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR} install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/ if [ "$EXECUTABLE" = "true" ] then - install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp.a $DESTDIR/lib/cmucl/lib/ + install ${GROUP} ${OWNER} -m 0555 $TARGET/lisp/lisp.a $DESTDIR/lib/cmucl/lib/ + install ${GROUP} ${OWNER} -m 0555 $TARGET/lisp/exec-init.o $DESTDIR/lib/cmucl/lib/ + install ${GROUP} ${OWNER} -m 0555 $TARGET/lisp/exec-final.o $DESTDIR/lib/cmucl/lib/ install ${GROUP} ${OWNER} -m 0755 src/tools/linker.sh $DESTDIR/lib/cmucl/lib/ if [ -f src/tools/$SCRIPT-cmucl-linker-script ]; then install ${GROUP} ${OWNER} -m 0755 src/tools/$SCRIPT-cmucl-linker-script $DESTDIR/lib/cmucl/lib/ ===================================== src/lisp/GNUmakefile ===================================== --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -52,21 +52,15 @@ version.o : version.c version $(CC) ${CFLAGS} $(CPPFLAGS) -DVERSION=`cat version` -c $< lisp: ${OBJS} version.o - $(CC) -g ${OS_LINK_FLAGS} -o ,lisp \ - ${OBJS} version.o \ - ${OS_LIBS} -lm + $(CC) -g ${OS_LINK_FLAGS} -o ,lisp $^ ${OS_LIBS} -lm mv -f ,lisp lisp # Create a library out of all the object files so we can build an # executable. However, we need to remove exec-init.o from the library -# and replace it with exec-final.o because exec-final.o sets the -# builtin_image_flag to 1 so that the runtime knows the runtime -# contains the core sections. lisp.a: version.o ${OBJS} ${EXEC_FINAL_OBJ} $(AR) crs lisp.a ${OBJS} version.o ifneq (${EXEC_FINAL_OBJ},) $(AR) d lisp.a exec-init.o - $(AR) r lisp.a ${EXEC_FINAL_OBJ} endif version: ===================================== src/tools/linker.sh ===================================== --- a/src/tools/linker.sh +++ b/src/tools/linker.sh @@ -139,5 +139,5 @@ trap 'rm -f $OUTDIR/$OPT_IFADDR $OUTDIR/CORRO.o $OUTDIR/CORSTA.o $OUTDIR/CORDYN. (cd $OUTDIR echo "long initial_function_addr = $IFADDR;" > $OPT_IFADDR -$CCOMPILER -m32 -o $OUTNAME $OPT_IFADDR $OPT_ARCHIVE $OPT_CORE $RO_ADDR $STATIC_ADDR $DYN_ADDR $OPT_EXTRA $OS_LIBS -lm) +$CCOMPILER -m32 -o $OUTNAME $OPT_IFADDR $OPT_ARCHIVE $CMUCLLIB/exec-final.o $OPT_CORE $RO_ADDR $STATIC_ADDR $DYN_ADDR $OPT_EXTRA $OS_LIBS -lm) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/20abbd7c903455c9909ccdada…

1 0

[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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs October 2015