cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-extern-alien-name created. 20f-32-g571dd49
by Raymond Toy 10 Oct '14

10 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-extern-alien-name has been created at 571dd4904fc88cad51c9c2dee0b3e6ed6ef9ce12 (commit) - Log ----------------------------------------------------------------- commit 571dd4904fc88cad51c9c2dee0b3e6ed6ef9ce12 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Oct 9 22:54:49 2014 -0700 Unify extern-alien-name for darwin x86 and ppc. Initial attempt to unify extern-alien-name, primarily for darwin (x86 and ppc). Thus, systems using elf do not prepend an underscore, but other systems are assumed to prepend an underscore. This is currently only for darwin/x86. A cross-compile on darwin x86 is needed. * code/x86-vm.lisp: * For elf systems, don't prepend an underscore. For other systems, do prepend. * compiler/generic/new-genesis.lisp: * Fix long-standing bug where we should call EXTERN-ALIEN-NAME to get the right name for "resolve_linkage_tramp". * lisp/Darwin-os.c: * Update os_dlsym to assume the external name is always preceded by an underscore. The lookup for dlysm is done by stripping off the leading underscore. * lisp/os-common.c: * Add EXTERN_ALIEN_NAME macro to create the correct alien name for elf and non-elf systems. * Use it to generate the correct name to be used for comparison in the sanity checks of the linkage table entries. diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index 2171d60..a7e307d 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -336,6 +336,9 @@ ;;; (defun extern-alien-name (name) (declare (type simple-string name)) + #-elf + (concatenate 'string "_" name) + #+elf name) #+(and (or linux (and freebsd elf)) (not linkage-table)) diff --git a/src/compiler/generic/new-genesis.lisp b/src/compiler/generic/new-genesis.lisp index 953d9ba..bae4df7 100644 --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -2183,7 +2183,7 @@ ;; This has gotta be the first entry. This has to match what ;; os_foreign_linkage_init does! #+(or x86 amd64) - (cold-register-foreign-linkage "resolve_linkage_tramp" :code) + (cold-register-foreign-linkage (vm::extern-alien-name "resolve_linkage_tramp") :code) #+(or sparc ppc) (progn (cold-register-foreign-linkage (vm::extern-alien-name "call_into_c") :code) diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c index 0efb72f..49e660c 100644 --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -532,7 +532,13 @@ os_dlsym(const char *sym_name, lispobj lib_list) { static void *program_handle; void *sym_addr = 0; + int offset = sym_name[0] == '_' ? 1 : 0; +#if 1 + if (offset == 0) { + fprintf(stderr, "sym-name = %s\n", sym_name); + } +#endif if (!program_handle) program_handle = dlopen((void *) 0, RTLD_LAZY | RTLD_GLOBAL); if (lib_list != NIL) { @@ -543,21 +549,17 @@ os_dlsym(const char *sym_name, lispobj lib_list) struct cons *lib_cons = CONS(CONS(lib_list_head)->car); struct sap *dlhandle = (struct sap *) PTR(lib_cons->car); -#if 0 && defined(__ppc__) - sym_addr = dlsym((void *) dlhandle->pointer, (sym_name[0] == '_' ? sym_name + 1 : sym_name)); -#else - sym_addr = dlsym((void *) dlhandle->pointer, sym_name); -#endif + /* + * On Darwin, dlsym assumes the C name, so skip the underscore that + * is prepended by EXTERN-ALIEN-NAME. + */ + sym_addr = dlsym((void *) dlhandle->pointer, sym_name + offset); if (sym_addr) - return sym_addr; + return sym_addr; } } -#if 0 && defined(__ppc__) - sym_addr = dlsym(program_handle, (sym_name[0] == '_' ? sym_name + 1 : sym_name)); -#else - sym_addr = dlsym(program_handle, sym_name); -#endif + sym_addr = dlsym(program_handle, sym_name + offset); return sym_addr; } diff --git a/src/lisp/os-common.c b/src/lisp/os-common.c index b183d06..ff9cffb 100755 --- a/src/lisp/os-common.c +++ b/src/lisp/os-common.c @@ -167,6 +167,16 @@ convert_lisp_string(char* c_string, void* lisp_string, int len) return c_string; } +/* + * C version of lisp's EXTERN-ALIEN-NAME. For systems that use elf, + * do nothing. Otherwise, we prepend an underscore. + */ +#if defined(FEATURE_ELF) +#define EXTERN_ALIEN_NAME(x) x +#else +#define EXTERN_ALIEN_NAME(x) "_" x +#endif + void os_foreign_linkage_init(void) { @@ -212,25 +222,27 @@ os_foreign_linkage_init(void) #endif if (i == 0) { #if defined(sparc) - if (type != LINKAGE_CODE_TYPE || strcmp(c_symbol_name, "call_into_c")) { + if (type != LINKAGE_CODE_TYPE || strcmp(c_symbol_name, EXTERN_ALIEN_NAME("call_into_c"))) { fprintf(stderr, "linkage_data is %s but expected call_into_c\n", - (char *) symbol_name->data); + c_symbol_name); lose("First element of linkage_data is bogus.\n"); } arch_make_linkage_entry(i, (void*) call_into_c, 1); #elif (defined(DARWIN) && defined(__ppc__)) - if (type != 1 || strcmp(c_symbol_name, "call_into_c")) { - fprintf(stderr, "linkage_data is %s but expected call_into_c\n", - (char *) c_symbol_name); + if (type != 1 || strcmp(c_symbol_name, EXTERN_ALIEN_NAME("call_into_c"))) { + fprintf(stderr, "linkage_data is %s but expected %s\n", + c_symbol_name, + EXTERN_ALIEN_NAME("call_into_c")); lose("First element of linkage_data is bogus.\n"); } arch_make_linkage_entry(i, &call_into_c, 1); #else if (type != LINKAGE_CODE_TYPE || strcmp(c_symbol_name, - "resolve_linkage_tramp")) { + EXTERN_ALIEN_NAME("resolve_linkage_tramp"))) { fprintf(stderr, - "linkage_data is %s but expected resolve_linkage_tramp\n", - (char *) c_symbol_name); + "linkage_data is %s but expected %s\n", + c_symbol_name, + EXTERN_ALIEN_NAME("resolve_linkage_tramp")); lose("First element of linkage_data is bogus.\n"); } arch_make_linkage_entry(i, (void *) &resolve_linkage_tramp, 1); @@ -241,7 +253,7 @@ os_foreign_linkage_init(void) void *target_addr = os_dlsym(c_symbol_name, NIL); if (!target_addr) { -#if 1 +#if 0 int k; unsigned short int* wide_string; @@ -262,7 +274,6 @@ os_foreign_linkage_init(void) } else { arch_make_lazy_linkage(i / LINKAGE_DATA_ENTRY_SIZE); } - } #endif /* LINKAGE_TABLE */ } diff --git a/src/tools/cross-scripts/cross-x86-x86.lisp b/src/tools/cross-scripts/cross-x86-x86.lisp index 3f579f3..eacbbe1 100644 --- a/src/tools/cross-scripts/cross-x86-x86.lisp +++ b/src/tools/cross-scripts/cross-x86-x86.lisp @@ -205,6 +205,9 @@ (in-package :vm) (defun extern-alien-name (name) (declare (type simple-string name)) + #-elf + (concatenate 'simple-string "_" name) + #+elf name) (export 'extern-alien-name) (in-package :cl-user) ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-31-g57711cc
by Raymond Toy 09 Oct '14

09 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 57711cc2167f4fc4dc5a03f1b7e3b43e5c7e8050 (commit) from 2c1badeff23fe6c6bd1e5f8911b0afdfb005497c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 57711cc2167f4fc4dc5a03f1b7e3b43e5c7e8050 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 8 17:44:04 2014 -0700 First cut at removing ppc-darwin-dlshim.c. Not needed anymore because dlsym works on OSX/ppc like on other ports. A cross-compile was used with cross-ppc-ppc-darwin.lisp. I'm not sure a cross-compile is required, though. * code/ppc-vm.lisp: * EXTERN-ALIEN-NAME doesn't need to prepend an underscore anymore. * lisp/Config.ppc_darwin: * Don't compile/link ppc-darwin-dlshim.c. * lisp/os-common.c: * Don't prepend underscore for call_into_lisp. * tools/cross-scripts/cross-ppc-ppc-darwin.lisp: * EXTERN-ALIEN-NAME doesn't need to prepend an underscore anymore. diff --git a/src/code/ppc-vm.lisp b/src/code/ppc-vm.lisp index 6133533..fa977fd 100644 --- a/src/code/ppc-vm.lisp +++ b/src/code/ppc-vm.lisp @@ -297,10 +297,7 @@ ;;; (defun extern-alien-name (name) (declare (type simple-base-string name)) - #+darwin - (concatenate 'string "_" name) - #-darwin - (concatenate 'string "" name)) + name) #-linkage-table (defun lisp::foreign-symbol-address-aux (name flavor) diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index 4f06648..871a261 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -40,7 +40,8 @@ ASFLAGS = $(OSX_VERSION) -traditional -g -O3 -DDARWIN -Dppc $(LINKAGE) $(GENCGC) UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC = ppc-assem.S linux-stubs.S ARCH_SRC = ppc-arch.c -OS_SRC = ppc-darwin-dlshim.c os-common.c Darwin-os.c +#OS_SRC = ppc-darwin-dlshim.c os-common.c Darwin-os.c +OS_SRC = os-common.c Darwin-os.c ifdef FEATURE_EXECUTABLE diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c index 1f67b68..0efb72f 100644 --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -543,12 +543,21 @@ os_dlsym(const char *sym_name, lispobj lib_list) struct cons *lib_cons = CONS(CONS(lib_list_head)->car); struct sap *dlhandle = (struct sap *) PTR(lib_cons->car); +#if 0 && defined(__ppc__) + sym_addr = dlsym((void *) dlhandle->pointer, (sym_name[0] == '_' ? sym_name + 1 : sym_name)); +#else sym_addr = dlsym((void *) dlhandle->pointer, sym_name); +#endif if (sym_addr) return sym_addr; } } + +#if 0 && defined(__ppc__) + sym_addr = dlsym(program_handle, (sym_name[0] == '_' ? sym_name + 1 : sym_name)); +#else sym_addr = dlsym(program_handle, sym_name); +#endif return sym_addr; } diff --git a/src/lisp/os-common.c b/src/lisp/os-common.c index 90458c9..b183d06 100755 --- a/src/lisp/os-common.c +++ b/src/lisp/os-common.c @@ -219,7 +219,7 @@ os_foreign_linkage_init(void) } arch_make_linkage_entry(i, (void*) call_into_c, 1); #elif (defined(DARWIN) && defined(__ppc__)) - if (type != 1 || strcmp(c_symbol_name, "_call_into_c")) { + if (type != 1 || strcmp(c_symbol_name, "call_into_c")) { fprintf(stderr, "linkage_data is %s but expected call_into_c\n", (char *) c_symbol_name); lose("First element of linkage_data is bogus.\n"); @@ -241,7 +241,7 @@ os_foreign_linkage_init(void) void *target_addr = os_dlsym(c_symbol_name, NIL); if (!target_addr) { -#if 0 +#if 1 int k; unsigned short int* wide_string; diff --git a/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp b/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp index 3be7ae6..02e05ef 100644 --- a/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp +++ b/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp @@ -31,7 +31,7 @@ (in-package :vm) (defun extern-alien-name (name) (declare (type simple-string name)) - (concatenate 'string "_" name)) + name) ;; When compiling the compiler, vm:fixup-code-object and ;; vm:sanctify-for-execution are undefined. Import these to get rid ;; of that error. @@ -199,7 +199,7 @@ (in-package :vm) (defun extern-alien-name (name) (declare (type simple-string name)) - (concatenate 'string "_" name)) + name) (export 'extern-alien-name) (export 'fixup-code-object) (export 'sanctify-for-execution) ----------------------------------------------------------------------- Summary of changes: src/code/ppc-vm.lisp | 5 +---- src/lisp/Config.ppc_darwin | 3 ++- src/lisp/Darwin-os.c | 9 +++++++++ src/lisp/os-common.c | 4 ++-- src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp | 4 ++-- 5 files changed, 16 insertions(+), 9 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-30-g2c1bade
by Raymond Toy 09 Oct '14

09 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 2c1badeff23fe6c6bd1e5f8911b0afdfb005497c (commit) from 261157bc0f082d35dec3ef0dbd7315c263f45a3e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2c1badeff23fe6c6bd1e5f8911b0afdfb005497c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 8 17:32:58 2014 -0700 Fix issue with negative value for lisp::cycles-per-tick. This causes negative cpu cyles with TIME. Basic issue is that a cpu frequency of 2.3 GHZ won't fit in an int. Use an unsigned int. We also take this opportunity to use a rounded value for clocks-per-tick instead of truncating. For this particular case the ratio is actual 68.99 which would truncated to 68. We should probably use 69 instead. diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c index 5e8ddf9..1f67b68 100644 --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -66,8 +66,8 @@ void timebase_init(void) { int mib[2]; - int tbfrequency; - int cpufrequency; + unsigned tbfrequency; + unsigned cpufrequency; unsigned int miblen; size_t len; @@ -95,7 +95,7 @@ timebase_init(void) perror("Error getting HW_CPU_FREQ from sysctl: "); } - cycles_per_tick = cpufrequency / tbfrequency; + cycles_per_tick = 0.5 + (cpufrequency / (double) tbfrequency); } #endif ----------------------------------------------------------------------- Summary of changes: src/lisp/Darwin-os.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-29-g261157b
by Raymond Toy 07 Oct '14

07 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 261157bc0f082d35dec3ef0dbd7315c263f45a3e (commit) via c453dd317387c012ad7ee28603352ccc4be2ea50 (commit) from b2b4d88a7f92c5e9f7225f18c41a8f18c87e6c3c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 261157bc0f082d35dec3ef0dbd7315c263f45a3e Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Oct 6 22:16:15 2014 -0700 Update sparc cross-compile script. Needed to add OLD-VM:CHAR-BYTES. Cross-compile works again on sparc. diff --git a/src/tools/cross-scripts/cross-sparc-sparc.lisp b/src/tools/cross-scripts/cross-sparc-sparc.lisp index 20c4c67..0746747 100644 --- a/src/tools/cross-scripts/cross-sparc-sparc.lisp +++ b/src/tools/cross-scripts/cross-sparc-sparc.lisp @@ -145,6 +145,7 @@ syms)))) (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS OLD-VM:CHAR-BITS + OLD-VM:CHAR-BYTES OLD-VM:LOWTAG-BITS #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE commit c453dd317387c012ad7ee28603352ccc4be2ea50 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Oct 6 21:19:25 2014 -0700 Update ppc cross-compile script. Copied some things over from the sparc cross-compile script, and added the needed OLD-VM:CHAR-BYTES. With these changes, ppc can now do a ppc-to-ppc cross compile. diff --git a/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp b/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp index 6868295..3be7ae6 100644 --- a/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp +++ b/src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp @@ -32,10 +32,17 @@ (defun extern-alien-name (name) (declare (type simple-string name)) (concatenate 'string "_" name)) +;; When compiling the compiler, vm:fixup-code-object and +;; vm:sanctify-for-execution are undefined. Import these to get rid +;; of that error. +(import 'old-vm::fixup-code-object) +(import 'old-vm::sanctify-for-execution) (export 'extern-alien-name) (export 'fixup-code-object) (export 'sanctify-for-execution) +(in-package :cl-user) + ;;; Compile the new backend. (pushnew :bootstrap *features*) (pushnew :building-cross-compiler *features*) @@ -118,6 +125,8 @@ syms)))) (frob OLD-VM:BYTE-BITS OLD-VM:WORD-BITS OLD-VM:CHAR-BITS + OLD-VM:CHAR-BYTES + OLD-VM:LOWTAG-BITS #+long-float OLD-VM:SIMPLE-ARRAY-LONG-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-DOUBLE-FLOAT-TYPE OLD-VM:SIMPLE-ARRAY-SINGLE-FLOAT-TYPE @@ -136,17 +145,25 @@ OLD-VM:SIMPLE-BIT-VECTOR-TYPE OLD-VM:SIMPLE-STRING-TYPE OLD-VM:SIMPLE-VECTOR-TYPE OLD-VM:SIMPLE-ARRAY-TYPE OLD-VM:VECTOR-DATA-OFFSET + OLD-VM:DOUBLE-FLOAT-DIGITS OLD-VM:DOUBLE-FLOAT-EXPONENT-BYTE OLD-VM:DOUBLE-FLOAT-NORMAL-EXPONENT-MAX OLD-VM:DOUBLE-FLOAT-SIGNIFICAND-BYTE OLD-VM:SINGLE-FLOAT-EXPONENT-BYTE OLD-VM:SINGLE-FLOAT-NORMAL-EXPONENT-MAX OLD-VM:SINGLE-FLOAT-SIGNIFICAND-BYTE - )) - -;; Modular arith hacks + ) + #+double-double + (frob OLD-VM:SIMPLE-ARRAY-COMPLEX-DOUBLE-DOUBLE-FLOAT-TYPE + OLD-VM:SIMPLE-ARRAY-DOUBLE-DOUBLE-FLOAT-TYPE) + ) + +;; Modular arith hacks. When cross-compiling, the compiler wants to +;; constant-fold some stuff, and it needs the following functions to +;; do so. This just gets rid of the hundreds of errors that happen. (setf (fdefinition 'vm::ash-left-mod32) #'old-ppc::ash-left-mod32) (setf (fdefinition 'vm::lognot-mod32) #'old-ppc::lognot-mod32) +;; End modular arith hacks ;; Fused multiply hack. Don't know why this is needed for a cross-compile (setf (fdefinition 'vm::fused-multiply-add) #'old-ppc::fused-multiply-add) ----------------------------------------------------------------------- Summary of changes: src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp | 23 ++++++++++++++++++--- src/tools/cross-scripts/cross-sparc-sparc.lisp | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-27-gb2b4d88
by Raymond Toy 05 Oct '14

05 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via b2b4d88a7f92c5e9f7225f18c41a8f18c87e6c3c (commit) from f0749bb7ee7aecd1e1f086505b1c1387078bee70 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b2b4d88a7f92c5e9f7225f18c41a8f18c87e6c3c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 4 15:36:51 2014 -0700 Update with latest changes. diff --git a/src/general-info/release-21a.txt b/src/general-info/release-21a.txt new file mode 100644 index 0000000..d62509c --- /dev/null +++ b/src/general-info/release-21a.txt @@ -0,0 +1,48 @@ +========================== 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. + +CMUCL is a free, high performance implementation of the Common Lisp +programming language which runs on most major Unix platforms. It +mainly conforms to the ANSI Common Lisp standard. CMUCL provides a +sophisticated native code compiler; a powerful foreign function +interface; an implementation of CLOS, the Common Lisp Object System, +which includes multi-methods and a meta-object protocol; a source-level +debugger and code profiler; and an Emacs-like editor implemented in +Common Lisp. CMUCL is maintained by a team of volunteers collaborating +over the Internet, and is mostly in the public domain. + +New in this release: + * Known issues: + + * Feature enhancements + + * Changes + * Micro-optimize SCALE-FLOAT to do multiplication when possible. + + * ANSI compliance fixes: + + * Bugfixes: + + * Trac Tickets: + + * Other changes: + + * Improvements to the PCL implementation of CLOS: + + * Changes to building procedure: + + +This release is not binary compatible with code compiled using CMUCL +20f; you will need to recompile FASL files. + +See <URL:http://www.cmucl.org> or +<URL:http://trac.common-lisp.net/cmucl> for download information, +guidelines on reporting bugs, and mailing list details. + + +We hope you enjoy using this release of CMUCL! ----------------------------------------------------------------------- Summary of changes: src/general-info/release-21a.txt | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/general-info/release-21a.txt hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-26-gf0749bb
by Raymond Toy 04 Oct '14

04 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via f0749bb7ee7aecd1e1f086505b1c1387078bee70 (commit) via 0fe511923eb65793aaa0bd17339e5cfa256ef4b9 (commit) via 227e5085c4e1bc0792c77a2cf0f06bfa518e4a38 (commit) via 8329e1d53ee57bf375c63675642b21358790ea2b (commit) via ab0a979db83310c64fcbbc13b178d5c31af9f5c9 (commit) via 878f7c4337d04265d067a90d29acca0d868cd35d (commit) via 44697013015d63a72c1dc5b0a62f4331c333931c (commit) via bcc8cd7dd797fe3998efdca0cf2adfe49150bb3f (commit) via b51c9978bcfab5952438a1c831949c8f387cfc90 (commit) via 8fb489459a9f50049a5eb8cf3ccc06f8225e98bc (commit) via 02c1bde6f02c195a17d76dc57fd18562ef52bbea (commit) from 8f5f6abc07afeb0822ae48b3615c83734960dda6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f0749bb7ee7aecd1e1f086505b1c1387078bee70 Merge: 8f5f6ab 0fe5119 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 4 14:45:30 2014 -0700 Merge branch '20f-branch' Conflicts: src/lisp/GNUmakefile tests/float-tran.lisp tests/float.lisp ----------------------------------------------------------------------- Summary of changes: .../{20b/boot-20c.lisp => 20e/boot-20f.lisp} | 14 ++++++------ src/compiler/byte-comp.lisp | 2 +- src/docs/cmu-user/cmu-user.tex | 2 +- src/general-info/release-20f.txt | 24 +++++++++----------- 4 files changed, 20 insertions(+), 22 deletions(-) copy src/bootfiles/{20b/boot-20c.lisp => 20e/boot-20f.lisp} (89%) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp annotated tag 20f created. 20f
by Raymond Toy 04 Oct '14

04 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The annotated tag, 20f has been created at 914a17ff670ea6452134bc16ac7b752a25fe17f1 (tag) tagging 0fe511923eb65793aaa0bd17339e5cfa256ef4b9 (commit) replaces snapshot-2014-09 tagged by Raymond Toy on Sat Oct 4 12:48:44 2014 -0700 - Log ----------------------------------------------------------------- Release 20f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (Darwin) iEYEABECAAYFAlQwTyUACgkQJ5IjUmgZO7I5QACcC6KI5d8jJB9yRC+DzNMNpWQR +h8AoKeBPpahR0C+e8TYD8MFWbb/xuG1 =WiUB -----END PGP SIGNATURE----- Raymond Toy (15): Remove redundant entry and rephrase an entry. Export of double-double-float-digits should be within eval-when. Wrap all exports in eval-when since export is now an ordinary function Support FP exceptions on NetBSD without feraiseexcept. Oops. Source tarballs need to include the tests directory. Update the version. Remove the NetBSD setexception changes on the master branch. This is Fix error in type derivation for the sign in DECODE-FLOAT. Fix type derivation of the exponent for DECODE-FLOAT. Oops. Remove debugging print left in from commit [c0052f55] Regenerate. Fix incorrect value from INTEGER-DECODE-FLOAT for denormals. Fix regression in %ENUMERATE-DIRECTORIES. Editorial fixes. Update fasl version to 20f. ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch 20f-branch updated. snapshot-2014-09-15-g0fe5119
by Raymond Toy 04 Oct '14

04 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, 20f-branch has been updated via 0fe511923eb65793aaa0bd17339e5cfa256ef4b9 (commit) from 227e5085c4e1bc0792c77a2cf0f06bfa518e4a38 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0fe511923eb65793aaa0bd17339e5cfa256ef4b9 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 4 12:37:35 2014 -0700 Update fasl version to 20f. * bootfiles/20e/boot-20f.lisp * Bootstrap the version change * compiler/byte-comp.lisp * Update the fasl version to 20f. Use boot-20f as the bootstrap file when compiling from the 2014-09 snapshot. diff --git a/src/bootfiles/20e/boot-20f.lisp b/src/bootfiles/20e/boot-20f.lisp new file mode 100644 index 0000000..62024ba --- /dev/null +++ b/src/bootfiles/20e/boot-20f.lisp @@ -0,0 +1,68 @@ +;;;; +;;;; Boot file for changing the fasl file version numbers to 20f. +;;;; + +(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!) +;;; +#-cmu20f +(setf (symbol-value 'byte-fasl-file-version) #x20f) +#-cmu20f +(setf (backend-fasl-file-version *target-backend*) #x20f) + +;;; +;;; Don't check fasl versions in the compiling Lisp because we'll +;;; load files compiled with the new version numbers. +;;; +#-cmu20f +(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. +;;; +#-cmu20f +(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)) + diff --git a/src/compiler/byte-comp.lisp b/src/compiler/byte-comp.lisp index 49810d6..2d2b3ac 100644 --- 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 #x20e) +(defconstant byte-fasl-file-version #x20f) (let* ((version-string (format nil "~X" byte-fasl-file-version))) ;; Add :cmu<n> to *features* ----------------------------------------------------------------------- Summary of changes: src/bootfiles/{20b/boot-20c.lisp => 20e/boot-20f.lisp} | 14 +++++++------- src/compiler/byte-comp.lisp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) copy src/bootfiles/{20b/boot-20c.lisp => 20e/boot-20f.lisp} (89%) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-09-30-g8f5f6ab
by Raymond Toy 02 Oct '14

02 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 8f5f6abc07afeb0822ae48b3615c83734960dda6 (commit) from 3ff38ffa166153b7266ecdb04a3ff59b85b4c0b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8f5f6abc07afeb0822ae48b3615c83734960dda6 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 1 21:25:58 2014 -0700 Micro-optimize SCALE-FLOAT to use multiplication when possible. If the exponent (second arg of SCALE-FLOAT) is such that 2^exponent can be represented as a float (single or double), we can implement SCALE-FLOAT using a multiplication by 2^exponent, since multiplication by 2^exponent is exact. * src/compiler/float-tran.lisp: * Update deftransforms for SCALE-FLOAT to do a multiply when possible. * tests/float-tran.lisp: * Add tests to make sure the deftransforms for SCALE-FLOAT are applied appropriately. diff --git a/src/compiler/float-tran.lisp b/src/compiler/float-tran.lisp index 23aa93f..6efe701 100644 --- a/src/compiler/float-tran.lisp +++ b/src/compiler/float-tran.lisp @@ -488,21 +488,50 @@ '(integer-decode-double-float x)) (deftransform scale-float ((f ex) (single-float *) * :when :both) - (if (and (backend-featurep :x86) - (not (backend-featurep :sse2)) - (csubtypep (continuation-type ex) - (specifier-type '(signed-byte 32))) - (not (byte-compiling))) - '(coerce (%scalbn (coerce f 'double-float) ex) 'single-float) - '(scale-single-float f ex))) + (cond ((and (backend-featurep :x86) + (not (backend-featurep :sse2)) + (csubtypep (continuation-type ex) + (specifier-type '(signed-byte 32))) + (not (byte-compiling))) + '(coerce (%scalbn (coerce f 'double-float) ex) 'single-float)) + ((csubtypep (continuation-type ex) + (specifier-type `(integer #.(- vm:single-float-normal-exponent-min + vm:single-float-bias + vm:single-float-digits) + #.(- vm:single-float-normal-exponent-max + vm:single-float-bias + 1)))) + ;; The exponent is such that 2^ex will fit in a single-float. + ;; Thus, scale-float can be done multiplying by a suitable + ;; constant. + `(* f (kernel:make-single-float (dpb (+ ex (1+ vm:single-float-bias)) + vm:single-float-exponent-byte + (kernel:single-float-bits 1f0))))) + (t + '(scale-single-float f ex)))) (deftransform scale-float ((f ex) (double-float *) * :when :both) - (if (and (backend-featurep :x86) - (not (backend-featurep :sse2)) - (csubtypep (continuation-type ex) - (specifier-type '(signed-byte 32)))) - '(%scalbn f ex) - '(scale-double-float f ex))) + (cond ((and (backend-featurep :x86) + (not (backend-featurep :sse2)) + (csubtypep (continuation-type ex) + (specifier-type '(signed-byte 32)))) + '(%scalbn f ex)) + ((csubtypep (continuation-type ex) + (specifier-type `(integer #.(- vm:double-float-normal-exponent-min + vm:double-float-bias + vm:double-float-digits) + #.(- vm:double-float-normal-exponent-max + vm:double-float-bias + 1)))) + ;; The exponent is such that 2^ex will fit in a double-float. + ;; Thus, scale-float can be done multiplying by a suitable + ;; constant. + `(* f (kernel:make-double-float (dpb (+ ex (1+ vm:double-float-bias)) + vm:double-float-exponent-byte + (kernel::double-float-bits 1d0)) + 0))) + (t + '(scale-double-float f ex)))) ;;; toy(a)rtp.ericsson.se: ;;; diff --git a/tests/float-tran.lisp b/tests/float-tran.lisp index 9b84659..8eb1990 100644 --- a/tests/float-tran.lisp +++ b/tests/float-tran.lisp @@ -152,3 +152,61 @@ ;; test-fun should have transformed (log x 10) to kernel:%log10 (assert-true (search "log10" (with-output-to-string (*standard-output*) (disassemble test-fun-good-2)))))) + +(define-test scale-float-transform.single + (let ((xfrm-scale + (compile nil + (lambda (x n) + (declare (single-float x) + (type (integer -149 127) n)) + (scale-float x n)))) + (scale + (compile nil + (lambda (x n) + (declare (single-float x) + (type (signed-byte 32) n)) + (scale-float x n))))) + ;; If the deftransform for scale-float was applied, (scale-float + ;; most-positive-single-float 2) is done as a multiplication which + ;; will overflow. The operation will be '*. If the deftransform + ;; was not applied, the overflow will still be signaled, but the + ;; operation will be 'scale-float. + (assert-eql '* + (handler-case + (funcall xfrm-scale most-positive-single-float 2) + (arithmetic-error (c) + (arithmetic-error-operation c)))) + (assert-eql 'scale-float + (handler-case + (funcall scale most-positive-single-float 2) + (arithmetic-error (c) + (arithmetic-error-operation c)))))) + +(define-test scale-float-transform.double + (let ((xfrm-scale + (compile nil + (lambda (x n) + (declare (double-float x) + (type (integer -1074 1023) n)) + (scale-float x n)))) + (scale + (compile nil + (lambda (x n) + (declare (double-float x) + (type (signed-byte 32) n)) + (scale-float x n))))) + ;; If the deftransform for scale-float was applied, (scale-float + ;; most-positive-double-float 2) is done as a multiplication which + ;; will overflow. The operation will be '*. If the deftransform + ;; was not applied, the overflow will still be signaled, but the + ;; operation will be 'scale-float. + (assert-eql '* + (handler-case + (funcall xfrm-scale most-positive-double-float 2) + (arithmetic-error (c) + (arithmetic-error-operation c)))) + (assert-eql 'scale-float + (handler-case + (funcall scale most-positive-double-float 2) + (arithmetic-error (c) + (arithmetic-error-operation c)))))) ----------------------------------------------------------------------- Summary of changes: src/compiler/float-tran.lisp | 55 +++++++++++++++++++++++++++++---------- tests/float-tran.lisp | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 13 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-09-29-g3ff38ff
by Raymond Toy 02 Oct '14

02 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 3ff38ffa166153b7266ecdb04a3ff59b85b4c0b4 (commit) from 2f316750cc7f9ed3b49349c2ca858a8d31e1ceb9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3ff38ffa166153b7266ecdb04a3ff59b85b4c0b4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 1 20:59:56 2014 -0700 Add FAST-ASH-C/FIXNUM=>SIGNED vop. This allows the compiler to shift a fixnum to a signed-reg without first converting the fixnum to a signed-reg, saving a shift. diff --git a/src/compiler/x86/arith.lisp b/src/compiler/x86/arith.lisp index d889e47..3b51b05 100644 --- a/src/compiler/x86/arith.lisp +++ b/src/compiler/x86/arith.lisp @@ -750,6 +750,41 @@ ;; at the low five bits of the result. (inst sar result (min 31 (- amount))))))))) +(define-vop (fast-ash-c/fixnum=>signed) + (:translate ash) + (:policy :fast-safe) + (:args (number :scs (any-reg) :target result + :load-if (not (and (sc-is number signed-stack) + (sc-is result signed-stack) + (location= number result))))) + (:info amount) + (:arg-types fixnum (:constant integer)) + (:results (result :scs (signed-reg) + :load-if (not (and (sc-is number signed-stack) + (sc-is result signed-stack) + (location= number result))))) + (:result-types signed-num) + (:note "inline ASH") + (:generator 1 + (let ((shift (- amount vm:fixnum-tag-bits))) + (cond ((and (= shift 1) (not (location= number result))) + (inst lea result (make-ea :dword :index number :scale 2))) + ((and (= shift 2) (not (location= number result))) + (inst lea result (make-ea :dword :index number :scale 4))) + ((and (= shift 3) (not (location= number result))) + (inst lea result (make-ea :dword :index number :scale 8))) + (t + (move result number) + (cond ((plusp shift) + ;; We don't have to worry about overflow because of the + ;; result type restriction. + (inst shl result shift)) + (t + ;; If the shift is greater than 31, only shift by 31. We + ;; have to do this because the shift instructions only look + ;; at the low five bits of the result. + (inst sar result (min 31 (- shift)))))))))) + (define-vop (fast-ash-left/unsigned=>unsigned) (:translate ash) (:args (number :scs (unsigned-reg) :target result ----------------------------------------------------------------------- Summary of changes: src/compiler/x86/arith.lisp | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cmucl-cvs