From 02e8b4d9a89e9af8ddbf1507261fec67fbfcabac Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 13 Dec 2014 09:01:59 +0000 Subject: signal.c: stack overflow on FreeBSD * signal.c (check_stack_overflow): check sp also on i386/x86_64 FreeBSD. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ signal.c | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2149f07021..64a4592cbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 13 18:01:57 2014 Nobuyoshi Nakada + + * signal.c (check_stack_overflow): check sp also on i386/x86_64 + FreeBSD. + Sat Dec 13 09:58:41 2014 Eric Wong * gc.c (define_final0): avoid duplicate blocks diff --git a/signal.c b/signal.c index fd356e2154..a0f9bff766 100644 --- a/signal.c +++ b/signal.c @@ -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; -- cgit v1.2.3