diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | signal.c | 10 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Dec 13 18:01:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * signal.c (check_stack_overflow): check sp also on i386/x86_64 + FreeBSD. + Sat Dec 13 09:58:41 2014 Eric Wong <e@80x24.org> * gc.c (define_final0): avoid duplicate blocks @@ -732,11 +732,13 @@ rb_get_next_signal(void) #if defined(USE_SIGALTSTACK) || defined(_WIN32) NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); -# if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) +# if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__)) # elif defined __linux__ # define USE_UCONTEXT_REG 1 # elif defined __APPLE__ # define USE_UCONTEXT_REG 1 +# elif defined __FreeBSD__ +# define USE_UCONTEXT_REG 1 # endif # ifdef USE_UCONTEXT_REG static void @@ -755,6 +757,12 @@ check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx) # else const uintptr_t sp = mctx->__ss.__esp; # endif +# elif defined __FreeBSD__ +# if defined(__amd64__) + const __register_t sp = mctx->mc_rsp; +# else + const __register_t sp = mctx->mc_esp; +# endif # endif enum {pagesize = 4096}; const uintptr_t sp_page = (uintptr_t)sp / pagesize; |