cmucl-cvs

cmucl-cvs@common-lisp.net

2904 discussions

[cmucl-cvs] [git] CMU Common Lisp annotated tag snapshot-2012-01 created. snapshot-2012-01
by Raymond Toy 07 Jan '12

07 Jan '12

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, snapshot-2012-01 has been created at 17abdbdd73754cabde8168140791a60b2ca5df8f (tag) tagging 83969ea4c63b18b97bee81a859467a0f00697955 (commit) replaces snapshot-2011-12 tagged by Raymond Toy on Sat Jan 7 10:39:05 2012 -0800 - Log ----------------------------------------------------------------- Snapshot 2012-01 Raymond Toy (35): Fix (format t "a~0&b"): No newline should be printed. Merge branch 'master' of ssh://rtoy.dyndns.org/Volumes/share2/src/clnet/cmucl/dev/src Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Fix ticket:50 Fix ticket:50 Include the bin directory so we include the build scripts in the src Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Use gcc-4.2 explicitly in case Xcode4 is installed. Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Print out more digits for double-floats in ldb printer. Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Fix a few compiler warnings. Make stack 16-byte aligned. Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Fix compiler warning about not using result of fgets. It's ok to include elf.h on Darwin. Need definition of Prevent ldb from endless printing the prompt if EOF is reached. Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Fix more compiler warnings. Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl Get rid of more compiler warnings on Linux by making HANDLER_ARGS Update HANDLER_ARGS to match sa_sigaction type. Fix potential write past end of buffer. Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl Solaris/x86 cc doesn't like $##bytes; use $bytes instead. This works STRING-TO-NFC and friends are available on 8-bit lisps too. The SIGFPE with no exceptions clause really only applies when we're Fix some compiler warnings on sparc about sigcontexts. Update from logs ----------------------------------------------------------------------- hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-35-g83969ea
by Raymond Toy 07 Jan '12

07 Jan '12

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 83969ea4c63b18b97bee81a859467a0f00697955 (commit) from cba6f60b2f9b38ed9d7beff3666a9b0a4afcca46 (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 83969ea4c63b18b97bee81a859467a0f00697955 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Jan 7 10:01:27 2012 -0800 Update from logs diff --git a/src/general-info/release-20d.txt b/src/general-info/release-20d.txt index d73037c..da5c74f 100644 --- a/src/general-info/release-20d.txt +++ b/src/general-info/release-20d.txt @@ -31,14 +31,25 @@ New in this release: details. * ANSI compliance fixes: + * CMUCL was not printing pathnames like (make-pathname :directory + '(:absolute "tmp" "" "/")) correctly. This is now printed using + #P(...). * Bugfixes: * DECODE-FLOAT was not correctly declared and could not be compiled to handle double-double-floats. + * The source distribution now includes the scripts from the bin + directory, which was previously missing. + * The stack needs to be 16-byte aligned on Darwin. + * ldb no longer prints prompts forever when EOF is reached. * Trac Tickets: * Other changes: + * The layout of the cmucl directories has been changed. + * On darwin/x86, gcc-4.2 is explicitly used in case Xcode 4 is + installed. CMUCL doesn't run correctly when built with gcc/llvm + in Xcode 4. * Improvements to the PCL implementation of CLOS: ----------------------------------------------------------------------- Summary of changes: src/general-info/release-20d.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-34-gcba6f60
by Raymond Toy 07 Jan '12

07 Jan '12

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 cba6f60b2f9b38ed9d7beff3666a9b0a4afcca46 (commit) from b57f6029c505b50eb9bfa97784627076ed4242f6 (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 cba6f60b2f9b38ed9d7beff3666a9b0a4afcca46 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Jan 6 19:29:01 2012 -0800 Fix some compiler warnings on sparc about sigcontexts. sunos-os.h: o Update HANDLER_ARGS to match definition used in sigaction. o Define os_context_t lisp.c: solaris-os.c: sparc-arch.c: o Use os_context_t as needed. diff --git a/src/lisp/lisp.c b/src/lisp/lisp.c index 2eb000f..c489cb0 100644 --- a/src/lisp/lisp.c +++ b/src/lisp/lisp.c @@ -51,9 +51,11 @@ static void sigint_handler(HANDLER_ARGS) { + os_context_t *os_context = (os_context_t *) context; + SAVE_CONTEXT(); - printf("\nSIGINT hit at 0x%08lX\n", (unsigned long) SC_PC(context)); + printf("\nSIGINT hit at 0x%08lX\n", (unsigned long) SC_PC(os_context)); ldb_monitor(); } diff --git a/src/lisp/solaris-os.c b/src/lisp/solaris-os.c index fa1a45e..b0dfc4c 100644 --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -225,6 +225,8 @@ void real_segv_handler(HANDLER_ARGS) void segv_handler(HANDLER_ARGS) { + os_context_t *os_context = (os_context_t *) context; + caddr_t addr = code->si_addr; SAVE_CONTEXT(); @@ -275,7 +277,7 @@ segv_handler(HANDLER_ARGS) /* a *real* protection fault */ fprintf(stderr, "segv_handler: Real protection violation: %p, PC = %p\n", addr, - context->uc_mcontext.gregs[1]); + os_context->uc_mcontext.gregs[1]); real_segv_handler(signal, code, context); } #else diff --git a/src/lisp/sparc-arch.c b/src/lisp/sparc-arch.c index 0d98599..5027179 100644 --- a/src/lisp/sparc-arch.c +++ b/src/lisp/sparc-arch.c @@ -38,19 +38,20 @@ arch_get_bad_addr(HANDLER_ARGS) { unsigned int badinst; int rs1; - + os_context_t *os_context = (os_context_t *) context; + /* On the sparc, we have to decode the instruction. */ /* Make sure it's not the pc thats bogus, and that it was lisp code */ /* that caused the fault. */ - if ((SC_PC(context) & 3) != 0 || - ((SC_PC(context) < READ_ONLY_SPACE_START || - SC_PC(context) >= READ_ONLY_SPACE_START + read_only_space_size) && - ((lispobj *) SC_PC(context) < current_dynamic_space && - (lispobj *) SC_PC(context) >= + if ((SC_PC(os_context) & 3) != 0 || + ((SC_PC(os_context) < READ_ONLY_SPACE_START || + SC_PC(os_context) >= READ_ONLY_SPACE_START + read_only_space_size) && + ((lispobj *) SC_PC(os_context) < current_dynamic_space && + (lispobj *) SC_PC(os_context) >= current_dynamic_space + dynamic_space_size))) return 0; - badinst = *(unsigned int *) SC_PC(context); + badinst = *(unsigned int *) SC_PC(os_context); if ((badinst >> 30) != 3) /* All load/store instructions have op = 11 (binary) */ @@ -65,19 +66,18 @@ arch_get_bad_addr(HANDLER_ARGS) if (simm13 & (1 << 12)) simm13 |= -1 << 13; - return (os_vm_address_t) (SC_REG(context, rs1) + simm13); + return (os_vm_address_t) (SC_REG(os_context, rs1) + simm13); } else { /* r[rs1] + r[rs2] */ int rs2 = badinst & 0x1f; - return (os_vm_address_t) (SC_REG(context, rs1) + SC_REG(context, rs2)); + return (os_vm_address_t) (SC_REG(os_context, rs1) + SC_REG(os_context, rs2)); } } void -arch_skip_instruction(context) - struct sigcontext *context; +arch_skip_instruction(os_context_t *context) { /* Skip the offending instruction */ SC_PC(context) = SC_NPC(context); @@ -425,6 +425,8 @@ handle_allocation_trap(struct sigcontext *context) static void sigill_handler(HANDLER_ARGS) { + os_context_t *os_context = (os_context_t *) context; + SAVE_CONTEXT(); /* @@ -441,13 +443,13 @@ sigill_handler(HANDLER_ARGS) * a bad idea to have interrupts enabled here.) */ #if 0 - sigprocmask(SIG_SETMASK, &context->uc_sigmask, 0); + sigprocmask(SIG_SETMASK, &os_context->uc_sigmask, 0); #endif if (CODE(code) == ILLTRAP_INST) { int illtrap_code; unsigned int inst; - unsigned int *pc = (unsigned int *) (SC_PC(context)); + unsigned int *pc = (unsigned int *) (SC_PC(os_context)); inst = *pc; @@ -455,88 +457,88 @@ sigill_handler(HANDLER_ARGS) switch (illtrap_code) { case trap_PendingInterrupt: - arch_skip_instruction(context); - interrupt_handle_pending(context); + arch_skip_instruction(os_context); + interrupt_handle_pending(os_context); break; case trap_Halt: - fake_foreign_function_call(context); + fake_foreign_function_call(os_context); lose("%%primitive halt called; the party is over.\n"); case trap_Error: case trap_Cerror: - interrupt_internal_error(signal, code, context, + interrupt_internal_error(signal, code, os_context, illtrap_code == trap_Cerror); break; case trap_Breakpoint: enable_some_signals(); - handle_breakpoint(signal, CODE(code), context); + handle_breakpoint(signal, CODE(code), os_context); break; case trap_FunctionEndBreakpoint: enable_some_signals(); - SC_PC(context) = + SC_PC(os_context) = (long) handle_function_end_breakpoint(signal, CODE(code), - context); - SC_NPC(context) = SC_PC(context) + 4; + os_context); + SC_NPC(os_context) = SC_PC(os_context) + 4; break; case trap_AfterBreakpoint: *skipped_break_addr = trap_Breakpoint; skipped_break_addr = NULL; - *(unsigned long *) SC_PC(context) = displaced_after_inst; - context->uc_sigmask = orig_sigmask; - os_flush_icache((os_vm_address_t) SC_PC(context), + *(unsigned long *) SC_PC(os_context) = displaced_after_inst; + os_context->uc_sigmask = orig_sigmask; + os_flush_icache((os_vm_address_t) SC_PC(os_context), sizeof(unsigned long)); break; #ifdef trap_DynamicSpaceOverflowWarning case trap_DynamicSpaceOverflowWarning: - arch_skip_instruction(context); + arch_skip_instruction(os_context); enable_some_signals(); interrupt_handle_space_overflow(SymbolFunction (DYNAMIC_SPACE_OVERFLOW_WARNING_HIT), - context); + os_context); break; #endif #ifdef trap_DynamicSpaceOverflowError case trap_DynamicSpaceOverflowError: - arch_skip_instruction(context); + arch_skip_instruction(os_context); enable_some_signals(); interrupt_handle_space_overflow(SymbolFunction (DYNAMIC_SPACE_OVERFLOW_ERROR_HIT), - context); + os_context); break; #endif default: - interrupt_handle_now(signal, code, context); + interrupt_handle_now(signal, code, os_context); break; } } else if (TRAP_INST(code)) { - if (pseudo_atomic_trap_p(context)) { + if (pseudo_atomic_trap_p(os_context)) { /* A trap instruction from a pseudo-atomic. We just need to fixup up alloc-tn to remove the interrupted flag, skip over the trap instruction, and then handle the pending interrupt(s). */ - SC_REG(context, reg_ALLOC) &= ~lowtag_Mask; - arch_skip_instruction(context); - interrupt_handle_pending(context); + SC_REG(os_context, reg_ALLOC) &= ~lowtag_Mask; + arch_skip_instruction(os_context); + interrupt_handle_pending(os_context); } #ifdef GENCGC - else if (allocation_trap_p(context)) { + else if (allocation_trap_p(os_context)) { /* An allocation trap. Call the trap handler and then skip this instruction */ - handle_allocation_trap(context); - arch_skip_instruction(context); + handle_allocation_trap(os_context); + arch_skip_instruction(os_context); } #endif else { - interrupt_internal_error(signal, code, context, FALSE); + interrupt_internal_error(signal, code, os_context, FALSE); } } else { - interrupt_handle_now(signal, code, context); + interrupt_handle_now(signal, code, os_context); } } diff --git a/src/lisp/sunos-os.h b/src/lisp/sunos-os.h index 3e06777..4f59a1a 100644 --- a/src/lisp/sunos-os.h +++ b/src/lisp/sunos-os.h @@ -50,8 +50,10 @@ typedef int os_vm_prot_t; #ifdef SOLARIS #include <ucontext.h> -#define HANDLER_ARGS int signal, siginfo_t *code, struct ucontext *context +#define HANDLER_ARGS int signal, siginfo_t *code, void *context #define CODE(code) ((code) ? code->si_code : 0) +typedef struct ucontext os_context_t__; +#define os_context_t os_context_t__ #ifndef i386 #define SAVE_CONTEXT() save_context() #endif ----------------------------------------------------------------------- Summary of changes: src/lisp/lisp.c | 4 ++- src/lisp/solaris-os.c | 4 ++- src/lisp/sparc-arch.c | 78 +++++++++++++++++++++++++------------------------ src/lisp/sunos-os.h | 4 ++- 4 files changed, 49 insertions(+), 41 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-33-gb57f602
by Raymond Toy 06 Jan '12

06 Jan '12

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 b57f6029c505b50eb9bfa97784627076ed4242f6 (commit) via afbe47a0c7f3400890c897b8bb7af43fc7b20e4c (commit) via f29eb245b1979c66d1e43577a96e7842f4d94b77 (commit) from a29c4320d366db73a86dc135a6bcd17ecfb03876 (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 b57f6029c505b50eb9bfa97784627076ed4242f6 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jan 5 22:04:44 2012 -0800 The SIGFPE with no exceptions clause really only applies when we're not running on solaris/x86. diff --git a/src/code/float-trap.lisp b/src/code/float-trap.lisp index 0ac3898..d800e14 100644 --- a/src/code/float-trap.lisp +++ b/src/code/float-trap.lisp @@ -299,10 +299,10 @@ ;; actually save the status word of the FPU. The ;; operands also seem to be missing. Signal a general ;; arithmetic error. - #+solaris + #+(and x86 solaris) (error 'arithmetic-error :operands operands) - #-solaris - (error (intl:gettext "SIGFPE with no exceptions currently enabled?"))))))) + #-(and x86 solaris) + (error _"SIGFPE with no exceptions currently enabled?")))))) ;;; WITH-FLOAT-TRAPS-MASKED -- Public ;;; commit afbe47a0c7f3400890c897b8bb7af43fc7b20e4c Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jan 5 20:42:53 2012 -0800 STRING-TO-NFC and friends are available on 8-bit lisps too. diff --git a/src/code/exports.lisp b/src/code/exports.lisp index d34e2d3..a46d5bb 100644 --- a/src/code/exports.lisp +++ b/src/code/exports.lisp @@ -909,7 +909,7 @@ "GLYPH" "SGLYPH" "STRING-TO-NFC" "CODEPOINT-LIMIT" "CODEPOINT") - #+unicode + ;; Unicode (:export "STRING-TO-NFC" "STRING-TO-NFD" "STRING-TO-NFKC" "STRING-TO-NFKD" "UNICODE-COMPLETE" "UNICODE-COMPLETE-NAME" commit f29eb245b1979c66d1e43577a96e7842f4d94b77 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Jan 5 20:19:57 2012 -0800 Solaris/x86 cc doesn't like $##bytes; use $bytes instead. This works fine with gcc (on darwin and linux). diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index 5557060..1c166b0 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -71,7 +71,7 @@ GNAME(x): ; #define STACK_PROLOGUE(bytes) \ pushl %ebp ; \ mov %esp, %ebp ; \ - subl $##bytes, %esp ; \ + subl $bytes, %esp ; \ andl $-16, %esp ; /* Undo STACK_PROLOGUE */ ----------------------------------------------------------------------- Summary of changes: src/code/exports.lisp | 2 +- src/code/float-trap.lisp | 6 +++--- src/lisp/x86-assem.S | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-30-ga29c432
by Raymond Toy 04 Jan '12

04 Jan '12

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 a29c4320d366db73a86dc135a6bcd17ecfb03876 (commit) via d1b0e950b7156f8391a124346a175d95af619dc5 (commit) from 31412e299254744d3c7774368065baf2cd494841 (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 a29c4320d366db73a86dc135a6bcd17ecfb03876 Merge: d1b0e95 31412e2 Author: Raymond Toy <rtoy(a)google.com> Date: Wed Jan 4 10:00:32 2012 -0800 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit d1b0e950b7156f8391a124346a175d95af619dc5 Author: Raymond Toy <rtoy(a)google.com> Date: Wed Jan 4 09:58:14 2012 -0800 Fix potential write past end of buffer. We wanted to read one byte into the second byte of "byte", but didn't cast everything correctly, so we ended up reading the byte past the end of "byte". diff --git a/src/motif/server/server.c b/src/motif/server/server.c index 62f6ebd..fe0b224 100644 --- a/src/motif/server/server.c +++ b/src/motif/server/server.c @@ -110,7 +110,10 @@ void greet_client(int socket) { /* Read byte-swap thing */ result = read(socket,&byte,2); if( !result ) fatal_error("greet_client: Unable to read initial data."); - else if( result == 1 ) read(socket,&byte+1,1); + else if( result == 1 ) { + result = read(socket, ((char *) &byte)+1,1); + fatal_error("greet_client: Unable to read initial data."); + } swap_bytes = (byte!=1); if( global_will_trace ) { ----------------------------------------------------------------------- Summary of changes: src/motif/server/server.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-28-g31412e2
by Raymond Toy 04 Jan '12

04 Jan '12

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 31412e299254744d3c7774368065baf2cd494841 (commit) from aa96ed2c3a137c91d1dc5b093c216dab9098f684 (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 31412e299254744d3c7774368065baf2cd494841 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Jan 4 09:42:56 2012 -0800 Update HANDLER_ARGS to match sa_sigaction type. diff --git a/src/lisp/Darwin-os.h b/src/lisp/Darwin-os.h index 0c126ed..180e686 100644 --- a/src/lisp/Darwin-os.h +++ b/src/lisp/Darwin-os.h @@ -28,7 +28,7 @@ typedef int os_vm_prot_t; #define OS_VM_DEFAULT_PAGESIZE 4096 -#define HANDLER_ARGS int signal, siginfo_t *code, os_context_t *context +#define HANDLER_ARGS int signal, siginfo_t *code, void *context #define CODE(code) ((code) ? code->si_code : 0) #define os_context_t ucontext_t #ifdef __i386__ ----------------------------------------------------------------------- Summary of changes: src/lisp/Darwin-os.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-27-gaa96ed2
by Raymond Toy 04 Jan '12

04 Jan '12

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 aa96ed2c3a137c91d1dc5b093c216dab9098f684 (commit) via 746b693fcaf68942e81f54827f0567d2024fa2f2 (commit) via fafec7a74c93e625837de704c17becfa21ec7929 (commit) via 1c272796c2f8e55ed70efee07ab35eb123e15361 (commit) via e5614137527de543e2db8a36acd2bd98d590bf4f (commit) via 7219aff9de80f64693e962be53d6448a5006da17 (commit) via d5c4bf02e10c67057084836549647879584d29bb (commit) via 2a93478cc3f27b51eab5cf03a369c3be3198ecd7 (commit) via 7760d6b885f7f40759bca5e9b0b9d77439c96a94 (commit) via 7a6b43385b08db8414dbef6ebeea1a546fc07d54 (commit) via 1f129c07172f4cb20e7b5bb5f81b751835cdf55d (commit) via 926c825e22595b1a84bc8b506002cef5116a1156 (commit) via 22a7242216b409ea56b0a5c511d92f2b4ce971ad (commit) via 9de92cad019d1644556a9cc6e5108cf08f9dd4b7 (commit) via 3cbda6ca17f8c0a0d5af99cbb4e7b79a9900bc09 (commit) via ff6c7800a9daad265e8179497ccaca578d405ed9 (commit) via b815e78622eaeef8487fb0f4d084c18f279b8e52 (commit) from 771b7ee43d15c24563557b102ec15f466ece13cb (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 aa96ed2c3a137c91d1dc5b093c216dab9098f684 Author: Raymond Toy <rtoy(a)google.com> Date: Wed Jan 4 09:19:58 2012 -0800 Get rid of more compiler warnings on Linux by making HANDLER_ARGS match the sa_sigaction argument types. Adjust code appropriately to use os_context_t appropriately too. diff --git a/src/lisp/Linux-os.c b/src/lisp/Linux-os.c index 20731e2..6c8f10f 100644 --- a/src/lisp/Linux-os.c +++ b/src/lisp/Linux-os.c @@ -406,18 +406,19 @@ sigsegv_handler_tramp(void) void sigsegv_handler(HANDLER_ARGS) { - int fault_addr = context->uc_mcontext.cr2; + os_context_t *os_context = (os_context_t *) context; + int fault_addr = os_context->uc_mcontext.cr2; #ifdef RED_ZONE_HIT - if (os_control_stack_overflow((void *) fault_addr, context)) + if (os_control_stack_overflow((void *) fault_addr, os_context)) return; #endif if (gc_write_barrier(code->si_addr)) return; #if defined(__x86_64) - DPRINTF(0, (stderr, "sigsegv: rip: %p\n", context->uc_mcontext.gregs[REG_RIP])); + DPRINTF(0, (stderr, "sigsegv: rip: %p\n", os_context->uc_mcontext.gregs[REG_RIP])); #else - DPRINTF(0, (stderr, "sigsegv: eip: %x\n", context->uc_mcontext.gregs[REG_EIP])); + DPRINTF(0, (stderr, "sigsegv: eip: %x\n", os_context->uc_mcontext.gregs[REG_EIP])); #endif #ifdef RED_ZONE_HIT @@ -427,13 +428,13 @@ sigsegv_handler(HANDLER_ARGS) to the other stack. */ tramp_signal = signal; tramp_code = *code; - tramp_context = *context; - SC_PC(context) = (unsigned long) sigsegv_handler_tramp; + tramp_context = *os_context; + SC_PC(os_context) = (unsigned long) sigsegv_handler_tramp; return; } #endif - sigsegv_handle_now(signal, code, context); + sigsegv_handle_now(signal, code, os_context); } #else static void diff --git a/src/lisp/Linux-os.h b/src/lisp/Linux-os.h index 06acf3b..b00e454 100644 --- a/src/lisp/Linux-os.h +++ b/src/lisp/Linux-os.h @@ -44,7 +44,7 @@ typedef int os_vm_prot_t; /* like hpux */ void restore_fpu(ucontext_t *); -#define HANDLER_ARGS int signal, siginfo_t *code, ucontext_t *context +#define HANDLER_ARGS int signal, siginfo_t *code, void *context #define CODE(code) ((code) ? code->si_code : 0) #define RESTORE_FPU(context) restore_fpu(context) diff --git a/src/lisp/interrupt.c b/src/lisp/interrupt.c index 39a2d87..de17cee 100644 --- a/src/lisp/interrupt.c +++ b/src/lisp/interrupt.c @@ -406,7 +406,7 @@ interrupt_install_low_level_handler(int signal, void handler(HANDLER_ARGS)) { struct sigaction sa; - sa.sa_sigaction = handler; + sa.sa_sigaction = (void (*)(HANDLER_ARGS)) handler; sigemptyset(&sa.sa_mask); FILLBLOCKSET(&sa.sa_mask); sa.sa_flags = SA_RESTART | SA_SIGINFO; @@ -461,12 +461,12 @@ install_handler(int signal, void handler(HANDLER_ARGS)) if (interrupt_low_level_handlers[signal] == 0) { if (handler == (void (*)(HANDLER_ARGS)) SIG_DFL || handler == (void (*)(HANDLER_ARGS)) SIG_IGN) - sa.sa_sigaction = handler; + sa.sa_sigaction = (void (*)(HANDLER_ARGS)) handler; else if (sigismember(&new, signal)) - sa.sa_sigaction = maybe_now_maybe_later; + sa.sa_sigaction = (void (*)(HANDLER_ARGS)) maybe_now_maybe_later; else - sa.sa_sigaction = interrupt_handle_now_handler; - + sa.sa_sigaction = (void (*)(HANDLER_ARGS)) interrupt_handle_now_handler; + sigemptyset(&sa.sa_mask); FILLBLOCKSET(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_RESTART; diff --git a/src/lisp/x86-arch.c b/src/lisp/x86-arch.c index 474fb87..2932b13 100644 --- a/src/lisp/x86-arch.c +++ b/src/lisp/x86-arch.c @@ -278,11 +278,11 @@ void sigtrap_handler(HANDLER_ARGS) { unsigned int trap; - + os_context_t* os_context = (os_context_t *) context; #if 0 fprintf(stderr, "x86sigtrap: %8x %x\n", - SC_PC(context), *(unsigned char *) (SC_PC(context) - 1)); - fprintf(stderr, "sigtrap(%d %d %x)\n", signal, CODE(code), context); + SC_PC(os_os_context), *(unsigned char *) (SC_PC(os_context) - 1)); + fprintf(stderr, "sigtrap(%d %d %x)\n", signal, CODE(code), os_context); #endif if (single_stepping && (signal == SIGTRAP)) { @@ -292,7 +292,7 @@ sigtrap_handler(HANDLER_ARGS) #ifdef SC_EFLAGS /* Disable single-stepping */ - SC_EFLAGS(context) ^= 0x100; + SC_EFLAGS(os_context) ^= 0x100; #else /* Un-install single step helper instructions. */ *(single_stepping - 3) = single_step_save1; @@ -304,7 +304,7 @@ sigtrap_handler(HANDLER_ARGS) /* * Re-install the breakpoint if possible. */ - if ((int) SC_PC(context) == (int) single_stepping + 1) + if ((int) SC_PC(os_context) == (int) single_stepping + 1) fprintf(stderr, "* Breakpoint not re-install\n"); else { char *ptr = (char *) single_stepping; @@ -318,9 +318,9 @@ sigtrap_handler(HANDLER_ARGS) } /* This is just for info in case monitor wants to print an approx */ - current_control_stack_pointer = (unsigned long *) SC_SP(context); + current_control_stack_pointer = (unsigned long *) SC_SP(os_context); - RESTORE_FPU(context); + RESTORE_FPU(os_context); /* * On entry %eip points just after the INT3 byte and aims at the @@ -329,13 +329,13 @@ sigtrap_handler(HANDLER_ARGS) * arguments to follow. */ - trap = *(unsigned char *) SC_PC(context); + trap = *(unsigned char *) SC_PC(os_context); switch (trap) { case trap_PendingInterrupt: DPRINTF(0, (stderr, "<trap Pending Interrupt.>\n")); - arch_skip_instruction(context); - interrupt_handle_pending(context); + arch_skip_instruction(os_context); + interrupt_handle_pending(os_context); break; case trap_Halt: @@ -345,59 +345,59 @@ sigtrap_handler(HANDLER_ARGS) fpu_save(fpu_state); #endif - fake_foreign_function_call(context); + fake_foreign_function_call(os_context); lose("%%primitive halt called; the party is over.\n"); - undo_fake_foreign_function_call(context); + undo_fake_foreign_function_call(os_context); #ifndef __linux__ fpu_restore(fpu_state); #endif - arch_skip_instruction(context); + arch_skip_instruction(os_context); break; } case trap_Error: case trap_Cerror: DPRINTF(0, (stderr, "<trap Error %x>\n", CODE(code))); - interrupt_internal_error(signal, code, context, CODE(code) == trap_Cerror); + interrupt_internal_error(signal, code, os_context, CODE(code) == trap_Cerror); break; case trap_Breakpoint: #if 0 fprintf(stderr, "*C break\n"); #endif - SC_PC(context) -= 1; + SC_PC(os_context) -= 1; - handle_breakpoint(signal, CODE(code), context); + handle_breakpoint(signal, CODE(code), os_context); #if 0 fprintf(stderr, "*C break return\n"); #endif break; case trap_FunctionEndBreakpoint: - SC_PC(context) -= 1; - SC_PC(context) = - (int) handle_function_end_breakpoint(signal, CODE(code), context); + SC_PC(os_context) -= 1; + SC_PC(os_context) = + (int) handle_function_end_breakpoint(signal, CODE(code), os_context); break; #ifdef trap_DynamicSpaceOverflowWarning case trap_DynamicSpaceOverflowWarning: interrupt_handle_space_overflow(SymbolFunction (DYNAMIC_SPACE_OVERFLOW_WARNING_HIT), - context); + os_context); break; #endif #ifdef trap_DynamicSpaceOverflowError case trap_DynamicSpaceOverflowError: interrupt_handle_space_overflow(SymbolFunction (DYNAMIC_SPACE_OVERFLOW_ERROR_HIT), - context); + os_context); break; #endif default: DPRINTF(0, (stderr, "[C--trap default %d %d %p]\n", signal, CODE(code), - context)); - interrupt_handle_now(signal, code, context); + os_context)); + interrupt_handle_now(signal, code, os_context); break; } } commit 746b693fcaf68942e81f54827f0567d2024fa2f2 Merge: fafec7a 771b7ee Author: Raymond Toy <rtoy(a)google.com> Date: Wed Jan 4 08:38:06 2012 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit fafec7a74c93e625837de704c17becfa21ec7929 Merge: 1c27279 f187450 Author: Raymond Toy <rtoy(a)google.com> Date: Thu Dec 22 14:35:11 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 1c272796c2f8e55ed70efee07ab35eb123e15361 Merge: e561413 43c8a82 Author: Raymond Toy <rtoy(a)google.com> Date: Thu Dec 22 08:26:23 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit e5614137527de543e2db8a36acd2bd98d590bf4f Merge: 7219aff 2326ebc Author: Raymond Toy <rtoy(a)google.com> Date: Wed Dec 21 08:58:30 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 7219aff9de80f64693e962be53d6448a5006da17 Merge: d5c4bf0 d56fecd Author: Raymond Toy <rtoy(a)google.com> Date: Fri Dec 16 08:53:11 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit d5c4bf02e10c67057084836549647879584d29bb Merge: 2a93478 71e768a Author: Raymond Toy <rtoy(a)google.com> Date: Thu Dec 8 10:28:15 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 2a93478cc3f27b51eab5cf03a369c3be3198ecd7 Author: Raymond Toy <rtoy(a)google.com> Date: Thu Dec 8 09:55:36 2011 -0800 Fix ticket:50 Catch the case of " " and signal an error so that we can print such pathnames using the #P(...) syntax. Also catch the case where the directory includes an explicit directory separator, "/", which would not be printed readably either. Update the pot file too. diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index ab2f564..308b8b5 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -488,7 +488,14 @@ (error (intl:gettext ":BACK cannot be represented in namestrings."))) ((member :wild-inferiors) (pieces "**/")) - ((or simple-string pattern (eql :wild)) + (simple-string + (when (zerop (length dir)) + (error (intl:gettext "Cannot represent \"\" in namestrings."))) + (when (string-equal dir "/") + (error (intl:gettext "Cannot represent an explicit directory separator in namestrings."))) + (pieces (unparse-unix-piece dir)) + (pieces "/")) + ((or pattern (eql :wild)) (pieces (unparse-unix-piece dir)) (pieces "/")) (t diff --git a/src/i18n/locale/cmucl.pot b/src/i18n/locale/cmucl.pot index 92ace3d..a1087ca 100644 --- a/src/i18n/locale/cmucl.pot +++ b/src/i18n/locale/cmucl.pot @@ -9026,7 +9026,15 @@ msgid "" "Convert String to octets using the specified External-format. The\n" " string is bounded by Start (defaulting to 0) and End (defaulting to\n" " the end of the string. If Buffer is given, the octets are stored\n" -" there. If not, a new buffer is created." +" there. If not, a new buffer is created. Buffer-start specifies\n" +" where in the buffer the first octet will be placed.\n" +"\n" +" Three values are returned: The buffer, the number of valid octets\n" +" written, and the number of characters converted. Note that the\n" +" actual number of octets written may be greater than the returned\n" +" value, These represent the partial octets of the next character to\n" +" be converted, but there was not enough room to hold the complete set\n" +" of octets." msgstr "" #: src/code/extfmts.lisp @@ -9807,6 +9815,14 @@ msgid ":BACK cannot be represented in namestrings." msgstr "" #: src/code/filesys.lisp +msgid "Cannot represent \"\" in namestrings." +msgstr "" + +#: src/code/filesys.lisp +msgid "Cannot represent an explicit directory separator in namestrings." +msgstr "" + +#: src/code/filesys.lisp msgid "Cannot specify a directory separator in a pathname name: ~S" msgstr "" commit 7760d6b885f7f40759bca5e9b0b9d77439c96a94 Merge: 7a6b433 576ae2a Author: Raymond Toy <rtoy(a)google.com> Date: Fri Dec 2 08:40:57 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 7a6b43385b08db8414dbef6ebeea1a546fc07d54 Merge: 1f129c0 eea8746 Author: Raymond Toy <rtoy(a)google.com> Date: Mon Nov 21 08:39:45 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 1f129c07172f4cb20e7b5bb5f81b751835cdf55d Merge: 926c825 44ca897 Author: Raymond Toy <rtoy(a)google.com> Date: Thu Nov 17 09:19:43 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 926c825e22595b1a84bc8b506002cef5116a1156 Merge: 22a7242 17c9b81 Author: Raymond Toy <rtoy(a)google.com> Date: Mon Nov 7 08:57:40 2011 -0800 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 22a7242216b409ea56b0a5c511d92f2b4ce971ad Merge: 9de92ca 77e3035 Author: Raymond Toy <rtoy(a)google.com> Date: Thu Nov 3 11:22:18 2011 -0700 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 9de92cad019d1644556a9cc6e5108cf08f9dd4b7 Merge: 3cbda6c df24c18 Author: Raymond Toy <rtoy(a)google.com> Date: Mon Oct 31 08:42:37 2011 -0700 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit 3cbda6ca17f8c0a0d5af99cbb4e7b79a9900bc09 Merge: ff6c780 938269e Author: Raymond Toy <rtoy(a)google.com> Date: Tue Oct 25 09:07:08 2011 -0700 Merge branch 'master' of git://common-lisp.net/projects/cmucl/cmucl commit ff6c7800a9daad265e8179497ccaca578d405ed9 Merge: b815e78 7243adb Author: Raymond Toy <rtoy(a)google.com> Date: Fri Oct 21 09:35:16 2011 -0700 Merge branch 'master' of ssh://rtoy.dyndns.org/Volumes/share2/src/clnet/cmucl/dev/src commit b815e78622eaeef8487fb0f4d084c18f279b8e52 Author: Raymond Toy <rtoy(a)google.com> Date: Fri Oct 21 09:28:16 2011 -0700 Fix (format t "a~0&b"): No newline should be printed. diff --git a/code/format.lisp b/code/format.lisp index b8a9e76..704ec34 100644 --- a/code/format.lisp +++ b/code/format.lisp @@ -1999,9 +1999,10 @@ (if params (expand-bind-defaults ((count 1)) params `(progn - (fresh-line stream) - (dotimes (i (1- ,count)) - (terpri stream)))) + (when (plusp ,count) + (fresh-line stream) + (dotimes (i (1- ,count)) + (terpri stream))))) '(fresh-line stream))) (def-format-interpreter #\& (colonp atsignp params) @@ -2010,9 +2011,10 @@ :complaint (intl:gettext "Cannot specify either colon or atsign for this directive."))) (interpret-bind-defaults ((count 1)) params - (fresh-line stream) - (dotimes (i (1- count)) - (terpri stream)))) + (when (plusp count) + (fresh-line stream) + (dotimes (i (1- count)) + (terpri stream))))) (def-format-directive #\| (colonp atsignp params) (when (or colonp atsignp) ----------------------------------------------------------------------- Summary of changes: src/lisp/Linux-os.c | 15 ++++++++------- src/lisp/Linux-os.h | 2 +- src/lisp/interrupt.c | 10 +++++----- src/lisp/x86-arch.c | 46 +++++++++++++++++++++++----------------------- 4 files changed, 37 insertions(+), 36 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-10-g771b7ee
by Raymond Toy 23 Dec '11

23 Dec '11

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 771b7ee43d15c24563557b102ec15f466ece13cb (commit) from f1874509af0afa2aedd12e9cc61654e0bc0a4519 (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 771b7ee43d15c24563557b102ec15f466ece13cb Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Dec 23 08:18:28 2011 -0800 Fix more compiler warnings. Linux-os.c: o Fix warning about pointer to int warning. lisp.c: o Linux needs time.h to define tzset. o Fix warning about unused result from getwcd. If getcwd fails, we now just exit with a message because we can't find anything. diff --git a/src/lisp/Linux-os.c b/src/lisp/Linux-os.c index f4b96ef..20731e2 100644 --- a/src/lisp/Linux-os.c +++ b/src/lisp/Linux-os.c @@ -65,7 +65,7 @@ int personality (unsigned long); #endif void -check_personality(struct utsname *name, const char *argv[], const char *envp[]) +check_personality(struct utsname *name, char *const *argv, char *const *envp) { /* KLUDGE: Disable memory randomization on new Linux kernels * by setting a personality flag and re-executing. (We need @@ -428,7 +428,7 @@ sigsegv_handler(HANDLER_ARGS) tramp_signal = signal; tramp_code = *code; tramp_context = *context; - SC_PC(context) = sigsegv_handler_tramp; + SC_PC(context) = (unsigned long) sigsegv_handler_tramp; return; } #endif diff --git a/src/lisp/lisp.c b/src/lisp/lisp.c index d719c8d..2eb000f 100644 --- a/src/lisp/lisp.c +++ b/src/lisp/lisp.c @@ -40,6 +40,10 @@ #include <sys/utsname.h> #endif +#if defined(__linux__) +#include <time.h> +#endif + /* SIGINT handler that invokes the monitor. */ @@ -94,6 +98,16 @@ static char *cmucllib_search_list[] = { NULL }; +void +getcwd_or_die(char* buf, size_t size) +{ + char *result = getcwd(buf, size); + + if (result == NULL) { + perror("Cannot get cwd"); + exit(1); + } +} /* Set this to see how we're doing our search */ int debug_lisp_search = FALSE; @@ -154,7 +168,7 @@ default_cmucllib(const char *argv0arg) * append argv[0], after stripping off the executable name. */ cwd = malloc(FILENAME_MAX + strlen(argv0_dir) + 100); - getcwd(cwd, FILENAME_MAX); + getcwd_or_die(cwd, FILENAME_MAX); strcat(cwd, "/"); if (*argv0_dir != '\0') { strcat(cwd, argv0_dir); @@ -353,7 +367,7 @@ prepend_core_path(const char *lib, const char *corefile) * We have a relative path for the corefile. Prepend our current * directory to get the full path. */ - getcwd(cwd, FILENAME_MAX); + getcwd_or_die(cwd, FILENAME_MAX); path = malloc(FILENAME_MAX + strlen(corefile) + 2); strcpy(path, cwd); strcat(path, "/"); ----------------------------------------------------------------------- Summary of changes: src/lisp/Linux-os.c | 4 ++-- src/lisp/lisp.c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-9-gf187450
by Raymond Toy 22 Dec '11

22 Dec '11

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 f1874509af0afa2aedd12e9cc61654e0bc0a4519 (commit) via 0b7015bbe5cd76450e861da44b8692174c546a1a (commit) via 9f4256ad2b60bb21806f1edb0cd34099b984b523 (commit) from 43c8a8204942f7286daad33ed5bcf4dcbe9f4c7d (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 f1874509af0afa2aedd12e9cc61654e0bc0a4519 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Dec 22 13:43:42 2011 -0800 Prevent ldb from endless printing the prompt if EOF is reached. diff --git a/src/lisp/monitor.c b/src/lisp/monitor.c index b47a6b1..64e44f5 100644 --- a/src/lisp/monitor.c +++ b/src/lisp/monitor.c @@ -469,7 +469,14 @@ sub_monitor(void) if (line == NULL) { if (isatty(0)) { putchar('\n'); - continue; + /* + * We can no longer read anything from stdin, so + * just exit this loop instead of spewing an + * endless stream of prompts. This also means we + * can't use ldb anymore because stdin is + * unreadable. + */ + break; } else { fprintf(stderr, "\nEOF on something other than a tty.\n"); exit(1); commit 0b7015bbe5cd76450e861da44b8692174c546a1a Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Dec 22 10:45:24 2011 -0800 It's ok to include elf.h on Darwin. Need definition of map_core_sections to get rid of compiler warning. diff --git a/src/lisp/lisp.c b/src/lisp/lisp.c index 0bd6aff..d719c8d 100644 --- a/src/lisp/lisp.c +++ b/src/lisp/lisp.c @@ -33,10 +33,8 @@ #include "save.h" #include "lispregs.h" #if defined(FEATURE_EXECUTABLE) -#if !defined(DARWIN) #include "elf.h" #endif -#endif #ifdef __linux__ #include <sys/utsname.h> commit 9f4256ad2b60bb21806f1edb0cd34099b984b523 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Thu Dec 22 10:23:41 2011 -0800 Fix compiler warning about not using result of fgets. diff --git a/src/lisp/monitor.c b/src/lisp/monitor.c index 806e503..b47a6b1 100644 --- a/src/lisp/monitor.c +++ b/src/lisp/monitor.c @@ -312,12 +312,14 @@ static void quit(char **ptr) { char buf[10]; + char *result; printf("Really quit? [y] "); fflush(stdout); - fgets(buf, sizeof(buf), stdin); - if (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n') + result = fgets(buf, sizeof(buf), stdin); + if (result && (buf[0] == 'y' || buf[0] == 'Y' || buf[0] == '\n')) { exit(0); + } } static void diff --git a/src/lisp/print.c b/src/lisp/print.c index cdf4b56..9f8fa10 100644 --- a/src/lisp/print.c +++ b/src/lisp/print.c @@ -154,12 +154,13 @@ continue_p(boolean newline) putchar('\n'); if (cur_lines >= max_lines) { + char *result; printf("More? [y] "); fflush(stdout); - fgets(buffer, sizeof(buffer), stdin); + result = fgets(buffer, sizeof(buffer), stdin); - if (buffer[0] == 'n' || buffer[0] == 'N') + if (result == NULL || buffer[0] == 'n' || buffer[0] == 'N') throw_to_monitor(); else cur_lines = 0; ----------------------------------------------------------------------- Summary of changes: src/lisp/lisp.c | 2 -- src/lisp/monitor.c | 15 ++++++++++++--- src/lisp/print.c | 5 +++-- 3 files changed, 15 insertions(+), 7 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2011-12-6-g43c8a82
by Raymond Toy 22 Dec '11

22 Dec '11

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 43c8a8204942f7286daad33ed5bcf4dcbe9f4c7d (commit) from 57ca5217c749f67c8acd7e2049a5e79f4bd6baf1 (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 43c8a8204942f7286daad33ed5bcf4dcbe9f4c7d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Dec 21 22:51:42 2011 -0800 Make stack 16-byte aligned. lisp/x86-assem.S: o Make sure the stack is 16-byte aligned in the alloc_overflow_foo and alloc_to_foo routines. These eventually call into C code, and the stack is required to be 16-byte aligned on Darwin. We apply this to all x86 implementations since it's harmless. o Did not update the alloc_8/16_to_foo routines because they are going to be deleted. x86/macros.lisp: o Don't call the alloc_8/16_to_foo routines when we're not doing inline allocation. I don't think there's much to be gained with these special functions and maintainence is a pain with assembly code. diff --git a/src/compiler/x86/macros.lisp b/src/compiler/x86/macros.lisp index ea9c897..731bcf4 100644 --- a/src/compiler/x86/macros.lisp +++ b/src/compiler/x86/macros.lisp @@ -181,65 +181,29 @@ ;; special entry point. The size may be a register or a constant. (ecase (tn-offset alloc-tn) (#.eax-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_eax") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_eax") - :foreign))) - (t - (load-size alloc-tn eax-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_eax") - :foreign))))) + (load-size alloc-tn eax-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_eax") + :foreign))) (#.ecx-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_ecx") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_ecx") - :foreign))) - (t - (load-size alloc-tn ecx-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_ecx") - :foreign))))) + (load-size alloc-tn ecx-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_ecx") + :foreign))) (#.edx-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_edx") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_edx") - :foreign))) - (t - (load-size alloc-tn edx-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_edx") - :foreign))))) + (load-size alloc-tn edx-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_edx") + :foreign))) (#.ebx-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_ebx") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_ebx") - :foreign))) - (t - (load-size alloc-tn ebx-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_ebx") - :foreign))))) + (load-size alloc-tn ebx-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_ebx") + :foreign))) (#.esi-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_esi") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_esi") - :foreign))) - (t - (load-size alloc-tn esi-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_esi") - :foreign))))) + (load-size alloc-tn esi-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_esi") + :foreign))) (#.edi-offset - (case size - (8 (inst call (make-fixup (extern-alien-name "alloc_8_to_edi") - :foreign))) - (16 (inst call (make-fixup (extern-alien-name "alloc_16_to_edi") - :foreign))) - (t - (load-size alloc-tn edi-tn size) - (inst call (make-fixup (extern-alien-name "alloc_to_edi") - :foreign)))))) + (load-size alloc-tn edi-tn size) + (inst call (make-fixup (extern-alien-name "alloc_to_edi") + :foreign)))) (values)) ;;; diff --git a/src/lisp/x86-assem.S b/src/lisp/x86-assem.S index 178e913..5557060 100644 --- a/src/lisp/x86-assem.S +++ b/src/lisp/x86-assem.S @@ -63,6 +63,22 @@ GNAME(x): ; #define align_16byte 4 #endif +/* + * Allocate |bytes| on the stack, and make sure the stack pointer is + * aligned on a 16-byte boundary. (Needed on Darwin, and harmless on + * others that don't need such alignment.) + */ +#define STACK_PROLOGUE(bytes) \ + pushl %ebp ; \ + mov %esp, %ebp ; \ + subl $##bytes, %esp ; \ + andl $-16, %esp ; + +/* Undo STACK_PROLOGUE */ +#define STACK_EPILOGUE \ + movl %ebp, %esp ; \ + popl %ebp ; + .text .globl GNAME(foreign_function_call_active) @@ -453,13 +469,14 @@ ENDFUNC(fastcopy16) So only eax, ecx, and edx need special care here. */ FUNCDEF(alloc_to_eax) - pushl %ecx # Save ecx and edx as C could destroy them. - pushl %edx - pushl %eax # Push the size + STACK_PROLOGUE(12) + movl %ecx, 8(%esp) # Save ecx and edx as C could destroy them. + movl %edx, 4(%esp) + movl %eax, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. - popl %edx # Restore ecx and edx. - popl %ecx + movl 4(%esp), %edx # Restore ecx and edx. + movl 8(%esp), %ecx + STACK_EPILOGUE ret ENDFUNC(alloc_to_eax) @@ -473,7 +490,7 @@ FUNCDEF(alloc_8_to_eax) popl %ecx ret ENDFUNC(alloc_8_to_eax) - + FUNCDEF(alloc_16_to_eax) pushl %ecx # Save ecx and edx as C could destroy them. pushl %edx @@ -486,14 +503,15 @@ FUNCDEF(alloc_16_to_eax) ENDFUNC(alloc_16_to_eax) FUNCDEF(alloc_to_ecx) - pushl %eax # Save eax and edx as C could destroy them. - pushl %edx - pushl %ecx # Push the size + STACK_PROLOGUE(12) + movl %eax, 8(%esp) # Save eax and edx as C could destroy them. + movl %edx, 4(%esp) + movl %ecx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%ecx # setup the destination. - popl %edx # Restore eax and edx. - popl %eax + movl 4(%esp), %edx # Restore eax and edx. + movl 8(%esp), %eax + STACK_EPILOGUE ret ENDFUNC(alloc_to_ecx) @@ -522,14 +540,15 @@ FUNCDEF(alloc_16_to_ecx) ENDFUNC(alloc_16_to_ecx) FUNCDEF(alloc_to_edx) - pushl %eax # Save eax and ecx as C could destroy them. - pushl %ecx - pushl %edx # Push the size + STACK_PROLOGUE(12) + movl %eax, 8(%esp) # Save eax and ecx as C could destroy them. + movl %ecx, 4(%esp) + movl %edx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%edx # setup the destination. - popl %ecx # Restore eax and ecx. - popl %eax + movl 4(%esp), %ecx # Restore eax and ecx. + movl 8(%esp), %eax + STACK_EPILOGUE ret ENDFUNC(alloc_to_edx) @@ -558,16 +577,17 @@ FUNCDEF(alloc_16_to_edx) ENDFUNC(alloc_16_to_edx) FUNCDEF(alloc_to_ebx) - pushl %eax # Save eax, ecx, and edx as C could destroy them. - pushl %ecx - pushl %edx - pushl %ebx # Push the size + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax, ecx, and edx as C could destroy them. + movl %ecx, 8(%esp) + movl %edx, 4(%esp) + movl %ebx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%ebx # setup the destination. - popl %edx # Restore eax, ecx and edx. - popl %ecx - popl %eax + movl 4(%esp), %edx # Restore eax, ecx and edx. + movl 8(%esp), %ecx + movl 12(%esp), %eax + STACK_EPILOGUE ret ENDFUNC(alloc_to_ebx) @@ -600,16 +620,17 @@ FUNCDEF(alloc_16_to_ebx) ENDFUNC(alloc_16_to_ebx) FUNCDEF(alloc_to_esi) - pushl %eax # Save eax, ecx, and edx as C could destroy them. - pushl %ecx - pushl %edx - pushl %esi # Push the size + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax, ecx, and edx as C could destroy them. + movl %ecx, 8(%esp) + movl %edx, 4(%esp) + movl %esi, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%esi # setup the destination. - popl %edx # Restore eax, ecx and edx. - popl %ecx - popl %eax + movl 4(%esp), %edx # Restore eax, ecx and edx. + movl 8(%esp), %ecx + movl 12(%esp), %eax + STACK_EPILOGUE ret ENDFUNC(alloc_to_esi) @@ -642,16 +663,17 @@ FUNCDEF(alloc_16_to_esi) ENDFUNC(alloc_16_to_esi) FUNCDEF(alloc_to_edi) - pushl %eax # Save eax, ecx, and edx as C could destroy them. - pushl %ecx - pushl %edx - pushl %edi # Push the size + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax, ecx, and edx as C could destroy them. + movl %ecx, 8(%esp) + movl %edx, 4(%esp) + movl %edi, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%edi # setup the destination. - popl %edx # Restore eax, ecx and edx. - popl %ecx - popl %eax + movl 4(%esp), %edx # Restore eax, ecx and edx. + movl 8(%esp), %ecx + movl 12(%esp), %eax + STACK_EPILOGUE ret ENDFUNC(alloc_to_edi) @@ -683,7 +705,6 @@ FUNCDEF(alloc_16_to_edi) ret ENDFUNC(alloc_16_to_edi) - #ifdef GENCGC /* Called from lisp when an inline allocation overflows. @@ -694,15 +715,16 @@ ENDFUNC(alloc_16_to_edi) /* This routine handles an overflow with eax=crfp+size. So the size=eax-crfp. */ FUNCDEF(alloc_overflow_eax) - pushl %ecx # Save ecx - pushl %edx # Save edx + STACK_PROLOGUE(12) + movl %ecx, 8(%esp) # Save ecx + movl %edx, 4(%esp) # Save edx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%eax - pushl %eax # Push the size + movl %eax, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. - popl %edx # Restore edx. - popl %ecx # Restore ecx. + movl 4(%esp), %edx # Restore edx. + movl 8(%esp), %ecx # Restore ecx. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_eax) @@ -710,16 +732,17 @@ ENDFUNC(alloc_overflow_eax) /* This routine handles an overflow with ecx=crfp+size. So the size=ecx-crfp. */ FUNCDEF(alloc_overflow_ecx) - pushl %eax # Save eax - pushl %edx # Save edx + STACK_PROLOGUE(12) + movl %eax, 8(%esp) # Save eax + movl %edx, 4(%esp) # Save edx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%ecx - pushl %ecx # Push the size + movl %ecx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%ecx # setup the destination. - popl %edx # Restore edx. - popl %eax # Restore eax. + movl 4(%esp), %edx # Restore edx. + movl 8(%esp), %eax # Restore eax. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_ecx) @@ -727,16 +750,17 @@ ENDFUNC(alloc_overflow_ecx) /* This routine handles an overflow with edx=crfp+size. So the size=edx-crfp. */ FUNCDEF(alloc_overflow_edx) - pushl %eax # Save eax - pushl %ecx # Save ecx + STACK_PROLOGUE(12) + movl %eax, 8(%esp) # Save eax + movl %ecx, 4(%esp) # Save ecx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%edx - pushl %edx # Push the size + movl %edx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%edx # setup the destination. - popl %ecx # Restore ecx. - popl %eax # Restore eax. + movl 4(%esp), %ecx # Restore ecx. + movl 8(%esp), %eax # Restore eax. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_edx) @@ -744,18 +768,19 @@ ENDFUNC(alloc_overflow_edx) /* This routine handles an overflow with ebx=crfp+size. So the size=ebx-crfp. */ FUNCDEF(alloc_overflow_ebx) - pushl %eax # Save eax - pushl %ecx # Save ecx - pushl %edx # Save edx + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax + movl %ecx, 8(%esp) # Save ecx + movl %edx, 4(%esp) # Save edx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%ebx - pushl %ebx # Push the size + movl %ebx, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%ebx # setup the destination. - popl %edx # Restore edx. - popl %ecx # Restore ecx. - popl %eax # Restore eax. + movl 4(%esp), %edx # Restore edx. + movl 8(%esp), %ecx # Restore ecx. + movl 12(%esp), %eax # Restore eax. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_ebx) @@ -763,18 +788,19 @@ ENDFUNC(alloc_overflow_ebx) /* This routine handles an overflow with esi=crfp+size. So the size=esi-crfp. */ FUNCDEF(alloc_overflow_esi) - pushl %eax # Save eax - pushl %ecx # Save ecx - pushl %edx # Save edx + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax + movl %ecx, 8(%esp) # Save ecx + movl %edx, 4(%esp) # Save edx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%esi - pushl %esi # Push the size + movl %esi, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%esi # setup the destination. - popl %edx # Restore edx. - popl %ecx # Restore ecx. - popl %eax # Restore eax. + movl 4(%esp), %edx # Restore edx. + movl 8(%esp), %ecx # Restore ecx. + movl 12(%esp), %eax # Restore eax. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_esi) @@ -782,18 +808,19 @@ ENDFUNC(alloc_overflow_esi) /* This routine handles an overflow with edi=crfp+size. So the size=edi-crfp. */ FUNCDEF(alloc_overflow_edi) - pushl %eax # Save eax - pushl %ecx # Save ecx - pushl %edx # Save edx + STACK_PROLOGUE(16) + movl %eax, 12(%esp) # Save eax + movl %ecx, 8(%esp) # Save ecx + movl %edx, 4(%esp) # Save edx /* Calculate the size for the allocation. */ subl CURRENT_REGION_FREE_POINTER + SYMBOL_VALUE_OFFSET,%edi - pushl %edi # Push the size + movl %edi, (%esp) # Push the size call GNAME(alloc) - addl $4,%esp # pop the size arg. movl %eax,%edi # setup the destination. - popl %edx # Restore edx. - popl %ecx # Restore ecx. - popl %eax # Restore eax. + movl 4(%esp), %edx # Restore edx. + movl 8(%esp), %ecx # Restore ecx. + movl 12(%esp), %eax # Restore eax. + STACK_EPILOGUE addl $6,(%esp) # Adjust the return address to skip the next inst. ret ENDFUNC(alloc_overflow_edi) ----------------------------------------------------------------------- Summary of changes: src/compiler/x86/macros.lisp | 72 ++++----------- src/lisp/x86-assem.S | 199 ++++++++++++++++++++++++------------------ 2 files changed, 131 insertions(+), 140 deletions(-) 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