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 c07cc02020cb741191bfc3a5155226db2ae86c51 (commit) via 50df2ebc3f592d8ea62f4a1f8b65f05e98233914 (commit) from d52302047c19a31092fdc02ca7c29963bf4d33ec (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 c07cc02020cb741191bfc3a5155226db2ae86c51 Author: Raymond Toy <toy.raymond@gmail.com> Date: Thu Aug 9 23:46:43 2012 -0700 src/lisp/os.h: src/lisp/gencgc.c: * Move the macros for fpu buffers from gencgc.c to here. src/lisp/x86-arch.c: * Use the new save_fpu_state instead of fpu_save. And apply to all OSes. diff --git a/src/lisp/gencgc.c b/src/lisp/gencgc.c index cab6a0c..905f551 100644 --- a/src/lisp/gencgc.c +++ b/src/lisp/gencgc.c @@ -663,38 +663,6 @@ gen_av_mem_age(int gen) generations[gen].bytes_allocated; } -/* - * Define macro to allocate a local array of the appropriate size - * where the fpu state can be stored. - */ -#if defined(i386) || defined(__x86_64) -#define FPU_STATE_SIZE 27 - /* - * Need 512 byte area, aligned on a 16-byte boundary. So allocate - * 512+16 bytes of space and let the routine adjust use the - * appropriate alignment. - */ -#define SSE_STATE_SIZE ((512+16)/4) - -/* - * Just use the SSE size for both x87 and sse2 since the SSE size is - * enough for either. - */ -#define FPU_STATE(name) int name[SSE_STATE_SIZE]; - -#elif defined(sparc) -/* - * 32 (single-precision) FP registers, and the FP state register. - * But Sparc V9 has 32 double-precision registers (equivalent to 64 - * single-precision, but can't be accessed), so we leave enough room - * for that. - */ -#define FPU_STATE_SIZE (((32 + 32 + 1) + 1)/2) -#define FPU_STATE(name) long long name[FPU_STATE_SIZE]; -#elif defined(DARWIN) && defined(__ppc__) -#define FPU_STATE_SIZE 32 -#define FPU_STATE(name0 long long name[FPU_STATE_SIZE]; -#endif void save_fpu_state(void* state) diff --git a/src/lisp/os.h b/src/lisp/os.h index 4c76df2..c996474 100644 --- a/src/lisp/os.h +++ b/src/lisp/os.h @@ -122,4 +122,39 @@ extern boolean os_support_sse2(void); char* convert_lisp_string(char* c_string, void* lisp_string, int len); +/* + * Define macro to allocate a local array of the appropriate size + * where the fpu state can be stored. + */ +#if defined(i386) || defined(__x86_64) +#define FPU_STATE_SIZE 27 + /* + * Need 512 byte area, aligned on a 16-byte boundary. So allocate + * 512+16 bytes of space and let the routine adjust use the + * appropriate alignment. + */ +#define SSE_STATE_SIZE ((512+16)/4) + +/* + * Just use the SSE size for both x87 and sse2 since the SSE size is + * enough for either. + */ +#define FPU_STATE(name) int name[SSE_STATE_SIZE]; + +#elif defined(sparc) +/* + * 32 (single-precision) FP registers, and the FP state register. + * But Sparc V9 has 32 double-precision registers (equivalent to 64 + * single-precision, but can't be accessed), so we leave enough room + * for that. + */ +#define FPU_STATE_SIZE (((32 + 32 + 1) + 1)/2) +#define FPU_STATE(name) long long name[FPU_STATE_SIZE]; +#elif defined(DARWIN) && defined(__ppc__) +#define FPU_STATE_SIZE 32 +#define FPU_STATE(name) long long name[FPU_STATE_SIZE]; +#endif +extern void save_fpu_state(void*); +extern void restore_fpu_state(void*); + #endif /* _OS_H_ */ diff --git a/src/lisp/x86-arch.c b/src/lisp/x86-arch.c index 2932b13..ee38f92 100644 --- a/src/lisp/x86-arch.c +++ b/src/lisp/x86-arch.c @@ -340,17 +340,14 @@ sigtrap_handler(HANDLER_ARGS) case trap_Halt: { -#ifndef __linux__ - int fpu_state[27]; + FPU_STATE(fpu_state); + save_fpu_state(fpu_state); - fpu_save(fpu_state); -#endif fake_foreign_function_call(os_context); lose("%%primitive halt called; the party is over.\n"); undo_fake_foreign_function_call(os_context); -#ifndef __linux__ - fpu_restore(fpu_state); -#endif + + restore_fpu_state(fpu_state); arch_skip_instruction(os_context); break; } commit 50df2ebc3f592d8ea62f4a1f8b65f05e98233914 Author: Raymond Toy <toy.raymond@gmail.com> Date: Thu Aug 9 23:44:26 2012 -0700 Use /usr/bin/sed instead of whatever is in the path. diff --git a/src/lisp/solaris-nm b/src/lisp/solaris-nm index caa09d9..ba2a461 100755 --- a/src/lisp/solaris-nm +++ b/src/lisp/solaris-nm @@ -1,4 +1,4 @@ #!/bin/sh # Removing 0x prefix # remove local symbols ([a-z] in type field). -/usr/ccs/bin/nm -pxh "$@" | sed -e 's/^0x//' -e '/ [a-z] /d' +/usr/ccs/bin/nm -pxh "$@" | /usr/bin/sed -e 's/^0x//' -e '/ [a-z] /d' ----------------------------------------------------------------------- Summary of changes: src/lisp/gencgc.c | 32 -------------------------------- src/lisp/os.h | 35 +++++++++++++++++++++++++++++++++++ src/lisp/solaris-nm | 2 +- src/lisp/x86-arch.c | 11 ++++------- 4 files changed, 40 insertions(+), 40 deletions(-) hooks/post-receive -- CMU Common Lisp