diff options
author | John Hawthorn <john@hawthorn.email> | 2021-06-26 00:06:58 -0700 |
---|---|---|
committer | Alan Wu <XrXr@users.noreply.github.com> | 2021-10-20 18:19:37 -0400 |
commit | c3f264b62cfee09a90fd3f75de9eaa36bc06645d (patch) | |
tree | e5545ca6552227cff24029e4e8167a0865c16a83 | |
parent | 6998246233e42a05883a7bfc9364bb5918456107 (diff) |
Allow chaining on immediate guard
In jit_guard_known_klass whenever we encounter a new class should
recompile the current instruction.
However, previously once jit_guard_known_klass had guarded for a heap
object it would not recompile for any immediate (special const) objects
arriving afterwards and would take a plain side-exit instead of a chain
guard.
This commit uses jit_chain_guard inside jit_guard_known_klass instead of
the plain side exit, so that we can recompile for any special constants
arriving afterwards.
-rw-r--r-- | yjit_codegen.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/yjit_codegen.c b/yjit_codegen.c index 7d9d19835a..b5edf86460 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -944,11 +944,29 @@ gen_jz_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t s } } +static void +gen_jbe_to_target0(codeblock_t *cb, uint8_t *target0, uint8_t *target1, uint8_t shape) +{ + switch (shape) + { + case SHAPE_NEXT0: + case SHAPE_NEXT1: + RUBY_ASSERT(false); + break; + + case SHAPE_DEFAULT: + jbe_ptr(cb, target0); + break; + } +} + enum jcc_kinds { JCC_JNE, JCC_JNZ, JCC_JZ, JCC_JE, + JCC_JBE, + JCC_JNA, }; // Generate a jump to a stub that recompiles the current YARV instruction on failure. @@ -967,6 +985,10 @@ jit_chain_guard(enum jcc_kinds jcc, jitstate_t *jit, const ctx_t *ctx, uint8_t d case JCC_JE: target0_gen_fn = gen_jz_to_target0; break; + case JCC_JBE: + case JCC_JNA: + target0_gen_fn = gen_jbe_to_target0; + break; default: RUBY_ASSERT(false && "unimplemented jump kind"); break; @@ -2260,9 +2282,9 @@ jit_guard_known_klass(jitstate_t *jit, ctx_t *ctx, VALUE known_klass, insn_opnd_ ADD_COMMENT(cb, "guard not immediate"); RUBY_ASSERT(Qfalse < Qnil); test(cb, REG0, imm_opnd(RUBY_IMMEDIATE_MASK)); - jnz_ptr(cb, side_exit); + jit_chain_guard(JCC_JNZ, jit, ctx, max_chain_depth, side_exit); cmp(cb, REG0, imm_opnd(Qnil)); - jbe_ptr(cb, side_exit); + jit_chain_guard(JCC_JBE, jit, ctx, max_chain_depth, side_exit); ctx_set_opnd_type(ctx, insn_opnd, TYPE_HEAP); } |