1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (ruby_setjmp): workaround for FreeBSD/i386

Browse Source 
getcontext/setcontext bug.
  [ruby-dev:28263]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2006-01-22 11:36:08 +00:00
parent 3efb9e43b6
commit b8f013542a
3 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Jan 22 20:03:35 2006 Tanaka Akira <akr@m17n.org>
* eval.c (ruby_setjmp): workaround for FreeBSD/i386
getcontext/setcontext bug.
[ruby-dev:28263]
Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net> Thu Jan 19 22:19:18 2006 Minero Aoki <aamine@loveruby.net>
* lib/fileutils.rb (mv): should remove file after copying. * lib/fileutils.rb (mv): should remove file after copying.

3
configure.in
View File

@ -612,9 +612,6 @@ AC_C_VOLATILE
if test x"$target_cpu" = xia64; then if test x"$target_cpu" = xia64; then
AC_LIBOBJ([ia64]) AC_LIBOBJ([ia64])
# use IA64 instead of __ia64__ because
# HP aC++ doesn't define it. (HP aC++ define __ia64.)
AC_DEFINE(IA64)
AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base, AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
rb_cv___libc_ia64_register_backing_store_base, rb_cv___libc_ia64_register_backing_store_base,
[rb_cv___libc_ia64_register_backing_store_base=no [rb_cv___libc_ia64_register_backing_store_base=no

57
eval.c
View File

@ -98,7 +98,7 @@ rb_jump_context(env, val)
abort(); /* ensure noreturn */ abort(); /* ensure noreturn */
} }
/* /*
* FUNCTION_CALL_MAY_RETURN_TWICE is a magic for getcontext, gcc, * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
* IA64 register stack and SPARC register window combination problem. * IA64 register stack and SPARC register window combination problem.
* *
* Assume following code sequence. * Assume following code sequence.
@ -138,44 +138,55 @@ rb_jump_context(env, val)
((__GNUC__ < (major)) || \ ((__GNUC__ < (major)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \ (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel)))) (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
#if GCC_VERSION_BEFORE(4,0,3) #if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
#if defined(sparc) || defined(__sparc__)
#ifdef __pic__ #ifdef __pic__
/* /*
* %l7 is excluded for PIC because it is PIC register. * %l7 is excluded for PIC because it is PIC register.
* http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
*/ */
#define FUNCTION_CALL_MAY_RETURN_TWICE \ #define PRE_GETCONTEXT \
({ __asm__ volatile ("" : : : \ ({ __asm__ volatile ("" : : : \
"%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \ "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
"%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \ "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
"%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); }) "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
#else #else
#define FUNCTION_CALL_MAY_RETURN_TWICE \ #define PRE_GETCONTEXT \
({ __asm__ volatile ("" : : : \ ({ __asm__ volatile ("" : : : \
"%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \ "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
"%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \ "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
"%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); }) "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
#endif #endif
#elif defined(IA64) #define POST_GETCONTEXT PRE_GETCONTEXT
#elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
static jmp_buf function_call_may_return_twice_jmp_buf; static jmp_buf function_call_may_return_twice_jmp_buf;
int function_call_may_return_twice_false = 0; int function_call_may_return_twice_false = 0;
#define FUNCTION_CALL_MAY_RETURN_TWICE \ #define PRE_GETCONTEXT \
(function_call_may_return_twice_false ? \ (function_call_may_return_twice_false ? \
setjmp(function_call_may_return_twice_jmp_buf) : \ setjmp(function_call_may_return_twice_jmp_buf) : \
0) 0)
#else #define POST_GETCONTEXT PRE_GETCONTEXT
#define FUNCTION_CALL_MAY_RETURN_TWICE 0 #elif defined(__FreeBSD__)
#endif /*
#else * workaround for FreeBSD/i386 getcontext/setcontext bug.
#define FUNCTION_CALL_MAY_RETURN_TWICE 0 * clear the carry flag by (0 ? ... : ...).
* FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
* [ruby-dev:28263]
*/
static int volatile freebsd_clear_carry_flag = 0;
#define PRE_GETCONTEXT (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
#endif #endif
# ifndef PRE_GETCONTEXT
# define PRE_GETCONTEXT 0
# endif
# ifndef POST_GETCONTEXT
# define POST_GETCONTEXT 0
# endif
#define ruby_longjmp(env, val) rb_jump_context(env, val) #define ruby_longjmp(env, val) rb_jump_context(env, val)
#define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \ #define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \
(just_before_setjmp), \ (just_before_setjmp), \
FUNCTION_CALL_MAY_RETURN_TWICE, \ PRE_GETCONTEXT, \
getcontext(&(j)->context), \ getcontext(&(j)->context), \
FUNCTION_CALL_MAY_RETURN_TWICE, \ POST_GETCONTEXT, \
(j)->status) (j)->status)
#else #else
typedef jmp_buf rb_jmpbuf_t; typedef jmp_buf rb_jmpbuf_t;
@ -9730,7 +9741,7 @@ struct thread {
long stk_max; long stk_max;
VALUE *stk_ptr; VALUE *stk_ptr;
VALUE *stk_pos; VALUE *stk_pos;
#ifdef IA64 #ifdef __ia64
long bstr_len; long bstr_len;
long bstr_max; long bstr_max;
VALUE *bstr_ptr; VALUE *bstr_ptr;
@ -9984,7 +9995,7 @@ thread_mark(rb_thread_t th)
#if defined(THINK_C) || defined(__human68k__) #if defined(THINK_C) || defined(__human68k__)
rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2); rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
#endif #endif
#ifdef IA64 #ifdef __ia64
if (th->bstr_ptr) { if (th->bstr_ptr) {
rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len); rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
} }
@ -10078,7 +10089,7 @@ thread_free(rb_thread_t th)
{ {
if (th->stk_ptr) free(th->stk_ptr); if (th->stk_ptr) free(th->stk_ptr);
th->stk_ptr = 0; th->stk_ptr = 0;
#ifdef IA64 #ifdef __ia64
if (th->bstr_ptr) free(th->bstr_ptr); if (th->bstr_ptr) free(th->bstr_ptr);
th->bstr_ptr = 0; th->bstr_ptr = 0;
#endif #endif
@ -10120,7 +10131,7 @@ static const char *th_signm;
#define RESTORE_EXIT 7 #define RESTORE_EXIT 7
extern VALUE *rb_gc_stack_start; extern VALUE *rb_gc_stack_start;
#ifdef IA64 #ifdef __ia64
extern VALUE *rb_gc_register_stack_start; extern VALUE *rb_gc_register_stack_start;
#endif #endif
@ -10143,7 +10154,7 @@ rb_thread_save_context(rb_thread_t th)
th->stk_len = len; th->stk_len = len;
FLUSH_REGISTER_WINDOWS; FLUSH_REGISTER_WINDOWS;
MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len); MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
#ifdef IA64 #ifdef __ia64
th->bstr_pos = rb_gc_register_stack_start; th->bstr_pos = rb_gc_register_stack_start;
len = (VALUE*)rb_ia64_bsp() - th->bstr_pos; len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
th->bstr_len = 0; th->bstr_len = 0;
@ -10267,7 +10278,7 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
ex = exit; ex = exit;
FLUSH_REGISTER_WINDOWS; FLUSH_REGISTER_WINDOWS;
MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len); MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
#ifdef IA64 #ifdef __ia64
MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len); MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
#endif #endif
@ -10281,7 +10292,7 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
ruby_longjmp(tmp->context, ex); ruby_longjmp(tmp->context, ex);
} }
#ifdef IA64 #ifdef __ia64
#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4 #define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4 #define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
static volatile int C(a), C(b), C(c), C(d), C(e); static volatile int C(a), C(b), C(c), C(d), C(e);
@ -10333,7 +10344,7 @@ stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]); if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
} }
#endif #endif
#ifdef IA64 #ifdef __ia64
register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp()); register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
#else #else
rb_thread_restore_context_0(th, exit, space); rb_thread_restore_context_0(th, exit, space);
@ -11533,7 +11544,7 @@ rb_thread_group(VALUE thread)
return group; return group;
} }
#ifdef IA64 #ifdef __ia64
# define IA64_INIT(x) x # define IA64_INIT(x) x
#else #else
# define IA64_INIT(x) # define IA64_INIT(x)