Skip to content

Add pre-init ICs #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bnoordhuis wants to merge 1 commit into from
Closed

Add pre-init ICs #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions quickjs-opcode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,9 @@ DEF(typeof_is_undefined, 1, 1, 1, none)
DEF( typeof_is_function, 1, 1, 1, none)

// order matters, see non-IC counterparts
DEF( get_field_preinit_ic, 5, 1, 1, none)
DEF( get_field2_preinit_ic, 5, 1, 2, none)
DEF( put_field_preinit_ic, 5, 2, 0, none)
DEF( get_field_ic, 5, 1, 1, none)
DEF( get_field2_ic, 5, 1, 2, none)
DEF( put_field_ic, 5, 2, 0, none)
Expand Down
58 changes: 56 additions & 2 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16344,6 +16344,22 @@ static JSValue JS_CallInternal(JSContext *caller_ctx, JSValue func_obj,
BREAK;

CASE(OP_get_field):
{
JSValue val;
JSAtom atom;
atom = get_u32(pc);
pc += 4;
sf->cur_pc = pc;
val = JS_GetPropertyInternal2(ctx, sp[-1], atom, sp[-1], NULL, false);
if (unlikely(JS_IsException(val)))
goto exception;
put_u8(pc - 5, OP_get_field_preinit_ic);
JS_FreeValue(ctx, sp[-1]);
sp[-1] = val;
}
BREAK;

CASE(OP_get_field_preinit_ic):
{
JSValue val;
JSAtom atom;
Expand Down Expand Up @@ -16386,6 +16402,21 @@ static JSValue JS_CallInternal(JSContext *caller_ctx, JSValue func_obj,
BREAK;

CASE(OP_get_field2):
{
JSValue val;
JSAtom atom;
atom = get_u32(pc);
pc += 4;
sf->cur_pc = pc;
val = JS_GetPropertyInternal2(ctx, sp[-1], atom, sp[-1], NULL, false);
if (unlikely(JS_IsException(val)))
goto exception;
put_u8(pc - 5, OP_get_field2_preinit_ic);
*sp++ = val;
}
BREAK;

CASE(OP_get_field2_preinit_ic):
{
JSValue val;
JSAtom atom;
Expand Down Expand Up @@ -16426,6 +16457,25 @@ static JSValue JS_CallInternal(JSContext *caller_ctx, JSValue func_obj,
BREAK;

CASE(OP_put_field):
{
int ret;
JSAtom atom;
atom = get_u32(pc);
pc += 4;
sf->cur_pc = pc;
ret = JS_SetPropertyInternal2(ctx,
sp[-2], atom,
sp[-1], sp[-2],
JS_PROP_THROW_STRICT, NULL);
JS_FreeValue(ctx, sp[-2]);
sp -= 2;
if (unlikely(ret < 0))
goto exception;
put_u8(pc - 5, OP_put_field_preinit_ic);
}
BREAK;

CASE(OP_put_field_preinit_ic):
{
int ret;
JSAtom atom;
Expand Down Expand Up @@ -34060,7 +34110,7 @@ static void bc_byte_swap(uint8_t *bc_buf, int bc_len)

static bool is_ic_op(uint8_t op)
{
return op >= OP_get_field_ic && op <= OP_put_field_ic;
return op >= OP_get_field_preinit_ic && op <= OP_put_field_ic;
}

static int JS_WriteFunctionBytecode(BCWriterState *s,
Expand Down Expand Up @@ -34101,7 +34151,11 @@ static int JS_WriteFunctionBytecode(BCWriterState *s,
if (bc_atom_to_idx(s, &val, atom))
goto fail;
put_u32(bc_buf + pos + 1, val);
bc_buf[pos] -= (OP_get_field_ic - OP_get_field);
if (op < OP_get_field_ic) {
bc_buf[pos] -= (OP_get_field_preinit_ic - OP_get_field);
} else {
bc_buf[pos] -= (OP_get_field_ic - OP_get_field);
}
}
break;
}
Expand Down