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

[Git][cmucl/cmucl][master] Fix #22 where coerce was returning the wrong type of float.
by Raymond Toy 14 May '16

14 May '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: bb4afde9 by Raymond Toy at 2016-05-13T17:37:58-07:00 Fix #22 where coerce was returning the wrong type of float. src/compiler/float.lisp: o The deftransform coerce was checking for a type of 'float and using %single-float to do the conversion. This is incorrect; it should only apply if the type is 'single-float. tests/issues.lisp o Add test for this. Verified that the test fails on the current snapshot and ix fixed by this change. - - - - - 2 changed files: - src/compiler/float-tran.lisp - tests/issues.lisp Changes: ===================================== src/compiler/float-tran.lisp ===================================== --- a/src/compiler/float-tran.lisp +++ b/src/compiler/float-tran.lisp @@ -76,7 +76,7 @@ '(%double-double-float n)) ((csubtypep tspec (specifier-type 'double-float)) '(%double-float n)) - ((csubtypep tspec (specifier-type 'float)) + ((csubtypep tspec (specifier-type 'single-float)) '(%single-float n)) #+double-double ((csubtypep tspec (specifier-type '(complex double-double-float))) ===================================== tests/issues.lisp ===================================== --- a/tests/issues.lisp +++ b/tests/issues.lisp @@ -200,3 +200,13 @@ tests)) `(progn ,@(nreverse tests))))) (make-tests))) + +(define-test issue.22 + (:tag :issues) + (let ((tester (compile nil '(lambda (x) + (coerce x 'float))))) + (assert-eql 1.0 (funcall tester 1)) + (assert-eql 2f0 (funcall tester 2f0)) + (assert-eql 3d0 (funcall tester 3d0)) + (assert-eql 4w0 (funcall tester 4w0)))) + View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/bb4afde9814ae938cc7f8de53…

1 0

[Git][cmucl/cmucl][master] Fix typo in value.
by Raymond Toy 13 May '16

13 May '16

Raymond Toy pushed to branch master at cmucl / cmucl Commits: e50d75bc by Raymond Toy at 2016-05-12T19:17:36-07:00 Fix typo in value. The deftransform for converting an (unsigned-byte 32) to a double-float was using the wrong type of float constant. It should have been a double instead of single. This fix allows sparc to cross-compile itself now. - - - - - 1 changed file: - src/compiler/sparc/float.lisp Changes: ===================================== src/compiler/sparc/float.lisp ===================================== --- a/src/compiler/sparc/float.lisp +++ b/src/compiler/sparc/float.lisp @@ -1061,7 +1061,7 @@ ;; constraint is that the pieces must be small enough to fit in the ;; desired float format without rounding. (frob %single-float %%single-float 12 1f0) - (frob %double-float %%double-float 12 1f0)) + (frob %double-float %%double-float 12 1d0)) (macrolet ((frob (name translate inst to-sc to-type) View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/e50d75bc77d58824c817e2d6c…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Fix compiler warnings.
by Raymond Toy 12 May '16

12 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: f75df562 by Raymond Toy at 2016-05-11T19:30:48-07:00 Fix compiler warnings. - - - - - 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 @@ -506,8 +506,8 @@ void make_stack_holes(void) { #ifdef RELOCATABLE_STACK_START - make_hole(control_stack, control_stack_size); - make_hole(binding_stack, binding_stack_size); + make_hole((os_vm_address_t)control_stack, control_stack_size); + make_hole((os_vm_address_t)binding_stack, binding_stack_size); #endif } View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/f75df5621ded7ba80990fd631…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Fix compiler warnings.
by Raymond Toy 12 May '16

12 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: e9838801 by Raymond Toy at 2016-05-11T19:28:39-07:00 Fix compiler warnings. - - - - - 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 @@ -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, control_stack_size) - || in_range_p(addr, binding_stack, binding_stack_size)); + || in_range_p(addr, (lispobj)control_stack, control_stack_size) + || in_range_p(addr, (lispobj)binding_stack, binding_stack_size)); } /* ---------------------------------------------------------------- */ @@ -414,7 +414,7 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr) * below. */ static os_vm_address_t spaces[] = { - READ_ONLY_SPACE_START, STATIC_SPACE_START + READ_ONLY_SPACE_START, STATIC_SPACE_START, #ifndef RELOCATABLE_STACK_START BINDING_STACK_START, CONTROL_STACK_START @@ -441,7 +441,7 @@ static unsigned long *space_size[] = { #define HOLE_SIZE 0x2000 void -make_hole(char *space_start, size_t space_size) +make_hole(os_vm_address_t space_start, size_t space_size) { os_vm_address_t hole; View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/e9838801cfb11544d7650adcc…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 2 commits: Add comments.
by Raymond Toy 12 May '16

12 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: f81b1ed0 by Raymond Toy at 2016-05-11T19:19:00-07:00 Add comments. - - - - - c15a3f70 by Raymond Toy at 2016-05-11T19:20:40-07:00 Fix up to preserve old behavior without RELOCATABLE_STACK_START. - - - - - 2 changed files: - src/lisp/lisp.c - src/lisp/solaris-os.c Changes: ===================================== src/lisp/lisp.c ===================================== --- a/src/lisp/lisp.c +++ b/src/lisp/lisp.c @@ -687,6 +687,13 @@ main(int argc, const char *argv[], const char *envp[]) if (builtin_image_flag != 0) map_core_sections(argv[0]); #endif + + /* + * Validate the basic lisp spaces first like the heap and static + * and read-only spaces. Do this so that the stacks (if thy're + * relocatable) don't get randomly allocated on top of our desired + * lisp spaces. + */ validate(); gc_init(); validate_stacks(); ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -415,6 +415,10 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr) */ static os_vm_address_t spaces[] = { READ_ONLY_SPACE_START, STATIC_SPACE_START +#ifndef RELOCATABLE_STACK_START + BINDING_STACK_START, + CONTROL_STACK_START +#endif }; /* @@ -458,15 +462,19 @@ make_hole(char *space_start, size_t space_size) void make_holes(void) { + int k; os_vm_address_t hole; /* * Make holes of the appropriate size for desired spaces. The - * stacks are handled in make_stack_holes. + * stacks are handled in make_stack_holes, if they are + * relocatable. */ - make_hole(spaces[0], *space_size[0]); /* Read-only space */ - make_hole(spaces[1], *space_size[1]); /* Static space */ + for (k = 0; k < sizeof(spaces) / sizeof(spaces[0]); ++k) { + make_hole(spaces[k], *space_size[k]); + } + /* Round up the dynamic_space_size to the nearest SPARSE_BLOCK_SIZE */ dynamic_space_size = round_up_sparse_size(dynamic_space_size); @@ -497,8 +505,10 @@ make_holes(void) void make_stack_holes(void) { +#ifdef RELOCATABLE_STACK_START make_hole(control_stack, control_stack_size); make_hole(binding_stack, binding_stack_size); +#endif } void * View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/38fdea64c854d5f0e13f1b16…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] 3 commits: Remove #if 0 code.
by Raymond Toy 11 May '16

11 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: a6339d00 by Raymond Toy at 2016-05-10T21:33:43-07:00 Remove #if 0 code. - - - - - 67f59a2d by Raymond Toy at 2016-05-10T21:33:57-07:00 Add some comments. - - - - - 38fdea64 by Raymond Toy at 2016-05-10T21:34:14-07:00 Fix indentation, add some comments. - - - - - 3 changed files: - src/lisp/save.c - src/lisp/solaris-os.c - src/lisp/validate.c Changes: ===================================== src/lisp/save.c ===================================== --- a/src/lisp/save.c +++ b/src/lisp/save.c @@ -136,11 +136,9 @@ save(char *filename, lispobj init_function, int sse2_mode) } printf("[Undoing binding stack... "); fflush(stdout); -#if 0 - unbind_to_here((lispobj *) BINDING_STACK_START); -#else + unbind_to_here((lispobj *) binding_stack); -#endif + SetSymbolValue(CURRENT_CATCH_BLOCK, 0); SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0); SetSymbolValue(EVAL_STACK_TOP, 0); @@ -282,11 +280,9 @@ save_executable(char *filename, lispobj init_function) printf("[Undoing binding stack... "); fflush(stdout); -#if 0 - unbind_to_here((lispobj *)BINDING_STACK_START); -#else + unbind_to_here((lispobj *)binding_stack); -#endif + SetSymbolValue(CURRENT_CATCH_BLOCK, 0); SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0); SetSymbolValue(EVAL_STACK_TOP, 0); ===================================== src/lisp/solaris-os.c ===================================== --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -409,7 +409,9 @@ os_vm_address_t round_up_sparse_size(os_vm_address_t addr) /* * An array of the start of the spaces which should have holes placed * after them. Must not include the dynamic spaces because the size - * of the dynamic space can be controlled from the command line. + * of the dynamic space can be controlled from the command line. Also + * must not include the binding and control stacks. They're handled + * below. */ static os_vm_address_t spaces[] = { READ_ONLY_SPACE_START, STATIC_SPACE_START ===================================== src/lisp/validate.c ===================================== --- a/src/lisp/validate.c +++ b/src/lisp/validate.c @@ -124,7 +124,7 @@ validate_stacks() ensure_space(control_stack, control_stack_size); #else /* Map the conrol stack wherever we have space */ - control_stack = (lispobj*) 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; @@ -136,6 +136,7 @@ validate_stacks() binding_stack = (lispobj *) BINDING_STACK_START; ensure_space(binding_stack, binding_stack_size); #else + /* Map the binding stack wherever we have space */ binding_stack = (lispobj*) os_validate(NULL, binding_stack_size); #endif #ifdef sparc View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/75d4ea457191cd39b6da88be…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Add RELOCATABLE_STACK_START to control stack spaces for solaris/sparc..
by Raymond Toy 11 May '16

11 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 75d4ea45 by Raymond Toy at 2016-05-10T20:04:58-07:00 Add RELOCATABLE_STACK_START to control stack spaces for solaris/sparc.. When RELOCATABLE_STACK_START is defined, the control stack, binding stack, and sigalt stack are located wherever mmap finds room for them. Only implemented with sparc_sunc config. - - - - - 2 changed files: - src/lisp/Config.sparc_sunc - src/lisp/sparc-validate.h Changes: ===================================== src/lisp/Config.sparc_sunc ===================================== --- a/src/lisp/Config.sparc_sunc +++ b/src/lisp/Config.sparc_sunc @@ -24,7 +24,7 @@ CC_V8PLUS = -m32 -xarch=sparc AS_V8PLUS = -m32 -xarch=sparc endif -CFLAGS += -xlibmieee -O +CFLAGS += -xlibmieee -O -DRELOCATABLE_STACK_START DEPEND_FLAGS = -xM ASFLAGS = $(AS_V8PLUS) OS_LINK_FLAGS = -M /usr/lib/ld/map.noexstk ===================================== src/lisp/sparc-validate.h ===================================== --- a/src/lisp/sparc-validate.h +++ b/src/lisp/sparc-validate.h @@ -92,7 +92,7 @@ #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 +#ifndef RELOCATABLE_STACK_START #define BINDING_STACK_START (0x20000000) #endif @@ -101,7 +101,7 @@ #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 +#ifndef RELOCATABLE_STACK_START #define CONTROL_STACK_START (0x38000000) #endif #define CONTROL_STACK_SIZE (MB_128 - SPARSE_BLOCK_SIZE) /* 128 MB - 32 KB, 128 MB max */ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/75d4ea457191cd39b6da88bec…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Fix typo.
by Raymond Toy 11 May '16

11 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 8b1ba846 by Raymond Toy at 2016-05-10T19:32:43-07:00 Fix typo. We want #ifndef, not #ifdef to enable the relocatable stacks. - - - - - 1 changed file: - src/lisp/x86-validate-linux.h Changes: ===================================== src/lisp/x86-validate-linux.h ===================================== --- a/src/lisp/x86-validate-linux.h +++ b/src/lisp/x86-validate-linux.h @@ -45,17 +45,17 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ -#ifdef RELOCATABLE_STACK_START +#ifndef RELOCATABLE_STACK_START #define BINDING_STACK_START (0x20000000) #endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ -#ifdef RELOCATABLE_STACK_START +#ifndef RELOCATABLE_STACK_START #define CONTROL_STACK_START 0x38000000 #endif #define CONTROL_STACK_SIZE (0x07fff000 - 8192) -#ifdef RELOCATABLE_STACK_START +#ifndef RELOCATABLE_STACK_START #define SIGNAL_STACK_START CONTROL_STACK_END #endif #define SIGNAL_STACK_SIZE SIGSTKSZ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/8b1ba846e64934b696812e005…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Add RELOCATABLE_STACK_START to control stack spaces for linux.
by Raymond Toy 11 May '16

11 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 603fb6a0 by Raymond Toy at 2016-05-10T19:13:32-07:00 Add RELOCATABLE_STACK_START to control stack spaces for linux. When RELOCATABLE_STACK_START is defined, the control stack, binding stack, and sigalt stack are located wherever mmap finds room for them. - - - - - 2 changed files: - src/lisp/Config.x86_linux - src/lisp/x86-validate-linux.h Changes: ===================================== src/lisp/Config.x86_linux ===================================== --- a/src/lisp/Config.x86_linux +++ b/src/lisp/Config.x86_linux @@ -1,7 +1,7 @@ # -*- Mode: makefile -*- include Config.x86_common -CPPFLAGS += -m32 -D__NO_CTYPE -D_GNU_SOURCE +CPPFLAGS += -m32 -D__NO_CTYPE -D_GNU_SOURCE -DRELOCATABLE_STACK_START CFLAGS += -rdynamic -march=pentium4 -mfpmath=sse -mtune=generic UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ===================================== src/lisp/x86-validate-linux.h ===================================== --- a/src/lisp/x86-validate-linux.h +++ b/src/lisp/x86-validate-linux.h @@ -45,17 +45,17 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ -#if 0 +#ifdef RELOCATABLE_STACK_START #define BINDING_STACK_START (0x20000000) #endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ -#if 0 +#ifdef RELOCATABLE_STACK_START #define CONTROL_STACK_START 0x38000000 #endif #define CONTROL_STACK_SIZE (0x07fff000 - 8192) -#if 0 +#ifdef RELOCATABLE_STACK_START #define SIGNAL_STACK_START CONTROL_STACK_END #endif #define SIGNAL_STACK_SIZE SIGSTKSZ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/603fb6a031a14f9d25c4664fd…

1 0

[Git][cmucl/cmucl][rtoy-mmap-anon-control-and-binding-stacks] Add RELOCATABLE_STACK_START to control stack spaces
by Raymond Toy 10 May '16

10 May '16

Raymond Toy pushed to branch rtoy-mmap-anon-control-and-binding-stacks at cmucl / cmucl Commits: 951611cf by Raymond Toy at 2016-05-09T21:02:47-07:00 Add RELOCATABLE_STACK_START to control stack spaces When RELOCATABLE_STACK_START is defined, the control stack, binding stack, and sigalt stack are located wherever mmap finds room for them. Currently only implemented for Darwin, but should work for linux and solaris. We enable this by default on Darwin now. - - - - - 2 changed files: - src/lisp/Config.x86_darwin - src/lisp/x86-validate-darwin.h Changes: ===================================== src/lisp/Config.x86_darwin ===================================== --- a/src/lisp/Config.x86_darwin +++ b/src/lisp/Config.x86_darwin @@ -6,7 +6,7 @@ include Config.x86_common # you have the 10.5 SDK available. MIN_VER = -mmacosx-version-min=10.5 -CPPFLAGS += -DDARWIN $(MIN_VER) -m32 +CPPFLAGS += -DDARWIN $(MIN_VER) -m32 -DRELOCATABLE_STACK_START CFLAGS += -g3 -mtune=generic ASFLAGS += -g3 $(MIN_VER) ===================================== src/lisp/x86-validate-darwin.h ===================================== --- a/src/lisp/x86-validate-darwin.h +++ b/src/lisp/x86-validate-darwin.h @@ -18,12 +18,12 @@ #define STATIC_SPACE_START (SpaceStart_TargetStatic) #define STATIC_SPACE_SIZE (0x0ffff000) /* 256MB - 1 page */ -#if 0 +#ifndef RELOCATABLE_STACK_START #define BINDING_STACK_START (0x38000000) #endif #define BINDING_STACK_SIZE (0x07fff000) /* 128MB - 1 page */ -#if 0 +#ifdef RELOCATABLE_STACK_START #define CONTROL_STACK_START (0x40000000) #endif @@ -33,7 +33,7 @@ */ #define CONTROL_STACK_SIZE (0x07fdf000) /* 128MB - SIGSTKSZ - 1 page */ -#if 0 +#ifndef RELOCATABLE_STACK_START #define SIGNAL_STACK_START (0x47fe0000) /* One page past the end of the control stack */ #endif #define SIGNAL_STACK_SIZE SIGSTKSZ View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/commit/951611cf060cc3977db76fb05…

1 0