diff options
Diffstat (limited to 'eval_intern.h')
| -rw-r--r-- | eval_intern.h | 260 |
1 files changed, 157 insertions, 103 deletions
diff --git a/eval_intern.h b/eval_intern.h index 78861b32fb..954ba6a184 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -3,15 +3,25 @@ #include "ruby/ruby.h" #include "vm_core.h" +#include "zjit.h" static inline void -pass_passed_block(rb_thread_t *th) +vm_passed_block_handler_set(rb_execution_context_t *ec, VALUE block_handler) { - th->passed_block = rb_vm_control_frame_block_ptr(th->cfp); - th->cfp->flag |= VM_FRAME_FLAG_PASSED; + vm_block_handler_verify(block_handler); + ec->passed_block_handler = block_handler; } -#define PASS_PASSED_BLOCK_TH(th) pass_passed_block(th) -#define PASS_PASSED_BLOCK() pass_passed_block(GET_THREAD()) + +static inline void +pass_passed_block_handler(rb_execution_context_t *ec) +{ + VALUE block_handler = rb_vm_frame_block_handler(ec->cfp); + vm_passed_block_handler_set(ec, block_handler); + VM_ENV_FLAGS_SET(ec->cfp->ep, VM_FRAME_FLAG_PASSED); +} + +#define PASS_PASSED_BLOCK_HANDLER_EC(ec) pass_passed_block_handler(ec) +#define PASS_PASSED_BLOCK_HANDLER() pass_passed_block_handler(GET_EC()) #ifdef HAVE_STDLIB_H #include <stdlib.h> @@ -24,7 +34,11 @@ pass_passed_block(rb_thread_t *th) #endif #include <stdio.h> -#include <setjmp.h> +#if defined(__wasm__) && !defined(__EMSCRIPTEN__) +# include "wasm/setjmp.h" +#else +# include <setjmp.h> +#endif #ifdef __APPLE__ # ifdef HAVE_CRT_EXTERNS_H @@ -82,110 +96,123 @@ extern int select_large_fdset(int, fd_set *, fd_set *, fd_set *, struct timeval #include <sys/stat.h> -#ifdef _MSC_VER -#define SAVE_ROOT_JMPBUF_BEFORE_STMT \ - __try { -#define SAVE_ROOT_JMPBUF_AFTER_STMT \ - } \ - __except (GetExceptionCode() == EXCEPTION_STACK_OVERFLOW ? \ - (rb_thread_raised_set(GET_THREAD(), RAISED_STACKOVERFLOW), \ - raise(SIGSEGV), \ - EXCEPTION_EXECUTE_HANDLER) : \ - EXCEPTION_CONTINUE_SEARCH) { \ - /* never reaches here */ \ - } -#elif defined(__MINGW32__) -LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *); -#define SAVE_ROOT_JMPBUF_BEFORE_STMT \ - do { \ - PVOID _handler = AddVectoredExceptionHandler(1, rb_w32_stack_overflow_handler); - -#define SAVE_ROOT_JMPBUF_AFTER_STMT \ - RemoveVectoredExceptionHandler(_handler); \ - } while (0); +#define EC_PUSH_TAG(ec) do { \ + rb_execution_context_t * const _ec = (ec); \ + struct rb_vm_tag _tag; \ + _tag.state = TAG_NONE; \ + _tag.tag = Qundef; \ + _tag.prev = _ec->tag; \ + _tag.lock_rec = rb_ec_vm_lock_rec(_ec); \ + EC_SAVE_TAG_CFP(_tag, _ec); \ + rb_vm_tag_jmpbuf_init(&_tag.buf); \ + +// Remember the CFP as of EC_PUSH_TAG so that ZJIT can materialize frames +// only up to longjmp's target CFP. When a C method does longjmp inside it, +// the target CFP may not be equal to the VM_FRAME_FLAG_FINISH frame. +#if USE_ZJIT +# define EC_SAVE_TAG_CFP(_tag, _ec) _tag.cfp = _ec->cfp #else -#define SAVE_ROOT_JMPBUF_BEFORE_STMT -#define SAVE_ROOT_JMPBUF_AFTER_STMT +# define EC_SAVE_TAG_CFP(_tag, _ec) #endif -#define SAVE_ROOT_JMPBUF(th, stmt) do \ - if (ruby_setjmp((th)->root_jmpbuf) == 0) { \ - SAVE_ROOT_JMPBUF_BEFORE_STMT \ - stmt; \ - SAVE_ROOT_JMPBUF_AFTER_STMT \ - } \ - else { \ - rb_fiber_start(); \ - } while (0) - -#define TH_PUSH_TAG(th) do { \ - rb_thread_t * const _th = (th); \ - struct rb_vm_tag _tag; \ - _tag.tag = 0; \ - _tag.prev = _th->tag; - -#define TH_POP_TAG() \ - _th->tag = _tag.prev; \ +#define EC_POP_TAG() \ + _ec->tag = _tag.prev; \ + rb_vm_tag_jmpbuf_deinit(&_tag.buf); \ } while (0) -#define TH_TMPPOP_TAG() \ - _th->tag = _tag.prev +#define EC_TMPPOP_TAG() \ + _ec->tag = _tag.prev -#define TH_REPUSH_TAG() (void)(_th->tag = &_tag) +#define EC_REPUSH_TAG() (void)(_ec->tag = &_tag) -#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD()) -#define POP_TAG() TH_POP_TAG() - -#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8) +#if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8) || defined __clang__ +/* This macro prevents GCC 4.6--4.8 from emitting maybe-uninitialized warnings. + * This macro also prevents Clang from dumping core in EC_EXEC_TAG(). + * (I confirmed Clang 4.0.1 and 5.0.0.) + */ # define VAR_FROM_MEMORY(var) __extension__(*(__typeof__(var) volatile *)&(var)) # define VAR_INITIALIZED(var) ((var) = VAR_FROM_MEMORY(var)) +# define VAR_NOCLOBBERED(var) volatile var #else # define VAR_FROM_MEMORY(var) (var) # define VAR_INITIALIZED(var) ((void)&(var)) +# define VAR_NOCLOBBERED(var) var #endif -/* clear th->state, and return the value */ +static inline void +rb_ec_vm_lock_rec_check(const rb_execution_context_t *ec, unsigned int recorded_lock_rec) +{ + unsigned int current_lock_rec = rb_ec_vm_lock_rec(ec); + if (current_lock_rec != recorded_lock_rec) { + rb_ec_vm_lock_rec_release(ec, recorded_lock_rec, current_lock_rec); + } +} + +/* clear ec->tag->state, and return the value */ static inline int -rb_threadptr_tag_state(rb_thread_t *th) +rb_ec_tag_state(const rb_execution_context_t *ec) { - int state = th->state; - th->state = 0; + struct rb_vm_tag *tag = ec->tag; + enum ruby_tag_type state = tag->state; + tag->state = TAG_NONE; + rb_ec_vm_lock_rec_check(ec, tag->lock_rec); + RBIMPL_ASSUME(state > TAG_NONE); + RBIMPL_ASSUME(state <= TAG_FATAL); return state; } -NORETURN(static inline void rb_threadptr_tag_jump(rb_thread_t *, int)); +NORETURN(static inline void rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st)); static inline void -rb_threadptr_tag_jump(rb_thread_t *th, int st) +rb_ec_tag_jump(const rb_execution_context_t *ec, enum ruby_tag_type st) { - th->state = st; - ruby_longjmp(th->tag->buf, 1); + RUBY_ASSERT(st > TAG_NONE && st <= TAG_FATAL, ": Invalid tag jump: %d", (int)st); +#if USE_ZJIT + rb_zjit_materialize_frames(ec, ec->cfp); +#endif + ec->tag->state = st; + ruby_longjmp(RB_VM_TAG_JMPBUF_GET(ec->tag->buf), 1); } /* setjmp() in assignment expression rhs is undefined behavior [ISO/IEC 9899:1999] 7.13.1.1 */ -#define TH_EXEC_TAG() \ - (ruby_setjmp(_tag.buf) ? rb_threadptr_tag_state(VAR_FROM_MEMORY(_th)) : (TH_REPUSH_TAG(), 0)) +#define EC_EXEC_TAG() \ + (UNLIKELY(ruby_setjmp(RB_VM_TAG_JMPBUF_GET(_tag.buf))) ? rb_ec_tag_state(VAR_FROM_MEMORY(_ec)) : (EC_REPUSH_TAG(), 0)) -#define EXEC_TAG() \ - TH_EXEC_TAG() - -#define TH_JUMP_TAG(th, st) rb_threadptr_tag_jump(th, st) - -#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), (st)) +#define EC_JUMP_TAG(ec, st) rb_ec_tag_jump(ec, st) #define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc) /* CREF operators */ -#define CREF_FL_PUSHED_BY_EVAL IMEMO_FL_USER1 -#define CREF_FL_OMOD_SHARED IMEMO_FL_USER2 +#define CREF_FL_PUSHED_BY_EVAL IMEMO_FL_USER1 +#define CREF_FL_OMOD_SHARED IMEMO_FL_USER2 +#define CREF_FL_SINGLETON IMEMO_FL_USER3 +#define CREF_FL_DYNAMIC_CREF IMEMO_FL_USER4 + +static inline int CREF_SINGLETON(const rb_cref_t *cref); static inline VALUE CREF_CLASS(const rb_cref_t *cref) { - return cref->klass; + if (CREF_SINGLETON(cref)) { + return CLASS_OF(cref->klass_or_self); + } + else { + return cref->klass_or_self; + } +} + +static inline VALUE +CREF_CLASS_FOR_DEFINITION(const rb_cref_t *cref) +{ + if (CREF_SINGLETON(cref)) { + return rb_singleton_class(cref->klass_or_self); + } + else { + return cref->klass_or_self; + } } static inline rb_cref_t * @@ -225,6 +252,18 @@ CREF_PUSHED_BY_EVAL_SET(rb_cref_t *cref) } static inline int +CREF_SINGLETON(const rb_cref_t *cref) +{ + return cref->flags & CREF_FL_SINGLETON; +} + +static inline void +CREF_SINGLETON_SET(rb_cref_t *cref) +{ + cref->flags |= CREF_FL_SINGLETON; +} + +static inline int CREF_OMOD_SHARED(const rb_cref_t *cref) { return cref->flags & CREF_FL_OMOD_SHARED; @@ -236,69 +275,84 @@ CREF_OMOD_SHARED_SET(rb_cref_t *cref) cref->flags |= CREF_FL_OMOD_SHARED; } +static inline int +CREF_DYNAMIC(const rb_cref_t *cref) +{ + return cref->flags & CREF_FL_DYNAMIC_CREF; +} + +static inline void +CREF_DYNAMIC_SET(rb_cref_t *cref) +{ + cref->flags |= CREF_FL_DYNAMIC_CREF; +} + static inline void CREF_OMOD_SHARED_UNSET(rb_cref_t *cref) { cref->flags &= ~CREF_FL_OMOD_SHARED; } -void rb_thread_cleanup(void); -void rb_thread_wait_other_threads(void); - enum { RAISED_EXCEPTION = 1, RAISED_STACKOVERFLOW = 2, RAISED_NOMEMORY = 4 }; -int rb_threadptr_set_raised(rb_thread_t *th); -int rb_threadptr_reset_raised(rb_thread_t *th); -#define rb_thread_raised_set(th, f) ((th)->raised_flag |= (f)) -#define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f)) -#define rb_thread_raised_p(th, f) (((th)->raised_flag & (f)) != 0) -#define rb_thread_raised_clear(th) ((th)->raised_flag = 0) +#define rb_ec_raised_set(ec, f) ((ec)->raised_flag |= (f)) +#define rb_ec_raised_reset(ec, f) ((ec)->raised_flag &= ~(f)) +#define rb_ec_raised_p(ec, f) (((ec)->raised_flag & (f)) != 0) +#define rb_ec_raised_clear(ec) ((ec)->raised_flag = 0) +int rb_ec_set_raised(rb_execution_context_t *ec); +int rb_ec_reset_raised(rb_execution_context_t *ec); +int rb_ec_stack_check(rb_execution_context_t *ec); VALUE rb_f_eval(int argc, const VALUE *argv, VALUE self); VALUE rb_make_exception(int argc, const VALUE *argv); NORETURN(void rb_method_name_error(VALUE, VALUE)); -NORETURN(void rb_fiber_start(void)); +NORETURN(void rb_fiber_start(rb_fiber_t*)); NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t)); NORETURN(void rb_print_undef_str(VALUE, VALUE)); NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t)); NORETURN(void rb_vm_localjump_error(const char *,VALUE, int)); -NORETURN(void rb_vm_jump_tag_but_local_jump(int)); -NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, - VALUE obj, int call_status)); +NORETURN(void rb_vm_jump_tag_but_local_jump(enum ruby_tag_type)); -VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val); +VALUE rb_vm_make_jump_tag_but_local_jump(enum ruby_tag_type state, VALUE val); rb_cref_t *rb_vm_cref(void); rb_cref_t *rb_vm_cref_replace_with_duplicated_cref(void); -VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename); +VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE block_handler, VALUE filename); +VALUE rb_vm_call_cfunc_in_box(VALUE recv, VALUE (*func)(VALUE, VALUE), VALUE arg1, VALUE arg2, VALUE filename, const rb_box_t *box); +void rb_vm_frame_flag_set_box_require(const rb_execution_context_t *ec); +const rb_box_t *rb_vm_current_box(const rb_execution_context_t *ec); +const rb_box_t *rb_vm_caller_box(const rb_execution_context_t *ec); +const rb_box_t *rb_vm_loading_box(const rb_execution_context_t *ec); void rb_vm_set_progname(VALUE filename); -void rb_thread_terminate_all(void); -VALUE rb_vm_top_self(); VALUE rb_vm_cbase(void); +/* vm_backtrace.c */ +#define RUBY_BACKTRACE_START 0 +#define RUBY_ALL_BACKTRACE_LINES -1 +VALUE rb_ec_backtrace_object(const rb_execution_context_t *ec); +VALUE rb_ec_backtrace_str_ary(const rb_execution_context_t *ec, long lev, long n); +VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, long n, bool skip_internal); + #ifndef CharNext /* defined as CharNext[AW] on Windows. */ # ifdef HAVE_MBLEN -# define CharNext(p) ((p) + mblen((p), RUBY_MBCHAR_MAXSIZE)) -# else -# define CharNext(p) ((p) + 1) -# endif -#endif - -#if defined DOSISH || defined __CYGWIN__ -static inline void -translit_char(char *p, int from, int to) +# define CharNext(p) rb_char_next(p) +static inline char * +rb_char_next(const char *p) { - while (*p) { - if ((unsigned char)*p == from) - *p = to; - p = CharNext(p); + if (p) { + int len = mblen(p, RUBY_MBCHAR_MAXSIZE); + p += len > 0 ? len : 1; } + return (char *)p; } +# else +# define CharNext(p) ((p) + 1) +# endif #endif #endif /* RUBY_EVAL_INTERN_H */ |
