Mercurial > hg > Members > anatofuz > MoarVM
changeset 15:e8ab4ff02207
update Perl scripts
| author | Takahiro SHIMIZU <anatofuz@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 16 Oct 2018 19:23:56 +0900 |
| parents | b3f4341fabf8 |
| children | 5dad2b2a4da3 |
| files | cbctools/change_OPS_h_to_cbc.pl src/core/cbc-interp.cbc |
| diffstat | 2 files changed, 1407 insertions(+), 1408 deletions(-) [+] |
line wrap: on
line diff
--- a/cbctools/change_OPS_h_to_cbc.pl Tue Oct 16 17:43:47 2018 +0900 +++ b/cbctools/change_OPS_h_to_cbc.pl Tue Oct 16 19:23:56 2018 +0900 @@ -1,7 +1,6 @@ #!/usr/bin/env perl use strict; use warnings; -use DDP { deparse => 1 }; # # Input file is dispatc.cbc # @@ -41,10 +40,10 @@ for my $code_gear (@out){ $code_gear =~ s/^\s+(\w+),\n/$1/g; - print "__code $code_gear();\n"; + print "__code $code_gear(INTERP);\n"; } print "\n"; -print " static const void * const CODES[] = {\n"; +print " __code (* CODES[])(INTERP) = {\n"; map {print " $_,\n";} @out; print "};\n";
--- a/src/core/cbc-interp.cbc Tue Oct 16 17:43:47 2018 +0900 +++ b/src/core/cbc-interp.cbc Tue Oct 16 19:23:56 2018 +0900 @@ -20,9 +20,9 @@ * the OP needs (return register + argument registers. The pc will point to the first place after * the current op, i.e. the first 16 bit register number. We add the requested number to that and * use the result as index into the reg_base array which stores the frame's locals. */ -#define GET_REG(pc, idx) reg_base[check_reg(tc, reg_base, *((MVMuint16 *)(pc + idx)))] +#define GET_REG(pc, idx,i) i->reg_base[check_reg(tc, i->reg_base, *((MVMuint16 *)(pc + idx)))] #else -#define GET_REG(pc, idx) reg_base[*((MVMuint16 *)(pc + idx))] +#define GET_REG(pc, idx,i) i->reg_base[*((MVMuint16 *)(pc + idx))] #endif #if MVM_GC_DEBUG == 2 MVM_STATIC_INLINE MVMuint16 check_lex(MVMThreadContext *tc, MVMFrame *f, MVMuint16 idx) { @@ -48,7 +48,7 @@ #if MVM_CGOTO #define DISPATCH(op) #define OP(name) OP_ ## name -#define NEXT(i) CODES[NEXT_OP] (i) +#define NEXT(i) CODES[NEXT_OP(i)]() #else #define DISPATCH(op) switch (op) #define OP(name) case MVM_OP_ ## name @@ -91,7 +91,7 @@ MVM_exception_throw_adhoc(i->tc, "const_iX NYI"); } __code cbc_const_i64(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_BC_get_I64(i->cur_op, 2); + GET_REG(i->cur_op, 0,i).i64 = MVM_BC_get_I64(i->cur_op, 2); i->cur_op += 10; goto NEXT(i); } @@ -99,87 +99,87 @@ MVM_exception_throw_adhoc(i->tc, "const_n32 NYI"); } __code cbc_const_n64(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_BC_get_N64(i->cur_op, 2); + GET_REG(i->cur_op, 0,i).n64 = MVM_BC_get_N64(i->cur_op, 2); i->cur_op += 10; goto NEXT(i); } __code cbc_const_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)); + GET_REG(i->cur_op, 0,i).s = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_set(INTERP i){ - GET_REG(i->cur_op, 0) = GET_REG(i->cur_op, 2); + GET_REG(i->cur_op, 0,i) = GET_REG(i->cur_op, 2,i); i->cur_op += 4; goto NEXT(i); } __code cbc_extend_u8(INTERP i){ - GET_REG(i->cur_op, 0).u64 = (MVMuint64)GET_REG(i->cur_op, 2).u8; + GET_REG(i->cur_op, 0,i).u64 = (MVMuint64)GET_REG(i->cur_op, 2,i).u8; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_u16(INTERP i){ - GET_REG(i->cur_op, 0).u64 = (MVMuint64)GET_REG(i->cur_op, 2).u16; + GET_REG(i->cur_op, 0,i).u64 = (MVMuint64)GET_REG(i->cur_op, 2,i).u16; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_u32(INTERP i){ - GET_REG(i->cur_op, 0).u64 = (MVMuint64)GET_REG(i->cur_op, 2).u32; + GET_REG(i->cur_op, 0,i).u64 = (MVMuint64)GET_REG(i->cur_op, 2,i).u32; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_i8(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).i8; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).i8; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_i16(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).i16; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).i16; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_i32(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).i32; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).i32; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_u8(INTERP i){ - GET_REG(i->cur_op, 0).u8 = (MVMuint8)GET_REG(i->cur_op, 2).u64; + GET_REG(i->cur_op, 0,i).u8 = (MVMuint8)GET_REG(i->cur_op, 2,i).u64; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_u16(INTERP i){ - GET_REG(i->cur_op, 0).u16 = (MVMuint16)GET_REG(i->cur_op, 2).u64; + GET_REG(i->cur_op, 0,i).u16 = (MVMuint16)GET_REG(i->cur_op, 2,i).u64; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_u32(INTERP i){ - GET_REG(i->cur_op, 0).u32 = (MVMuint32)GET_REG(i->cur_op, 2).u64; + GET_REG(i->cur_op, 0,i).u32 = (MVMuint32)GET_REG(i->cur_op, 2,i).u64; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_i8(INTERP i){ - GET_REG(i->cur_op, 0).i8 = (MVMint8)GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).i8 = (MVMint8)GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_i16(INTERP i){ - GET_REG(i->cur_op, 0).i16 = (MVMint16)GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).i16 = (MVMint16)GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_i32(INTERP i){ - GET_REG(i->cur_op, 0).i32 = (MVMint32)GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).i32 = (MVMint32)GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_extend_n32(INTERP i){ - GET_REG(i->cur_op, 0).n64 = (MVMnum64)GET_REG(i->cur_op, 2).n32; + GET_REG(i->cur_op, 0,i).n64 = (MVMnum64)GET_REG(i->cur_op, 2,i).n32; i->cur_op += 4; goto NEXT(i); } __code cbc_trunc_n32(INTERP i){ - GET_REG(i->cur_op, 0).n32 = (MVMnum32)GET_REG(i->cur_op, 2).n64; + GET_REG(i->cur_op, 0,i).n32 = (MVMnum32)GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } @@ -189,7 +189,7 @@ goto NEXT(i); } __code cbc_if_i(INTERP i){ - if (GET_REG(i->cur_op, 0).i64) + if (GET_REG(i->cur_op, 0,i).i64) i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); else i->cur_op += 6; @@ -197,7 +197,7 @@ goto NEXT(i); } __code cbc_unless_i(INTERP i){ - if (GET_REG(i->cur_op, 0).i64) + if (GET_REG(i->cur_op, 0,i).i64) i->cur_op += 6; else i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); @@ -205,7 +205,7 @@ goto NEXT(i); } __code cbc_if_n(INTERP i){ - if (GET_REG(i->cur_op, 0).n64 != 0.0) + if (GET_REG(i->cur_op, 0,i).n64 != 0.0) i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); else i->cur_op += 6; @@ -213,7 +213,7 @@ goto NEXT(i); } __code cbc_unless_n(INTERP i){ - if (GET_REG(i->cur_op, 0).n64 != 0.0) + if (GET_REG(i->cur_op, 0,i).n64 != 0.0) i->cur_op += 6; else i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); @@ -221,7 +221,7 @@ goto NEXT(i); } __code cbc_if_s(INTERP i){ - MVMString *str = GET_REG(i->cur_op, 0).s; + MVMString *str = GET_REG(i->cur_op, 0,i).s; if (!str || MVM_string_graphs(i->tc, str) == 0) i->cur_op += 6; else @@ -230,7 +230,7 @@ goto NEXT(i); } __code cbc_unless_s(INTERP i){ - MVMString *str = GET_REG(i->cur_op, 0).s; + MVMString *str = GET_REG(i->cur_op, 0,i).s; if (!str || MVM_string_graphs(i->tc, str) == 0) i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); else @@ -239,7 +239,7 @@ goto NEXT(i); } __code cbc_if_s0(INTERP i){ - MVMString *str = GET_REG(i->cur_op, 0).s; + MVMString *str = GET_REG(i->cur_op, 0,i).s; if (!MVM_coerce_istrue_s(i->tc, str)) i->cur_op += 6; else @@ -248,7 +248,7 @@ goto NEXT(i); } __code cbc_unless_s0(INTERP i){ - MVMString *str = GET_REG(i->cur_op, 0).s; + MVMString *str = GET_REG(i->cur_op, 0,i).s; if (!MVM_coerce_istrue_s(i->tc, str)) i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); else @@ -258,7 +258,7 @@ } __code cbc_if_o(INTERP i){ GC_SYNC_POINT(i->tc); - MVM_coerce_istrue(i->tc, GET_REG(i->cur_op, 0).o, NULL, + MVM_coerce_istrue(i->tc, GET_REG(i->cur_op, 0,i).o, NULL, bytecode_start + GET_UI32(i->cur_op, 2), i->cur_op + 6, 0); @@ -266,7 +266,7 @@ } __code cbc_unless_o(INTERP i){ GC_SYNC_POINT(i->tc); - MVM_coerce_istrue(i->tc, GET_REG(i->cur_op, 0).o, NULL, + MVM_coerce_istrue(i->tc, GET_REG(i->cur_op, 0,i).o, NULL, bytecode_start + GET_UI32(i->cur_op, 2), i->cur_op + 6, 1); @@ -274,7 +274,7 @@ } __code cbc_jumplist(INTERP i){ MVMint64 num_labels = MVM_BC_get_I64(i->cur_op, 0); - MVMint64 input = GET_REG(i->cur_op, 8).i64; + MVMint64 input = GET_REG(i->cur_op, 8,i).i64; i->cur_op += 10; /* the goto ops are guaranteed valid/existent by validation.c */ if (input < 0 || input >= num_labels) { /* implicitly covers num_labels == 0 */ @@ -308,12 +308,12 @@ MVMObject *value = found.o == NULL ? MVM_frame_vivify_lexical(i->tc, f, idx) : found.o; - GET_REG(i->cur_op, 0).o = value; + GET_REG(i->cur_op, 0,i).o = value; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_type(i->tc, value); } else { - GET_REG(i->cur_op, 0) = GET_LEX(i->cur_op, 2, f); + GET_REG(i->cur_op, 0,i) = GET_LEX(i->cur_op, 2, f); } i->cur_op += 6; goto NEXT(i); @@ -332,31 +332,31 @@ } if (kind == MVM_reg_obj || kind == MVM_reg_str) { #if MVM_GC_DEGUG - MVM_ASSERT_NOT_FROMSPACE(i->tc, GET_REG(i->cur_op, 4).o); + MVM_ASSERT_NOT_FROMSPACE(i->tc, GET_REG(i->cur_op, 4,i).o); #endif MVM_ASSIGN_REF(i->tc, &(f->header), GET_LEX(i->cur_op, 0, f).o, - GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 4,i).o); } else { - GET_LEX(i->cur_op, 0, f) = GET_REG(i->cur_op, 4); + GET_LEX(i->cur_op, 0, f) = GET_REG(i->cur_op, 4,i); } i->cur_op += 6; goto NEXT(i); } __code cbc_getlex_ni(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_frame_find_lexical_by_name(i->tc, + GET_REG(i->cur_op, 0,i).i64 = MVM_frame_find_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_reg_int64)->i64; i->cur_op += 6; goto NEXT(i); } __code cbc_getlex_nn(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_frame_find_lexical_by_name(i->tc, + GET_REG(i->cur_op, 0,i).n64 = MVM_frame_find_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_reg_num64)->n64; i->cur_op += 6; goto NEXT(i); } __code cbc_getlex_ns(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_frame_find_lexical_by_name(i->tc, + GET_REG(i->cur_op, 0,i).s = MVM_frame_find_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_reg_str)->s; i->cur_op += 6; goto NEXT(i); @@ -365,12 +365,12 @@ MVMRegister *found = MVM_frame_find_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_reg_obj); if (found) { - GET_REG(i->cur_op, 0).o = found->o; + GET_REG(i->cur_op, 0,i).o = found->o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_type(i->tc, found->o); } else { - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; } i->cur_op += 6; goto NEXT(i); @@ -378,28 +378,28 @@ __code cbc_bindlex_ni(INTERP i){ MVM_frame_bind_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 0)), - MVM_reg_int64, &(GET_REG(i->cur_op, 4))); + MVM_reg_int64, &(GET_REG(i->cur_op, 4,i))); i->cur_op += 6; goto NEXT(i); } __code cbc_bindlex_nn(INTERP i){ MVM_frame_bind_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 0)), - MVM_reg_num64, &(GET_REG(i->cur_op, 4))); + MVM_reg_num64, &(GET_REG(i->cur_op, 4,i))); i->cur_op += 6; goto NEXT(i); } __code cbc_bindlex_ns(INTERP i){ MVM_frame_bind_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 0)), - MVM_reg_str, &(GET_REG(i->cur_op, 4))); + MVM_reg_str, &(GET_REG(i->cur_op, 4,i))); i->cur_op += 6; goto NEXT(i); } __code cbc_bindlex_no(INTERP i){ MVM_frame_bind_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 0)), - MVM_reg_obj, &(GET_REG(i->cur_op, 4))); + MVM_reg_obj, &(GET_REG(i->cur_op, 4,i))); i->cur_op += 6; goto NEXT(i); } @@ -410,21 +410,21 @@ MVM_exception_throw_adhoc(i->tc, "get/bindlex_ng NYI"); } __code cbc_getdynlex(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_frame_getdynlex(i->tc, GET_REG(i->cur_op, 2).s, + GET_REG(i->cur_op, 0,i).o = MVM_frame_getdynlex(i->tc, GET_REG(i->cur_op, 2,i).s, i->tc->cur_frame->caller); i->cur_op += 4; goto NEXT(i); } __code cbc_binddynlex(INTERP i){ - MVM_frame_binddynlex(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).o, + MVM_frame_binddynlex(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).o, i->tc->cur_frame->caller); i->cur_op += 4; goto NEXT(i); } __code cbc_setlexvalue(INTERP i){ - MVMObject *code = GET_REG(i->cur_op, 0).o; + MVMObject *code = GET_REG(i->cur_op, 0,i).o; MVMString *name = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)); - MVMObject *val = GET_REG(i->cur_op, 6).o; + MVMObject *val = GET_REG(i->cur_op, 6,i).o; MVMint16 flag = GET_I16(i->cur_op, 8); if (flag < 0 || flag > 2) MVM_exception_throw_adhoc(i->tc, "setlexvalue provided with invalid flag"); @@ -452,11 +452,11 @@ goto NEXT(i); } __code cbc_lexprimspec(INTERP i){ - MVMObject *ctx = GET_REG(i->cur_op, 2).o; - MVMString *name = GET_REG(i->cur_op, 4).s; + MVMObject *ctx = GET_REG(i->cur_op, 2,i).o; + MVMString *name = GET_REG(i->cur_op, 4,i).s; if (REPR(ctx)->ID != MVM_REPR_ID_MVMContext || !IS_CONCRETE(ctx)) MVM_exception_throw_adhoc(i->tc, "lexprimspec needs a context"); - GET_REG(i->cur_op, 0).i64 = MVM_frame_lexical_primspec(i->tc, + GET_REG(i->cur_op, 0,i).i64 = MVM_frame_lexical_primspec(i->tc, ((MVMContext *)ctx)->body.context, name); i->cur_op += 6; goto NEXT(i); @@ -464,7 +464,7 @@ __code cbc_return_i(INTERP i){ if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_return_type(i->tc, NULL); - MVM_args_set_result_int(i->tc, GET_REG(i->cur_op, 0).i64, + MVM_args_set_result_int(i->tc, GET_REG(i->cur_op, 0,i).i64, MVM_RETURN_CALLER_FRAME); if (MVM_frame_try_return(i->tc) == 0) goto return_label; @@ -473,7 +473,7 @@ __code cbc_return_n(INTERP i){ if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_return_type(i->tc, NULL); - MVM_args_set_result_num(i->tc, GET_REG(i->cur_op, 0).n64, + MVM_args_set_result_num(i->tc, GET_REG(i->cur_op, 0,i).n64, MVM_RETURN_CALLER_FRAME); if (MVM_frame_try_return(i->tc) == 0) goto return_label; @@ -482,14 +482,14 @@ __code cbc_return_s(INTERP i){ if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_return_type(i->tc, NULL); - MVM_args_set_result_str(i->tc, GET_REG(i->cur_op, 0).s, + MVM_args_set_result_str(i->tc, GET_REG(i->cur_op, 0,i).s, MVM_RETURN_CALLER_FRAME); if (MVM_frame_try_return(i->tc) == 0) goto return_label; goto NEXT(i); } __code cbc_return_o(INTERP i){ - MVMObject *value = GET_REG(i->cur_op, 0).o; + MVMObject *value = GET_REG(i->cur_op, 0,i).o; if (MVM_spesh_log_is_logging(i->tc)) { MVMROOT(i->tc, value, { MVM_spesh_log_return_type(i->tc, value); @@ -509,158 +509,158 @@ goto NEXT(i); } __code cbc_eq_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 == GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 == GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_ne_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 != GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 != GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_lt_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 < GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 < GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_le_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 <= GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 <= GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_gt_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 > GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 > GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_ge_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 >= GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 >= GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_cmp_i(INTERP i){ - MVMint64 a = GET_REG(i->cur_op, 2).i64, b = GET_REG(i->cur_op, 4).i64; - GET_REG(i->cur_op, 0).i64 = (a > b) - (a < b); + MVMint64 a = GET_REG(i->cur_op, 2,i).i64, b = GET_REG(i->cur_op, 4,i).i64; + GET_REG(i->cur_op, 0,i).i64 = (a > b) - (a < b); i->cur_op += 6; goto NEXT(i); } __code cbc_add_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 + GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 + GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sub_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 - GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 - GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_mul_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 * GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 * GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_div_i(INTERP i){ - MVMint64 num = GET_REG(i->cur_op, 2).i64; - MVMint64 denom = GET_REG(i->cur_op, 4).i64; + MVMint64 num = GET_REG(i->cur_op, 2,i).i64; + MVMint64 denom = GET_REG(i->cur_op, 4,i).i64; /* if we have a negative result, make sure we floor rather * than rounding towards zero. */ if (denom == 0) MVM_exception_throw_adhoc(i->tc, "Division by zero"); if ((num < 0) ^ (denom < 0)) { if ((num % denom) != 0) { - GET_REG(i->cur_op, 0).i64 = num / denom - 1; + GET_REG(i->cur_op, 0,i).i64 = num / denom - 1; } else { - GET_REG(i->cur_op, 0).i64 = num / denom; + GET_REG(i->cur_op, 0,i).i64 = num / denom; } } else { - GET_REG(i->cur_op, 0).i64 = num / denom; + GET_REG(i->cur_op, 0,i).i64 = num / denom; } i->cur_op += 6; goto NEXT(i); } __code cbc_div_u(INTERP i){ - GET_REG(i->cur_op, 0).u64 = GET_REG(i->cur_op, 2).u64 / GET_REG(i->cur_op, 4).u64; + GET_REG(i->cur_op, 0,i).u64 = GET_REG(i->cur_op, 2,i).u64 / GET_REG(i->cur_op, 4,i).u64; i->cur_op += 6; goto NEXT(i); } __code cbc_mod_i(INTERP i){ - MVMint64 numer = GET_REG(i->cur_op, 2).i64; - MVMint64 denom = GET_REG(i->cur_op, 4).i64; + MVMint64 numer = GET_REG(i->cur_op, 2,i).i64; + MVMint64 denom = GET_REG(i->cur_op, 4,i).i64; if (denom == 0) MVM_exception_throw_adhoc(i->tc, "Modulation by zero"); - GET_REG(i->cur_op, 0).i64 = numer % denom; + GET_REG(i->cur_op, 0,i).i64 = numer % denom; i->cur_op += 6; goto NEXT(i); } __code cbc_mod_u(INTERP i){ - GET_REG(i->cur_op, 0).u64 = GET_REG(i->cur_op, 2).u64 % GET_REG(i->cur_op, 4).u64; + GET_REG(i->cur_op, 0,i).u64 = GET_REG(i->cur_op, 2,i).u64 % GET_REG(i->cur_op, 4,i).u64; i->cur_op += 6; goto NEXT(i); } __code cbc_neg_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = -GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).i64 = -GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_abs_i(INTERP i){ - MVMint64 v = GET_REG(i->cur_op, 2).i64, mask = v >> 63; - GET_REG(i->cur_op, 0).i64 = (v + mask) ^ mask; + MVMint64 v = GET_REG(i->cur_op, 2,i).i64, mask = v >> 63; + GET_REG(i->cur_op, 0,i).i64 = (v + mask) ^ mask; i->cur_op += 4; goto NEXT(i); } __code cbc_inc_i(INTERP i){ - GET_REG(i->cur_op, 0).i64++; + GET_REG(i->cur_op, 0,i).i64++; i->cur_op += 2; goto NEXT(i); } __code cbc_inc_u(INTERP i){ - GET_REG(i->cur_op, 0).u64++; + GET_REG(i->cur_op, 0,i).u64++; i->cur_op += 2; goto NEXT(i); } __code cbc_dec_i(INTERP i){ - GET_REG(i->cur_op, 0).i64--; + GET_REG(i->cur_op, 0,i).i64--; i->cur_op += 2; goto NEXT(i); } __code cbc_dec_u(INTERP i){ - GET_REG(i->cur_op, 0).u64--; + GET_REG(i->cur_op, 0,i).u64--; i->cur_op += 2; goto NEXT(i); } __code cbc_band_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 & GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 & GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_bor_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 | GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 | GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_bxor_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 ^ GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 ^ GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_bnot_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = ~GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).i64 = ~GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_blshift_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 << GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 << GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_brshift_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 >> GET_REG(i->cur_op, 4).i64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 >> GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_pow_i(INTERP i){ - MVMint64 base = GET_REG(i->cur_op, 2).i64; - MVMint64 exp = GET_REG(i->cur_op, 4).i64; + MVMint64 base = GET_REG(i->cur_op, 2,i).i64; + MVMint64 exp = GET_REG(i->cur_op, 4,i).i64; MVMint64 result = 1; /* "Exponentiation by squaring" */ if (exp < 0) { @@ -674,243 +674,243 @@ base *= base; } } - GET_REG(i->cur_op, 0).i64 = result; + GET_REG(i->cur_op, 0,i).i64 = result; } i->cur_op += 6; goto NEXT(i); __code cbc_not_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).i64 ? 0 : 1; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).i64 ? 0 : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_gcd_i(INTERP i){ - MVMint64 a = labs(GET_REG(i->cur_op, 2).i64), b = labs(GET_REG(i->cur_op, 4).i64), c; + MVMint64 a = labs(GET_REG(i->cur_op, 2,i).i64), b = labs(GET_REG(i->cur_op, 4,i).i64), c; while ( b != 0 ) { c = a % b; a = b; b = c; } - GET_REG(i->cur_op, 0).i64 = a; + GET_REG(i->cur_op, 0,i).i64 = a; i->cur_op += 6; goto NEXT(i); } __code cbc_lcm_i(INTERP i){ - MVMint64 a = GET_REG(i->cur_op, 2).i64, b = GET_REG(i->cur_op, 4).i64, c, a_ = a, b_ = b; + MVMint64 a = GET_REG(i->cur_op, 2,i).i64, b = GET_REG(i->cur_op, 4,i).i64, c, a_ = a, b_ = b; while ( b != 0 ) { c = a % b; a = b; b = c; } c = a; - GET_REG(i->cur_op, 0).i64 = a_ / c * b_; + GET_REG(i->cur_op, 0,i).i64 = a_ / c * b_; i->cur_op += 6; goto NEXT(i); } __code cbc_eq_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 == GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 == GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_ne_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 != GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 != GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_lt_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 < GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 < GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_le_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 <= GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 <= GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_gt_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 > GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 > GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_ge_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).n64 >= GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).n64 >= GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_cmp_n(INTERP i){ - MVMnum64 a = GET_REG(i->cur_op, 2).n64, b = GET_REG(i->cur_op, 4).n64; - GET_REG(i->cur_op, 0).i64 = (a > b) - (a < b); + MVMnum64 a = GET_REG(i->cur_op, 2,i).n64, b = GET_REG(i->cur_op, 4,i).n64; + GET_REG(i->cur_op, 0,i).i64 = (a > b) - (a < b); i->cur_op += 6; goto NEXT(i); } __code cbc_add_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = GET_REG(i->cur_op, 2).n64 + GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).n64 = GET_REG(i->cur_op, 2,i).n64 + GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_sub_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = GET_REG(i->cur_op, 2).n64 - GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).n64 = GET_REG(i->cur_op, 2,i).n64 - GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_mul_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = GET_REG(i->cur_op, 2).n64 * GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).n64 = GET_REG(i->cur_op, 2,i).n64 * GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_div_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = GET_REG(i->cur_op, 2).n64 / GET_REG(i->cur_op, 4).n64; + GET_REG(i->cur_op, 0,i).n64 = GET_REG(i->cur_op, 2,i).n64 / GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_mod_n(INTERP i){ - MVMnum64 a = GET_REG(i->cur_op, 2).n64; - MVMnum64 b = GET_REG(i->cur_op, 4).n64; - GET_REG(i->cur_op, 0).n64 = b == 0 ? a : a - b * floor(a / b); + MVMnum64 a = GET_REG(i->cur_op, 2,i).n64; + MVMnum64 b = GET_REG(i->cur_op, 4,i).n64; + GET_REG(i->cur_op, 0,i).n64 = b == 0 ? a : a - b * floor(a / b); i->cur_op += 6; goto NEXT(i); } __code cbc_neg_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = -GET_REG(i->cur_op, 2).n64; + GET_REG(i->cur_op, 0,i).n64 = -GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } __code cbc_abs_n(INTERP i){ { - MVMnum64 num = GET_REG(i->cur_op, 2).n64; + MVMnum64 num = GET_REG(i->cur_op, 2,i).n64; /* The 1.0/num logic checks for a negative zero */ if (num < 0 || (num == 0 && 1.0/num < 0) ) num = num * -1; - GET_REG(i->cur_op, 0).n64 = num; + GET_REG(i->cur_op, 0,i).n64 = num; i->cur_op += 4; } goto NEXT(i); } __code cbc_pow_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = pow(GET_REG(i->cur_op, 2).n64, GET_REG(i->cur_op, 4).n64); + GET_REG(i->cur_op, 0,i).n64 = pow(GET_REG(i->cur_op, 2,i).n64, GET_REG(i->cur_op, 4,i).n64); i->cur_op += 6; goto NEXT(i); } __code cbc_ceil_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = ceil(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = ceil(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_floor_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = floor(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = floor(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_sin_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = sin(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = sin(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_asin_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = asin(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = asin(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_cos_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = cos(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = cos(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_acos_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = acos(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = acos(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_tan_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = tan(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = tan(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_atan_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = atan(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = atan(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_atan2_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = atan2(GET_REG(i->cur_op, 2).n64, - GET_REG(i->cur_op, 4).n64); + GET_REG(i->cur_op, 0,i).n64 = atan2(GET_REG(i->cur_op, 2,i).n64, + GET_REG(i->cur_op, 4,i).n64); i->cur_op += 6; goto NEXT(i); } __code cbc_sec_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = 1.0 / cos(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = 1.0 / cos(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_asec_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = acos(1.0 / GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = acos(1.0 / GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_sinh_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = sinh(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = sinh(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_cosh_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = cosh(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = cosh(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_tanh_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = tanh(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = tanh(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_sech_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = 1.0 / cosh(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = 1.0 / cosh(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_sqrt_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = sqrt(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = sqrt(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_log_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = log(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = log(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_exp_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = exp(GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).n64 = exp(GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_in(INTERP i){ - GET_REG(i->cur_op, 0).n64 = (MVMnum64)GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).n64 = (MVMnum64)GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_ni(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).n64; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_is(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_coerce_i_s(i->tc, GET_REG(i->cur_op, 2).i64); + GET_REG(i->cur_op, 0,i).s = MVM_coerce_i_s(i->tc, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_ns(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_coerce_n_s(i->tc, GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).s = MVM_coerce_n_s(i->tc, GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_si(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_coerce_s_i(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_coerce_s_i(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_sn(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_coerce_s_n(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).n64 = MVM_coerce_s_n(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_smrt_numify(INTERP i){ /* Increment PC before calling coercer, as it may make * a method call to get the result. */ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *res = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_coerce_smart_numify(i->tc, obj, res); goto NEXT(i); @@ -918,8 +918,8 @@ __code cbc_smrt_strify(INTERP i){ /* Increment PC before calling coercer, as it may make * a method call to get the result. */ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *res = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_coerce_smart_stringify(i->tc, obj, res); goto NEXT(i); @@ -935,22 +935,22 @@ goto NEXT(i); } __code cbc_arg_i(INTERP i){ - i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].i64 = GET_REG(i->cur_op, 2).i64; + i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].i64 = GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_arg_n(INTERP i){ - i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].n64 = GET_REG(i->cur_op, 2).n64; + i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].n64 = GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } __code cbc_arg_s(INTERP i){ - i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].s = GET_REG(i->cur_op, 2).s; + i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].s = GET_REG(i->cur_op, 2,i).s; i->cur_op += 4; goto NEXT(i); } __code cbc_arg_o(INTERP i){ - i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].o = GET_REG(i->cur_op, 2).o; + i->tc->cur_frame->args[GET_UI16(i->cur_op, 0)].o = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; goto NEXT(i); } @@ -972,7 +972,7 @@ } __code cbc_invoke_v(INTERP i){ { - MVMObject *code = GET_REG(i->cur_op, 0).o; + MVMObject *code = GET_REG(i->cur_op, 0,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMuint16 was_multi = 0; /* was_multi argument is MVMuint16* */ @@ -994,7 +994,7 @@ } __code cbc_invoke_i(INTERP i){ { - MVMObject *code = GET_REG(i->cur_op, 2).o; + MVMObject *code = GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMuint16 was_multi = 0; code = MVM_frame_find_invokee_multi_ok(i->tc, code, &i->cur_callsite, args, @@ -1004,7 +1004,7 @@ MVM_spesh_log_invoke_target(i->tc, code, was_multi); }); } - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_INT; i->cur_op += 4; i->tc->cur_frame->return_address = i->cur_op; @@ -1014,7 +1014,7 @@ } __code cbc_invoke_n(INTERP i){ { - MVMObject *code = GET_REG(i->cur_op, 2).o; + MVMObject *code = GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMuint16 was_multi = 0; code = MVM_frame_find_invokee_multi_ok(i->tc, code, &i->cur_callsite, args, @@ -1024,7 +1024,7 @@ MVM_spesh_log_invoke_target(i->tc, code, was_multi); }); } - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_NUM; i->cur_op += 4; i->tc->cur_frame->return_address = i->cur_op; @@ -1034,7 +1034,7 @@ } __code cbc_invoke_s(INTERP i){ { - MVMObject *code = GET_REG(i->cur_op, 2).o; + MVMObject *code = GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMuint16 was_multi = 0; code = MVM_frame_find_invokee_multi_ok(i->tc, code, &i->cur_callsite, args, @@ -1044,7 +1044,7 @@ MVM_spesh_log_invoke_target(i->tc, code, was_multi); }); } - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_STR; i->cur_op += 4; i->tc->cur_frame->return_address = i->cur_op; @@ -1054,7 +1054,7 @@ } __code cbc_invoke_o(INTERP i){ { - MVMObject *code = GET_REG(i->cur_op, 2).o; + MVMObject *code = GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMuint16 was_multi = 0; code = MVM_frame_find_invokee_multi_ok(i->tc, code, &i->cur_callsite, args, @@ -1064,7 +1064,7 @@ MVM_spesh_log_invoke_target(i->tc, code, was_multi); }); } - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_OBJ; i->cur_op += 4; i->tc->cur_frame->return_address = i->cur_op; @@ -1078,19 +1078,19 @@ goto NEXT(i); } __code cbc_param_rp_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_args_get_required_pos_int(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).i64 = MVM_args_get_required_pos_int(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); i->cur_op += 4; goto NEXT(i); } __code cbc_param_rp_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_args_get_pos_num(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).n64 = MVM_args_get_pos_num(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2), MVM_ARG_REQUIRED).arg.n64; i->cur_op += 4; goto NEXT(i); } __code cbc_param_rp_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_args_get_required_pos_str(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).s = MVM_args_get_required_pos_str(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); i->cur_op += 4; goto NEXT(i); @@ -1098,7 +1098,7 @@ __code cbc_param_rp_o(INTERP i){ MVMuint16 arg_idx = GET_UI16(i->cur_op, 2); MVMObject *param = MVM_args_get_required_pos_obj(i->tc, &i->tc->cur_frame->params, arg_idx); - GET_REG(i->cur_op, 0).o = param; + GET_REG(i->cur_op, 0,i).o = param; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, arg_idx, param); i->cur_op += 4; @@ -1109,7 +1109,7 @@ MVMArgInfo param = MVM_args_get_optional_pos_int(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); if (param.exists) { - GET_REG(i->cur_op, 0).i64 = param.arg.i64; + GET_REG(i->cur_op, 0,i).i64 = param.arg.i64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 4); } else { @@ -1124,7 +1124,7 @@ } GET_UI16(i->cur_op, 2), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).n64 = param.arg.n64; + GET_REG(i->cur_op, 0,i).n64 = param.arg.n64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 4); } else { @@ -1137,7 +1137,7 @@ MVMArgInfo param = MVM_args_get_optional_pos_str(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); if (param.exists) { - GET_REG(i->cur_op, 0).s = param.arg.s; + GET_REG(i->cur_op, 0,i).s = param.arg.s; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 4); } else { @@ -1151,7 +1151,7 @@ MVMuint16 arg_idx = GET_UI16(i->cur_op, 2); MVMArgInfo param = MVM_args_get_optional_pos_obj(i->tc, &i->tc->cur_frame->params, arg_idx); if (param.exists) { - GET_REG(i->cur_op, 0).o = param.arg.o; + GET_REG(i->cur_op, 0,i).o = param.arg.o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, arg_idx, param.arg.o); i->cur_op = bytecode_start + GET_UI32(i->cur_op, 4); @@ -1163,19 +1163,19 @@ } } __code cbc_param_rn_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).i64 = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_REQUIRED).arg.i64; i->cur_op += 6; goto NEXT(i); } __code cbc_param_rn_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).n64 = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_REQUIRED).arg.n64; i->cur_op += 6; goto NEXT(i); } __code cbc_param_rn_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).s = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_REQUIRED).arg.s; i->cur_op += 6; goto NEXT(i); @@ -1183,7 +1183,7 @@ __code cbc_param_rn_o(INTERP i){ MVMArgInfo param = MVM_args_get_named_obj(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_REQUIRED); - GET_REG(i->cur_op, 0).o = param.arg.o; + GET_REG(i->cur_op, 0,i).o = param.arg.o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, param.arg_idx, param.arg.o); i->cur_op += 6; @@ -1195,7 +1195,7 @@ } MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).i64 = param.arg.i64; + GET_REG(i->cur_op, 0,i).i64 = param.arg.i64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 6); } else { @@ -1209,7 +1209,7 @@ } MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).n64 = param.arg.n64; + GET_REG(i->cur_op, 0,i).n64 = param.arg.n64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 6); } else { @@ -1223,7 +1223,7 @@ } MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).s = param.arg.s; + GET_REG(i->cur_op, 0,i).s = param.arg.s; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 6); } else { @@ -1237,7 +1237,7 @@ } MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).o = param.arg.o; + GET_REG(i->cur_op, 0,i).o = param.arg.o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, param.arg_idx, param.arg.o); i->cur_op = bytecode_start + GET_UI32(i->cur_op, 6); @@ -1248,54 +1248,54 @@ goto NEXT(i); } __code cbc_param_sp(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_args_slurpy_positional(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); + GET_REG(i->cur_op, 0,i).o = MVM_args_slurpy_positional(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2)); i->cur_op += 4; goto NEXT(i); } __code cbc_param_sn(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_args_slurpy_named(i->tc, &i->tc->cur_frame->params); + GET_REG(i->cur_op, 0,i).o = MVM_args_slurpy_named(i->tc, &i->tc->cur_frame->params); i->cur_op += 2; goto NEXT(i); } __code cbc_getcode(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.coderefs[GET_UI16(i->cur_op, 2)]; + GET_REG(i->cur_op, 0,i).o = cu->body.coderefs[GET_UI16(i->cur_op, 2)]; i->cur_op += 4; goto NEXT(i); } __code cbc_caller(INTERP i){ MVMFrame *caller = i->tc->cur_frame; - MVMint64 depth = GET_REG(i->cur_op, 2).i64; + MVMint64 depth = GET_REG(i->cur_op, 2,i).i64; while (caller && depth-- > 0) /* keep the > 0. */ caller = caller->caller; - GET_REG(i->cur_op, 0).o = caller ? caller->code_ref : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = caller ? caller->code_ref : i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_capturelex(INTERP i){ - MVM_frame_capturelex(i->tc, GET_REG(i->cur_op, 0).o); + MVM_frame_capturelex(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_takeclosure(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_frame_takeclosure(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_frame_takeclosure(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_exception(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->active_handlers + GET_REG(i->cur_op, 0,i).o = i->tc->active_handlers ? i->tc->active_handlers->ex_obj : i->tc->instance->VMNull; i->cur_op += 2; goto NEXT(i); } __code cbc_bindexmessage(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 0).o; + MVMObject *ex = GET_REG(i->cur_op, 0,i).o; if (IS_CONCRETE(ex) && REPR(ex)->ID == MVM_REPR_ID_MVMException) { MVM_ASSIGN_REF(i->tc, &(ex->header), ((MVMException *)ex)->body.message, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 2,i).s); } else { MVM_exception_throw_adhoc(i->tc, "bindexmessage needs a VMException, got %s (%s)", REPR(ex)->name, MVM_6model_get_debug_name(i->tc, ex)); @@ -1304,98 +1304,98 @@ goto NEXT(i); } __code cbc_bindexpayload(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 0).o; - MVM_bind_exception_payload(i->tc, ex, GET_REG(i->cur_op, 2).o); + MVMObject *ex = GET_REG(i->cur_op, 0,i).o; + MVM_bind_exception_payload(i->tc, ex, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_bindexcategory(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 0).o; - MVM_bind_exception_category(i->tc, ex, GET_REG(i->cur_op, 2).i64); + MVMObject *ex = GET_REG(i->cur_op, 0,i).o; + MVM_bind_exception_category(i->tc, ex, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_getexmessage(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 2).o; + MVMObject *ex = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(ex) && REPR(ex)->ID == MVM_REPR_ID_MVMException) - GET_REG(i->cur_op, 0).s = ((MVMException *)ex)->body.message; + GET_REG(i->cur_op, 0,i).s = ((MVMException *)ex)->body.message; else MVM_exception_throw_adhoc(i->tc, "getexmessage needs a VMException, got %s (%s)", REPR(ex)->name, MVM_6model_get_debug_name(i->tc, ex)); i->cur_op += 4; goto NEXT(i); } __code cbc_getexpayload(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).o = MVM_get_exception_payload(i->tc, ex); + MVMObject *ex = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_get_exception_payload(i->tc, ex); i->cur_op += 4; goto NEXT(i); } __code cbc_getexcategory(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_get_exception_category(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_get_exception_category(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_throwdyn(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); - MVMObject *ex_obj = GET_REG(i->cur_op, 2).o; + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); + MVMObject *ex_obj = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; MVM_exception_throwobj(i->tc, MVM_EX_THROW_DYN, ex_obj, rr); goto NEXT(i); } __code cbc_throwlex(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); - MVMObject *ex_obj = GET_REG(i->cur_op, 2).o; + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); + MVMObject *ex_obj = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; MVM_exception_throwobj(i->tc, MVM_EX_THROW_LEX, ex_obj, rr); goto NEXT(i); } __code cbc_throwlexotic(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); - MVMObject *ex_obj = GET_REG(i->cur_op, 2).o; + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); + MVMObject *ex_obj = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; MVM_exception_throwobj(i->tc, MVM_EX_THROW_LEXOTIC, ex_obj, rr); goto NEXT(i); } __code cbc_throwcatdyn(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); MVMuint32 cat = (MVMuint32)MVM_BC_get_I64(i->cur_op, 2); i->cur_op += 4; MVM_exception_throwcat(i->tc, MVM_EX_THROW_DYN, cat, rr); goto NEXT(i); } __code cbc_throwcatlex(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); MVMuint32 cat = (MVMuint32)MVM_BC_get_I64(i->cur_op, 2); i->cur_op += 4; MVM_exception_throwcat(i->tc, MVM_EX_THROW_LEX, cat, rr); goto NEXT(i); } __code cbc_throwcatlexotic(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); MVMuint32 cat = (MVMuint32)MVM_BC_get_I64(i->cur_op, 2); i->cur_op += 4; MVM_exception_throwcat(i->tc, MVM_EX_THROW_LEXOTIC, cat, rr); goto NEXT(i); } __code cbc_die(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); - MVMString *str = GET_REG(i->cur_op, 2).s; + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); + MVMString *str = GET_REG(i->cur_op, 2,i).s; i->cur_op += 4; MVM_exception_die(i->tc, str, rr); goto NEXT(i); } __code cbc_rethrow(INTERP i){ - MVM_exception_throwobj(i->tc, MVM_EX_THROW_DYN, GET_REG(i->cur_op, 0).o, NULL); + MVM_exception_throwobj(i->tc, MVM_EX_THROW_DYN, GET_REG(i->cur_op, 0,i).o, NULL); goto NEXT(i); } __code cbc_resume(INTERP i){ /* Expect that resume will set the PC, so don't update i->cur_op * here. */ - MVM_exception_resume(i->tc, GET_REG(i->cur_op, 0).o); + MVM_exception_resume(i->tc, GET_REG(i->cur_op, 0,i).o); goto NEXT(i); } __code cbc_takehandlerresult(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->last_handler_result + GET_REG(i->cur_op, 0,i).o = i->tc->last_handler_result ? i->tc->last_handler_result : i->tc->instance->VMNull; i->tc->last_handler_result = NULL; @@ -1403,26 +1403,26 @@ goto NEXT(i); } __code cbc_backtracestrings(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_exception_backtrace_strings(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_exception_backtrace_strings(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_usecapture(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_args_use_capture(i->tc, i->tc->cur_frame); + GET_REG(i->cur_op, 0,i).o = MVM_args_use_capture(i->tc, i->tc->cur_frame); i->cur_op += 2; goto NEXT(i); } __code cbc_savecapture(INTERP i){ /* Create a new call capture object. */ - GET_REG(i->cur_op, 0).o = MVM_args_save_capture(i->tc, i->tc->cur_frame); + GET_REG(i->cur_op, 0,i).o = MVM_args_save_capture(i->tc, i->tc->cur_frame); i->cur_op += 2; goto NEXT(i); } __code cbc_captureposelems(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).i64 = cc->body.apc->num_pos; + GET_REG(i->cur_op, 0,i).i64 = cc->body.apc->num_pos; } else { MVM_exception_throw_adhoc(i->tc, "captureposelems needs a MVMCallCapture"); @@ -1431,11 +1431,11 @@ goto NEXT(i); } __code cbc_captureposarg(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).o = MVM_args_get_required_pos_obj(i->tc, cc->body.apc, - (MVMuint32)GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_args_get_required_pos_obj(i->tc, cc->body.apc, + (MVMuint32)GET_REG(i->cur_op, 4,i).i64); } else { MVM_exception_throw_adhoc(i->tc, "captureposarg needs a MVMCallCapture"); @@ -1444,11 +1444,11 @@ goto NEXT(i); } __code cbc_captureposarg_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).i64 = MVM_args_get_required_pos_int(i->tc, cc->body.apc, - (MVMuint32)GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_args_get_required_pos_int(i->tc, cc->body.apc, + (MVMuint32)GET_REG(i->cur_op, 4,i).i64); } else { MVM_exception_throw_adhoc(i->tc, "captureposarg_i needs a MVMCallCapture"); @@ -1457,11 +1457,11 @@ goto NEXT(i); } __code cbc_captureposarg_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).n64 = MVM_args_get_pos_num(i->tc, cc->body.apc, - (MVMuint32)GET_REG(i->cur_op, 4).i64, MVM_ARG_REQUIRED).arg.n64; + GET_REG(i->cur_op, 0,i).n64 = MVM_args_get_pos_num(i->tc, cc->body.apc, + (MVMuint32)GET_REG(i->cur_op, 4,i).i64, MVM_ARG_REQUIRED).arg.n64; } else { MVM_exception_throw_adhoc(i->tc, "captureposarg_n needs a MVMCallCapture"); @@ -1470,11 +1470,11 @@ goto NEXT(i); } __code cbc_captureposarg_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).s = MVM_args_get_required_pos_str(i->tc, cc->body.apc, - (MVMuint32)GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).s = MVM_args_get_required_pos_str(i->tc, cc->body.apc, + (MVMuint32)GET_REG(i->cur_op, 4,i).i64); } else { MVM_exception_throw_adhoc(i->tc, "captureposarg_s needs a MVMCallCapture"); @@ -1483,8 +1483,8 @@ goto NEXT(i); } __code cbc_captureposprimspec(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMint64 i = GET_REG(i->cur_op, 4).i64; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMint64 i = GET_REG(i->cur_op, 4,i).i64; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; if (i >= 0 && i < cc->body.apc->num_pos) { @@ -1493,16 +1493,16 @@ : cc->body.apc->callsite->arg_flags; swii->tch (arg_flags[i] & MVM_CALLSITE_ARG_MASK) { case MVM_CALLSITE_ARG_INT: - GET_REG(i->cur_op, 0).i64 = MVM_STORAGE_SPEC_BP_INT; + GET_REG(i->cur_op, 0,i).i64 = MVM_STORAGE_SPEC_BP_INT; break; case MVM_CALLSITE_ARG_NUM: - GET_REG(i->cur_op, 0).i64 = MVM_STORAGE_SPEC_BP_NUM; + GET_REG(i->cur_op, 0,i).i64 = MVM_STORAGE_SPEC_BP_NUM; break; case MVM_CALLSITE_ARG_STR: - GET_REG(i->cur_op, 0).i64 = MVM_STORAGE_SPEC_BP_STR; + GET_REG(i->cur_op, 0,i).i64 = MVM_STORAGE_SPEC_BP_STR; break; default: - GET_REG(i->cur_op, 0).i64 = MVM_STORAGE_SPEC_BP_NONE; + GET_REG(i->cur_op, 0,i).i64 = MVM_STORAGE_SPEC_BP_NONE; break; } } @@ -1518,11 +1518,11 @@ goto NEXT(i); } __code cbc_captureexistsnamed(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).i64 = MVM_args_has_named(i->tc, cc->body.apc, - GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_args_has_named(i->tc, cc->body.apc, + GET_REG(i->cur_op, 4,i).s); } else { MVM_exception_throw_adhoc(i->tc, "captureexistsnamed needs a MVMCallCapture"); @@ -1531,12 +1531,12 @@ goto NEXT(i); } __code cbc_capturehasnameds(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { /* If positionals count doesn't mai->tch arg count, we must * have some named args. */ MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).i64 = cc->body.apc->arg_count != cc->body.apc->num_pos; + GET_REG(i->cur_op, 0,i).i64 = cc->body.apc->arg_count != cc->body.apc->num_pos; } else { MVM_exception_throw_adhoc(i->tc, "capturehasnameds needs a MVMCallCapture"); @@ -1545,13 +1545,13 @@ goto NEXT(i); } __code cbc_invokewithcapture(INTERP i){ - MVMObject *cobj = GET_REG(i->cur_op, 4).o; + MVMObject *cobj = GET_REG(i->cur_op, 4,i).o; if (IS_CONCRETE(cobj) && REPR(cobj)->ID == MVM_REPR_ID_MVMCallCapture) { - MVMObject *code = GET_REG(i->cur_op, 2).o; + MVMObject *code = GET_REG(i->cur_op, 2,i).o; MVMCallCapture *cc = (MVMCallCapture *)cobj; MVMFrameExtra *e = MVM_frame_extra(i->tc, i->tc->cur_frame); code = MVM_frame_find_invokee(i->tc, code, NULL); - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_OBJ; i->cur_op += 6; i->tc->cur_frame->return_address = i->cur_op; @@ -1573,211 +1573,211 @@ } } __code cbc_multicacheadd(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_multi_cache_add(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o); + GET_REG(i->cur_op, 0,i).o = MVM_multi_cache_add(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_multicachefind(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_multi_cache_find(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_multi_cache_find(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_null_s(INTERP i){ - GET_REG(i->cur_op, 0).s = NULL; + GET_REG(i->cur_op, 0,i).s = NULL; i->cur_op += 2; goto NEXT(i); } __code cbc_isnull_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).s ? 0 : 1; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).s ? 0 : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_eq_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_equal(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_equal(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_ne_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)(MVM_string_equal(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s)? 0 : 1); + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)(MVM_string_equal(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s)? 0 : 1); i->cur_op += 6; goto NEXT(i); } __code cbc_gt_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s) == 1; + GET_REG(i->cur_op, 0,i).i64 = MVM_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s) == 1; i->cur_op += 6; goto NEXT(i); } __code cbc_ge_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s) >= 0; + GET_REG(i->cur_op, 0,i).i64 = MVM_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s) >= 0; i->cur_op += 6; goto NEXT(i); } __code cbc_lt_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s) == -1; + GET_REG(i->cur_op, 0,i).i64 = MVM_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s) == -1; i->cur_op += 6; goto NEXT(i); } __code cbc_le_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s) <= 0; + GET_REG(i->cur_op, 0,i).i64 = MVM_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s) <= 0; i->cur_op += 6; goto NEXT(i); } __code cbc_cmp_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_unicmp_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_unicode_string_compare(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64, - GET_REG(i->cur_op, 10).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_unicode_string_compare(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64, + GET_REG(i->cur_op, 10,i).i64); i->cur_op += 12; goto NEXT(i); } __code cbc_eqat_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_equal_at(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_equal_at(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_eqatic_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_equal_at_ignore_case(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_equal_at_ignore_case(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_eqaticim_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_equal_at_ignore_case_ignore_mark(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_equal_at_ignore_case_ignore_mark(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_haveat_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_have_at(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).s, - GET_REG(i->cur_op, 10).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_have_at(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).s, + GET_REG(i->cur_op, 10,i).i64); i->cur_op += 12; goto NEXT(i); } __code cbc_concat_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_concatenate(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_concatenate(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_repeat_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_repeat(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).s = MVM_string_repeat(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_substr_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_substring(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).s = MVM_string_substring(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_index_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_indexic_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index_ignore_case(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index_ignore_case(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_indexicim_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index_ignore_case_ignore_mark(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index_ignore_case_ignore_mark(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_graphs_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_codes_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_codes(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_codes(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_getcp_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_get_grapheme_at(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_get_grapheme_at(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_indexcp_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index_of_grapheme(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index_of_grapheme(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_uc(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_uc(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_uc(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_lc(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_lc(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_lc(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_tc(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_i->tc(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_i->tc(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_split(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_string_split(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).o = MVM_string_split(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_join(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_join(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).s = MVM_string_join(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_getcpbyname(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_unicode_lookup_by_name(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_unicode_lookup_by_name(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_getstrfromname(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_unicode_string_from_name(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_unicode_string_from_name(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_indexat(INTERP i){ /* branches on *failure* to mai->tch in the constant string, to save an instruction in regexes */ - if (MVM_string_char_at_in_string(i->tc, GET_REG(i->cur_op, 0).s, - GET_REG(i->cur_op, 2).i64, + if (MVM_string_char_at_in_string(i->tc, GET_REG(i->cur_op, 0,i).s, + GET_REG(i->cur_op, 2,i).i64, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4))) >= 0) i->cur_op += 12; else @@ -1787,8 +1787,8 @@ } __code cbc_indexnat(INTERP i){ /* branches on *failure* to mai->tch in the constant string, to save an instruction in regexes */ - if (MVM_string_char_at_in_string(i->tc, GET_REG(i->cur_op, 0).s, - GET_REG(i->cur_op, 2).i64, + if (MVM_string_char_at_in_string(i->tc, GET_REG(i->cur_op, 0,i).s, + GET_REG(i->cur_op, 2,i).i64, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4))) == -1) i->cur_op += 12; else @@ -1797,158 +1797,158 @@ goto NEXT(i); } __code cbc_unipropcode(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)MVM_unicode_name_to_property_code(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)MVM_unicode_name_to_property_code(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_unipvalcode(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)MVM_unicode_name_to_property_value_code(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)MVM_unicode_name_to_property_value_code(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_hasuniprop(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_offset_has_unicode_property_value(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, - GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_offset_has_unicode_property_value(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, + GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_hasunipropc(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_offset_has_unicode_property_value(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, (MVMint64)GET_UI16(i->cur_op, 6), + GET_REG(i->cur_op, 0,i).i64 = MVM_string_offset_has_unicode_property_value(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, (MVMint64)GET_UI16(i->cur_op, 6), (MVMint64)GET_UI16(i->cur_op, 8)); i->cur_op += 10; goto NEXT(i); } __code cbc_chars(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_chr(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_chr(i->tc, (MVMCodepoint)GET_REG(i->cur_op, 2).i64); + GET_REG(i->cur_op, 0,i).s = MVM_string_chr(i->tc, (MVMCodepoint)GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_ordfirst(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_ord_at(i->tc, GET_REG(i->cur_op, 2).s, 0); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_ord_at(i->tc, GET_REG(i->cur_op, 2,i).s, 0); i->cur_op += 4; goto NEXT(i); } __code cbc_ordat(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_ord_at(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_ord_at(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_rindexfrom(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index_from_end(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index_from_end(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_escape(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_escape(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_escape(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_flip(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_flip(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_flip(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_setbuffersize_fh(INTERP i){ - MVM_io_set_buffer_size(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64); + MVM_io_set_buffer_size(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_iscclass(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_is_cclass(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_is_cclass(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_findcclass(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_find_cclass(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_find_cclass(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_findnotcclass(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_find_not_cclass(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_find_not_cclass(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_nfafromstatelist(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nfa_from_statelist(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_nfa_from_statelist(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_nfarunproto(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nfa_run_proto(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).o = MVM_nfa_run_proto(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_nfarunalt(INTERP i){ - MVM_nfa_run_alt(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o, - GET_REG(i->cur_op, 10).o); + MVM_nfa_run_alt(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o, + GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_radix(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_radix(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).o = MVM_radix(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_encode(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_string_encode_to_buf(i->tc, GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).o, NULL); + GET_REG(i->cur_op, 0,i).o = MVM_string_encode_to_buf(i->tc, GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).o, NULL); i->cur_op += 8; goto NEXT(i); } __code cbc_decode(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_decode_from_buf(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_decode_from_buf(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_istrue_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_coerce_istrue_s(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).i64 = MVM_coerce_istrue_s(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_isfalse_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_coerce_istrue_s(i->tc, GET_REG(i->cur_op, 2).s) ? 0 : 1; + GET_REG(i->cur_op, 0,i).i64 = MVM_coerce_istrue_s(i->tc, GET_REG(i->cur_op, 2,i).s) ? 0 : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_null(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; i->cur_op += 2; goto NEXT(i); } __code cbc_isnull(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = MVM_is_null(i->tc, obj); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = MVM_is_null(i->tc, obj); i->cur_op += 4; goto NEXT(i); } __code cbc_ifnonnull(INTERP i){ - if (MVM_is_null(i->tc, GET_REG(i->cur_op, 0).o)) + if (MVM_is_null(i->tc, GET_REG(i->cur_op, 0,i).o)) i->cur_op += 6; else i->cur_op = bytecode_start + GET_UI32(i->cur_op, 2); @@ -1957,8 +1957,8 @@ } __code cbc_findmeth(INTERP i){ /* Increment PC first, as we may make a method call. */ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; MVMString *name = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)); i->cur_op += 8; MVM_6model_find_method(i->tc, obj, name, res, 1); @@ -1966,17 +1966,17 @@ } __code cbc_findmeth_s(INTERP i){ /* Increment PC first, as we may make a method call. */ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMString *name = GET_REG(i->cur_op, 4).s; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMString *name = GET_REG(i->cur_op, 4,i).s; i->cur_op += 6; MVM_6model_find_method(i->tc, obj, name, res, 1); goto NEXT(i); } __code cbc_can(INTERP i){ /* Increment PC first, as we may make a method call. */ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; MVMString *name = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)); i->cur_op += 8; MVM_6model_can_method(i->tc, obj, name, res); @@ -1984,9 +1984,9 @@ } __code cbc_can_s(INTERP i){ /* Increment PC first, as we may make a method call. */ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMString *name = GET_REG(i->cur_op, 4).s; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMString *name = GET_REG(i->cur_op, 4,i).s; i->cur_op += 6; MVM_6model_can_method(i->tc, obj, name, res); goto NEXT(i); @@ -1999,16 +1999,16 @@ * the initial allocate call also. This saves us having * to put things on the temporary stack. The GC will * know to update it in the register if it moved. */ - MVMObject *type = GET_REG(i->cur_op, 2).o; + MVMObject *type = GET_REG(i->cur_op, 2,i).o; MVMObject *obj = REPR(type)->allocate(i->tc, STABLE(type)); - GET_REG(i->cur_op, 0).o = obj; + GET_REG(i->cur_op, 0,i).o = obj; if (REPR(obj)->initialize) REPR(obj)->initialize(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_clone(INTERP i){ - MVMObject *value = GET_REG(i->cur_op, 2).o; + MVMObject *value = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(value)) { MVMROOT(i->tc, value, { MVMObject *cloned = REPR(value)->allocate(i->tc, STABLE(value)); @@ -2018,660 +2018,660 @@ * we called it. This saves us having to put things on * the temporary stack. The GC will know to update it * in the register if it moved. */ - GET_REG(i->cur_op, 0).o = cloned; + GET_REG(i->cur_op, 0,i).o = cloned; REPR(value)->copy_to(i->tc, STABLE(value), OBJECT_BODY(value), cloned, OBJECT_BODY(cloned)); }); } else { - GET_REG(i->cur_op, 0).o = value; + GET_REG(i->cur_op, 0,i).o = value; } i->cur_op += 4; goto NEXT(i); } __code cbc_isconcrete(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && IS_CONCRETE(obj) ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && IS_CONCRETE(obj) ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_rebless(INTERP i){ - if (!REPR(GET_REG(i->cur_op, 2).o)->change_type) { + if (!REPR(GET_REG(i->cur_op, 2,i).o)->change_type) { MVM_exception_throw_adhoc(i->tc, "This REPR cannot change type"); } - REPR(GET_REG(i->cur_op, 2).o)->change_type(i->tc, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 2).o; - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + REPR(GET_REG(i->cur_op, 2,i).o)->change_type(i->tc, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 2,i).o; + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 6; MVM_spesh_deopt_all(i->tc); goto NEXT(i); } __code cbc_istype(INTERP i){ /* Increment PC first, as we may make a method call. */ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMObject *type = GET_REG(i->cur_op, 4).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMObject *type = GET_REG(i->cur_op, 4,i).o; i->cur_op += 6; MVM_6model_istype(i->tc, obj, type, res); goto NEXT(i); } __code cbc_objprimspec(INTERP i){ - MVMObject *type = GET_REG(i->cur_op, 2).o; + MVMObject *type = GET_REG(i->cur_op, 2,i).o; if (type) { const MVMStorageSpec *ss = REPR(type)->get_storage_spec(i->tc, STABLE(type)); - GET_REG(i->cur_op, 0).i64 = ss->boxed_primitive; + GET_REG(i->cur_op, 0,i).i64 = ss->boxed_primitive; } else { - GET_REG(i->cur_op, 0).i64 = 0; + GET_REG(i->cur_op, 0,i).i64 = 0; } i->cur_op += 4; goto NEXT(i); } __code cbc_gethow(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_6model_get_how(i->tc, - STABLE(GET_REG(i->cur_op, 2).o)); + GET_REG(i->cur_op, 0,i).o = MVM_6model_get_how(i->tc, + STABLE(GET_REG(i->cur_op, 2,i).o)); i->cur_op += 4; goto NEXT(i); } __code cbc_getwhat(INTERP i){ - GET_REG(i->cur_op, 0).o = STABLE(GET_REG(i->cur_op, 2).o)->WHAT; + GET_REG(i->cur_op, 0,i).o = STABLE(GET_REG(i->cur_op, 2,i).o)->WHAT; i->cur_op += 4; goto NEXT(i); } __code cbc_getwho(INTERP i){ - MVMObject *who = STABLE(GET_REG(i->cur_op, 2).o)->WHO; - GET_REG(i->cur_op, 0).o = who ? who : i->tc->instance->VMNull; + MVMObject *who = STABLE(GET_REG(i->cur_op, 2,i).o)->WHO; + GET_REG(i->cur_op, 0,i).o = who ? who : i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_setwho(INTERP i){ - MVMSTable *st = STABLE(GET_REG(i->cur_op, 2).o); - MVM_ASSIGN_REF(i->tc, &(st->header), st->WHO, GET_REG(i->cur_op, 4).o); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 2).o; + MVMSTable *st = STABLE(GET_REG(i->cur_op, 2,i).o); + MVM_ASSIGN_REF(i->tc, &(st->header), st->WHO, GET_REG(i->cur_op, 4,i).o); + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 2,i).o; i->cur_op += 6; goto NEXT(i); } __code cbc_reprname(INTERP i){ - const MVMREPROps *repr = REPR(GET_REG(i->cur_op, 2).o); - GET_REG(i->cur_op, 0).s = i->tc->instance->repr_list[repr->ID]->name; + const MVMREPROps *repr = REPR(GET_REG(i->cur_op, 2,i).o); + GET_REG(i->cur_op, 0,i).s = i->tc->instance->repr_list[repr->ID]->name; i->cur_op += 4; goto NEXT(i); } __code cbc_getwhere(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).o; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; goto NEXT(i); } __code cbc_eqaddr(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_REG(i->cur_op, 2).o == GET_REG(i->cur_op, 4).o ? 1 : 0; + GET_REG(i->cur_op, 0,i).i64 = GET_REG(i->cur_op, 2,i).o == GET_REG(i->cur_op, 4,i).o ? 1 : 0; i->cur_op += 6; goto NEXT(i); } __code cbc_bindattr_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), - GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8), MVM_reg_int64); + GET_REG(i->cur_op, 2,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), + GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8,i), MVM_reg_int64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 12; goto NEXT(i); } __code cbc_bindattr_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), - GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8), MVM_reg_num64); + GET_REG(i->cur_op, 2,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), + GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8,i), MVM_reg_num64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 12; goto NEXT(i); } __code cbc_bindattr_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), - GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8), MVM_reg_str); + GET_REG(i->cur_op, 2,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), + GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8,i), MVM_reg_str); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 12; goto NEXT(i); } __code cbc_bindattr_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), - GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8), MVM_reg_obj); + GET_REG(i->cur_op, 2,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)), + GET_I16(i->cur_op, 10), GET_REG(i->cur_op, 8,i), MVM_reg_obj); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 12; goto NEXT(i); } __code cbc_bindattrs_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - -1, GET_REG(i->cur_op, 6), MVM_reg_int64); + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + -1, GET_REG(i->cur_op, 6,i), MVM_reg_int64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 8; goto NEXT(i); } __code cbc_bindattrs_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - -1, GET_REG(i->cur_op, 6), MVM_reg_num64); + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + -1, GET_REG(i->cur_op, 6,i), MVM_reg_num64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 8; goto NEXT(i); } __code cbc_bindattrs_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - -1, GET_REG(i->cur_op, 6), MVM_reg_str); + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + -1, GET_REG(i->cur_op, 6,i), MVM_reg_str); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 8; goto NEXT(i); } __code cbc_bindattrs_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot bind attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.bind_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - -1, GET_REG(i->cur_op, 6), MVM_reg_obj); + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + -1, GET_REG(i->cur_op, 6,i), MVM_reg_obj); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 8; goto NEXT(i); } __code cbc_getattr_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), - GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0), MVM_reg_int64); + GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), + GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 12; goto NEXT(i); } __code cbc_getattr_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), - GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0), MVM_reg_num64); + GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), + GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 12; goto NEXT(i); } __code cbc_getattr_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), - GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0), MVM_reg_str); + GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), + GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 12; goto NEXT(i); } __code cbc_getattr_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), - GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0), MVM_reg_obj); + GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), + GET_I16(i->cur_op, 10), &GET_REG(i->cur_op, 0,i), MVM_reg_obj); if (MVM_spesh_log_is_logging(i->tc)) - MVM_spesh_log_type(i->tc, GET_REG(i->cur_op, 0).o); + MVM_spesh_log_type(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_getattrs_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - -1, &GET_REG(i->cur_op, 0), MVM_reg_int64); + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + -1, &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 8; goto NEXT(i); } __code cbc_getattrs_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - -1, &GET_REG(i->cur_op, 0), MVM_reg_num64); + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + -1, &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 8; goto NEXT(i); } __code cbc_getattrs_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - -1, &GET_REG(i->cur_op, 0), MVM_reg_str); + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + -1, &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 8; goto NEXT(i); } __code cbc_getattrs_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); REPR(obj)->attr_funcs.get_attribute(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - -1, &GET_REG(i->cur_op, 0), MVM_reg_obj); + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + -1, &GET_REG(i->cur_op, 0,i), MVM_reg_obj); if (MVM_spesh_log_is_logging(i->tc)) - MVM_spesh_log_type(i->tc, GET_REG(i->cur_op, 0).o); + MVM_spesh_log_type(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_attrinited(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot look up attributes in a %s type object", MVM_6model_get_debug_name(i->tc, obj)); - GET_REG(i->cur_op, 0).i64 = REPR(obj)->attr_funcs.is_attribute_initialized(i->tc, + GET_REG(i->cur_op, 0,i).i64 = REPR(obj)->attr_funcs.is_attribute_initialized(i->tc, STABLE(obj), OBJECT_BODY(obj), - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, MVM_NO_HINT); + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, MVM_NO_HINT); i->cur_op += 8; goto NEXT(i); } __code cbc_box_i(INTERP i){ - MVM_box_int(i->tc, GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).o, - &GET_REG(i->cur_op, 0)); + MVM_box_int(i->tc, GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).o, + &GET_REG(i->cur_op, 0,i)); i->cur_op += 6; goto NEXT(i); } __code cbc_box_n(INTERP i){ - MVM_box_num(i->tc, GET_REG(i->cur_op, 2).n64, GET_REG(i->cur_op, 4).o, - &GET_REG(i->cur_op, 0)); + MVM_box_num(i->tc, GET_REG(i->cur_op, 2,i).n64, GET_REG(i->cur_op, 4,i).o, + &GET_REG(i->cur_op, 0,i)); i->cur_op += 6; goto NEXT(i); } __code cbc_box_s(INTERP i){ - MVM_box_str(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).o, &GET_REG(i->cur_op, 0)); + MVM_box_str(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).o, &GET_REG(i->cur_op, 0,i)); i->cur_op += 6; goto NEXT(i); } __code cbc_unbox_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot unbox a type object (%s) to an int.", MVM_6model_get_debug_name(i->tc, obj)); - GET_REG(i->cur_op, 0).i64 = REPR(obj)->box_funcs.get_int(i->tc, + GET_REG(i->cur_op, 0,i).i64 = REPR(obj)->box_funcs.get_int(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_unbox_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot unbox a type object (%s) to a num.", MVM_6model_get_debug_name(i->tc, obj)); - GET_REG(i->cur_op, 0).n64 = REPR(obj)->box_funcs.get_num(i->tc, + GET_REG(i->cur_op, 0,i).n64 = REPR(obj)->box_funcs.get_num(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_unbox_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot unbox a type object (%s) to a str.", MVM_6model_get_debug_name(i->tc, obj)); - GET_REG(i->cur_op, 0).s = REPR(obj)->box_funcs.get_str(i->tc, + GET_REG(i->cur_op, 0,i).s = REPR(obj)->box_funcs.get_str(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_atpos_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.at_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 4).i64, - &GET_REG(i->cur_op, 0), MVM_reg_int64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 4,i).i64, + &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 6; goto NEXT(i); } __code cbc_atpos_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.at_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 4).i64, - &GET_REG(i->cur_op, 0), MVM_reg_num64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 4,i).i64, + &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 6; goto NEXT(i); } __code cbc_atpos_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.at_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 4).i64, - &GET_REG(i->cur_op, 0), MVM_reg_str); + OBJECT_BODY(obj), GET_REG(i->cur_op, 4,i).i64, + &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 6; goto NEXT(i); } __code cbc_atpos_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj)) REPR(obj)->pos_funcs.at_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 4).i64, - &GET_REG(i->cur_op, 0), MVM_reg_obj); + OBJECT_BODY(obj), GET_REG(i->cur_op, 4,i).i64, + &GET_REG(i->cur_op, 0,i), MVM_reg_obj); else - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_bindpos_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.bind_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4), MVM_reg_int64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i), MVM_reg_int64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindpos_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.bind_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4), MVM_reg_num64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i), MVM_reg_num64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindpos_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.bind_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4), MVM_reg_str); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i), MVM_reg_str); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindpos_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.bind_pos(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4), MVM_reg_obj); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i), MVM_reg_obj); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_push_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.push(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_int64); - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_int64); + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_push_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.push(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_num64); - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_num64); + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_push_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.push(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_str); - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_str); + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_push_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.push(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_obj); - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_obj); + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_pop_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.pop(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_int64); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 4; goto NEXT(i); } __code cbc_pop_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.pop(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_num64); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 4; goto NEXT(i); } __code cbc_pop_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.pop(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_str); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 4; goto NEXT(i); } __code cbc_pop_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.pop(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_obj); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_obj); i->cur_op += 4; goto NEXT(i); } __code cbc_shift_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.shift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_int64); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 4; goto NEXT(i); } __code cbc_shift_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.shift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_num64); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 4; goto NEXT(i); } __code cbc_shift_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.shift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_str); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 4; goto NEXT(i); } __code cbc_shift_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->pos_funcs.shift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), &GET_REG(i->cur_op, 0), MVM_reg_obj); + OBJECT_BODY(obj), &GET_REG(i->cur_op, 0,i), MVM_reg_obj); i->cur_op += 4; goto NEXT(i); } __code cbc_unshift_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.unshift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_int64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_int64); i->cur_op += 4; goto NEXT(i); } __code cbc_unshift_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.unshift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_num64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_num64); i->cur_op += 4; goto NEXT(i); } __code cbc_unshift_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.unshift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_str); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_str); i->cur_op += 4; goto NEXT(i); } __code cbc_unshift_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.unshift(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2), MVM_reg_obj); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i), MVM_reg_obj); i->cur_op += 4; goto NEXT(i); } __code cbc_splice(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.splice(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_setelemspos(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->pos_funcs.set_elems(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), GET_REG(i->cur_op, 2).i64); + OBJECT_BODY(obj), GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_existspos(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_repr_exists_pos(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_repr_exists_pos(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_atkey_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->ass_funcs.at_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 4).s, &GET_REG(i->cur_op, 0), MVM_reg_int64); + (MVMObject *)GET_REG(i->cur_op, 4,i).s, &GET_REG(i->cur_op, 0,i), MVM_reg_int64); i->cur_op += 6; goto NEXT(i); } __code cbc_atkey_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->ass_funcs.at_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 4).s, &GET_REG(i->cur_op, 0), MVM_reg_num64); + (MVMObject *)GET_REG(i->cur_op, 4,i).s, &GET_REG(i->cur_op, 0,i), MVM_reg_num64); i->cur_op += 6; goto NEXT(i); } __code cbc_atkey_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; REPR(obj)->ass_funcs.at_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 4).s, &GET_REG(i->cur_op, 0), MVM_reg_str); + (MVMObject *)GET_REG(i->cur_op, 4,i).s, &GET_REG(i->cur_op, 0,i), MVM_reg_str); i->cur_op += 6; goto NEXT(i); } __code cbc_atkey_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj)) REPR(obj)->ass_funcs.at_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 4).s, &GET_REG(i->cur_op, 0), MVM_reg_obj); + (MVMObject *)GET_REG(i->cur_op, 4,i).s, &GET_REG(i->cur_op, 0,i), MVM_reg_obj); else - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_bindkey_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->ass_funcs.bind_key(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4), MVM_reg_int64); + OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i), MVM_reg_int64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindkey_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->ass_funcs.bind_key(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4), MVM_reg_num64); + OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i), MVM_reg_num64); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindkey_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->ass_funcs.bind_key(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4), MVM_reg_str); + OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i), MVM_reg_str); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_bindkey_o(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->ass_funcs.bind_key(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4), MVM_reg_obj); + OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i), MVM_reg_obj); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_existskey(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = REPR(obj)->ass_funcs.exists_key(i->tc, + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = REPR(obj)->ass_funcs.exists_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 4).s); + (MVMObject *)GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_deletekey(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; REPR(obj)->ass_funcs.delete_key(i->tc, STABLE(obj), obj, - OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2).s); + OBJECT_BODY(obj), (MVMObject *)GET_REG(i->cur_op, 2,i).s); MVM_SC_WB_OBJ(i->tc, obj); i->cur_op += 4; goto NEXT(i); } __code cbc_elems(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = (MVMint64)REPR(obj)->elems(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)REPR(obj)->elems(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_knowhow(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->KnowHOW; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->KnowHOW; i->cur_op += 2; goto NEXT(i); } __code cbc_knowhowattr(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->KnowHOWAttribute; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->KnowHOWAttribute; i->cur_op += 2; goto NEXT(i); } __code cbc_newtype(INTERP i){ - MVMObject *how = GET_REG(i->cur_op, 2).o; - MVMString *repr_name = GET_REG(i->cur_op, 4).s; + MVMObject *how = GET_REG(i->cur_op, 2,i).o; + MVMString *repr_name = GET_REG(i->cur_op, 4,i).s; const MVMREPROps *repr = MVM_repr_get_by_name(i->tc, repr_name); - GET_REG(i->cur_op, 0).o = repr->type_object_for(i->tc, how); + GET_REG(i->cur_op, 0,i).o = repr->type_object_for(i->tc, how); i->cur_op += 6; goto NEXT(i); } __code cbc_composetype(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - REPR(obj)->compose(i->tc, STABLE(obj), GET_REG(i->cur_op, 4).o); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + REPR(obj)->compose(i->tc, STABLE(obj), GET_REG(i->cur_op, 4,i).o); + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 2,i).o; i->cur_op += 6; goto NEXT(i); } __code cbc_setmethcache(INTERP i){ - MVMObject *iter = MVM_iter(i->tc, GET_REG(i->cur_op, 2).o); + MVMObject *iter = MVM_iter(i->tc, GET_REG(i->cur_op, 2,i).o); MVMObject *cache; MVMSTable *stable; MVMROOT(i->tc, iter, { @@ -2686,7 +2686,7 @@ MVM_iterval(i->tc, (MVMIter *)iter)); } - stable = STABLE(GET_REG(i->cur_op, 0).o); + stable = STABLE(GET_REG(i->cur_op, 0,i).o); MVM_ASSIGN_REF(i->tc, &(stable->header), stable->method_cache, cache); stable->method_cache_sc = NULL; MVM_SC_WB_ST(i->tc, stable); @@ -2695,9 +2695,9 @@ goto NEXT(i); } __code cbc_setmethcacheauth(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; MVMint64 new_flags = STABLE(obj)->mode_flags & (~MVM_METHOD_CACHE_AUTHORITATIVE); - MVMint64 flag = GET_REG(i->cur_op, 2).i64; + MVMint64 flag = GET_REG(i->cur_op, 2,i).i64; if (flag != 0) new_flags |= MVM_METHOD_CACHE_AUTHORITATIVE; STABLE(obj)->mode_flags = new_flags; @@ -2706,8 +2706,8 @@ goto NEXT(i); } __code cbc_settypecache(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; - MVMObject *types = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; + MVMObject *types = GET_REG(i->cur_op, 2,i).o; MVMSTable *st = STABLE(obj); MVMint64 i, elems = REPR(types)->elems(i->tc, STABLE(types), types, OBJECT_BODY(types)); MVMObject **cache = MVM_malloc(sizeof(MVMObject *) * elems); @@ -2724,19 +2724,19 @@ goto NEXT(i); } __code cbc_settypecheckmode(INTERP i){ - MVMSTable *st = STABLE(GET_REG(i->cur_op, 0).o); - st->mode_flags = GET_REG(i->cur_op, 2).i64 | + MVMSTable *st = STABLE(GET_REG(i->cur_op, 0,i).o); + st->mode_flags = GET_REG(i->cur_op, 2,i).i64 | (st->mode_flags & (~MVM_TYPE_CHECK_CACHE_FLAG_MASK)); MVM_SC_WB_ST(i->tc, st); i->cur_op += 4; goto NEXT(i); } __code cbc_setboolspec(INTERP i){ - MVMSTable *st = GET_REG(i->cur_op, 0).o->st; + MVMSTable *st = GET_REG(i->cur_op, 0,i).o->st; MVMBoolificationSpec *bs = MVM_malloc(sizeof(MVMBoolificationSpec)); MVMBoolificationSpec *orig_bs = st->boolification_spec; - bs->mode = (MVMuint32)GET_REG(i->cur_op, 2).i64; - MVM_ASSIGN_REF(i->tc, &(st->header), bs->method, GET_REG(i->cur_op, 4).o); + bs->mode = (MVMuint32)GET_REG(i->cur_op, 2,i).i64; + MVM_ASSIGN_REF(i->tc, &(st->header), bs->method, GET_REG(i->cur_op, 4,i).o); st->boolification_spec = bs; MVM_free(orig_bs); i->cur_op += 6; @@ -2745,8 +2745,8 @@ __code cbc_istrue(INTERP i){ /* Increment PC first then call coerce, since it may want to * do an invocation. */ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *res = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_coerce_istrue(i->tc, obj, res, NULL, NULL, 0); goto NEXT(i); @@ -2754,116 +2754,116 @@ __code cbc_isfalse(INTERP i){ /* Increment PC first then call coerce, since it may want to * do an invocation. */ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *res = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_coerce_istrue(i->tc, obj, res, NULL, NULL, 1); goto NEXT(i); } __code cbc_bootint(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTInt; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTInt; i->cur_op += 2; goto NEXT(i); } __code cbc_bootnum(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTNum; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTNum; i->cur_op += 2; goto NEXT(i); } __code cbc_bootstr(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTStr; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTStr; i->cur_op += 2; goto NEXT(i); } __code cbc_bootarray(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTArray; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTArray; i->cur_op += 2; goto NEXT(i); } __code cbc_bootintarray(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTIntArray; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTIntArray; i->cur_op += 2; goto NEXT(i); } __code cbc_bootnumarray(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTNumArray; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTNumArray; i->cur_op += 2; goto NEXT(i); } __code cbc_bootstrarray(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTStrArray; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTStrArray; i->cur_op += 2; goto NEXT(i); } __code cbc_boothash(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->instance->boot_types.BOOTHash; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->boot_types.BOOTHash; i->cur_op += 2; goto NEXT(i); } __code cbc_isint(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6int ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6int ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_isnum(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6num ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6num ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_isstr(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6str ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_P6str ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_islist(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_VMArray ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_VMArray ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_ishash(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_MVMHash ? 1 : 0; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = obj && REPR(obj)->ID == MVM_REPR_ID_MVMHash ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_sethllconfig(INTERP i){ - MVM_hll_set_config(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).o); + MVM_hll_set_config(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_hllboxtype_i(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.hll_config->int_box_type; + GET_REG(i->cur_op, 0,i).o = cu->body.hll_config->int_box_type; i->cur_op += 2; goto NEXT(i); } __code cbc_hllboxtype_n(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.hll_config->num_box_type; + GET_REG(i->cur_op, 0,i).o = cu->body.hll_config->num_box_type; i->cur_op += 2; goto NEXT(i); } __code cbc_hllboxtype_s(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.hll_config->str_box_type; + GET_REG(i->cur_op, 0,i).o = cu->body.hll_config->str_box_type; i->cur_op += 2; goto NEXT(i); } __code cbc_hlllist(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.hll_config->slurpy_array_type; + GET_REG(i->cur_op, 0,i).o = cu->body.hll_config->slurpy_array_type; i->cur_op += 2; goto NEXT(i); } __code cbc_hllhash(INTERP i){ - GET_REG(i->cur_op, 0).o = cu->body.hll_config->slurpy_hash_type; + GET_REG(i->cur_op, 0,i).o = cu->body.hll_config->slurpy_hash_type; i->cur_op += 2; goto NEXT(i); } __code cbc_getcomp(INTERP i){ MVMObject *obj = i->tc->instance->compiler_registry; uv_mutex_lock(&i->tc->instance->mutex_compiler_registry); - GET_REG(i->cur_op, 0).o = MVM_repr_at_key_o(i->tc, obj, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).o = MVM_repr_at_key_o(i->tc, obj, GET_REG(i->cur_op, 2,i).s); uv_mutex_unlock(&i->tc->instance->mutex_compiler_registry); i->cur_op += 4; goto NEXT(i); @@ -2872,15 +2872,15 @@ MVMObject *obj = i->tc->instance->compiler_registry; uv_mutex_lock(&i->tc->instance->mutex_compiler_registry); REPR(obj)->ass_funcs.bind_key(i->tc, STABLE(obj), obj, OBJECT_BODY(obj), - (MVMObject *)GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4), MVM_reg_obj); + (MVMObject *)GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i), MVM_reg_obj); uv_mutex_unlock(&i->tc->instance->mutex_compiler_registry); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 4).o; + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 4,i).o; i->cur_op += 6; goto NEXT(i); } __code cbc_getcurhllsym(INTERP i){ MVMString *hll_name = i->tc->cur_frame->static_info->body.cu->body.hll_name; - GET_REG(i->cur_op, 0).o = MVM_hll_sym_get(i->tc, hll_name, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).o = MVM_hll_sym_get(i->tc, hll_name, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } @@ -2896,21 +2896,21 @@ hll_name = i->tc->cur_frame->static_info->body.cu->body.hll_name; MVM_repr_bind_key_o(i->tc, syms, hll_name, hash); } - MVM_repr_bind_key_o(i->tc, hash, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).o); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 4).o; + MVM_repr_bind_key_o(i->tc, hash, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).o); + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 4,i).o; uv_mutex_unlock(&i->tc->instance->mutex_hll_syms); i->cur_op += 6; goto NEXT(i); } __code cbc_gethllsym(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_hll_sym_get(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).o = MVM_hll_sym_get(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_bindhllsym(INTERP i){ MVMObject *syms = i->tc->instance->hll_syms; - MVMString *hll_name = GET_REG(i->cur_op, 0).s; + MVMString *hll_name = GET_REG(i->cur_op, 0,i).s; MVMObject *hash; uv_mutex_lock(&i->tc->instance->mutex_hll_syms); hash = MVM_repr_at_key_o(i->tc, syms, hll_name); @@ -2918,38 +2918,38 @@ hash = MVM_repr_alloc_init(i->tc, i->tc->instance->boot_types.BOOTHash); /* must re-get syms and HLL name in case it moved */ syms = i->tc->instance->hll_syms; - hll_name = GET_REG(i->cur_op, 0).s; + hll_name = GET_REG(i->cur_op, 0,i).s; MVM_repr_bind_key_o(i->tc, syms, hll_name, hash); } - MVM_repr_bind_key_o(i->tc, hash, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).o); + MVM_repr_bind_key_o(i->tc, hash, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).o); uv_mutex_unlock(&i->tc->instance->mutex_hll_syms); i->cur_op += 6; goto NEXT(i); } __code cbc_settypehll(INTERP i){ - STABLE(GET_REG(i->cur_op, 0).o)->hll_owner = MVM_hll_get_config_for(i->tc, - GET_REG(i->cur_op, 2).s); + STABLE(GET_REG(i->cur_op, 0,i).o)->hll_owner = MVM_hll_get_config_for(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_settypehllrole(INTERP i){ - STABLE(GET_REG(i->cur_op, 0).o)->hll_role = GET_REG(i->cur_op, 2).i64; + STABLE(GET_REG(i->cur_op, 0,i).o)->hll_role = GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_hllize(INTERP i){ /* Increment PC before mapping, as it may invoke. */ - MVMRegister *res_reg = &GET_REG(i->cur_op, 0); - MVMObject *mapee = GET_REG(i->cur_op, 2).o; + MVMRegister *res_reg = &GET_REG(i->cur_op, 0,i); + MVMObject *mapee = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; MVM_hll_map(i->tc, mapee, MVM_hll_current(i->tc), res_reg); goto NEXT(i); } __code cbc_hllizefor(INTERP i){ /* Increment PC before mapping, as it may invoke. */ - MVMRegister *res_reg = &GET_REG(i->cur_op, 0); - MVMObject *mapee = GET_REG(i->cur_op, 2).o; - MVMString *hll = GET_REG(i->cur_op, 4).s; + MVMRegister *res_reg = &GET_REG(i->cur_op, 0,i); + MVMObject *mapee = GET_REG(i->cur_op, 2,i).o; + MVMString *hll = GET_REG(i->cur_op, 4,i).s; i->cur_op += 6; MVM_hll_map(i->tc, mapee, MVM_hll_get_config_for(i->tc, hll), res_reg); goto NEXT(i); @@ -2963,45 +2963,45 @@ goto NEXT(i); } __code cbc_iter(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_iter(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_iter(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_iterkey_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_iterkey_s(i->tc, (MVMIter *)GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).s = MVM_iterkey_s(i->tc, (MVMIter *)GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_iterval(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_iterval(i->tc, (MVMIter *)GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_iterval(i->tc, (MVMIter *)GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_getcodename(INTERP i){ - MVMObject *co = GET_REG(i->cur_op, 2).o; + MVMObject *co = GET_REG(i->cur_op, 2,i).o; if (REPR(co)->ID != MVM_REPR_ID_MVMCode || !IS_CONCRETE(co)) MVM_exception_throw_adhoc(i->tc, "gei->tcodename requires a concrete code object"); - GET_REG(i->cur_op, 0).s = ((MVMCode *)co)->body.name; + GET_REG(i->cur_op, 0,i).s = ((MVMCode *)co)->body.name; i->cur_op += 4; goto NEXT(i); } __code cbc_iscoderef(INTERP i){ - GET_REG(i->cur_op, 0).i64 = !GET_REG(i->cur_op, 2).o || - STABLE(GET_REG(i->cur_op, 2).o)->invoke == MVM_6model_invoke_default ? 0 : 1; + GET_REG(i->cur_op, 0,i).i64 = !GET_REG(i->cur_op, 2,i).o || + STABLE(GET_REG(i->cur_op, 2,i).o)->invoke == MVM_6model_invoke_default ? 0 : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_getcodeobj(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).o = MVM_frame_get_code_object(i->tc, (MVMCode *)obj); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_frame_get_code_object(i->tc, (MVMCode *)obj); i->cur_op += 4; goto NEXT(i); } __code cbc_setcodeobj(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (REPR(obj)->ID == MVM_REPR_ID_MVMCode) { MVM_ASSIGN_REF(i->tc, &(obj->header), ((MVMCode *)obj)->body.code_object, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 2,i).o); } else { MVM_exception_throw_adhoc(i->tc, "sei->tcodeobj needs a code ref"); @@ -3010,10 +3010,10 @@ goto NEXT(i); } __code cbc_setcodename(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; if (REPR(obj)->ID == MVM_REPR_ID_MVMCode) { MVM_ASSIGN_REF(i->tc, &(obj->header), ((MVMCode *)obj)->body.name, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 2,i).s); } else { MVM_exception_throw_adhoc(i->tc, "sei->tcodename needs a code ref"); @@ -3022,7 +3022,7 @@ goto NEXT(i); } __code cbc_forceouterctx(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o, *ctx = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o, *ctx = GET_REG(i->cur_op, 2,i).o; MVMFrame *orig; MVMFrame *context; MVMStaticFrame *sf; @@ -3045,9 +3045,9 @@ goto NEXT(i); } __code cbc_setinvokespec(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o, *ch = GET_REG(i->cur_op, 2).o, - *invocation_handler = GET_REG(i->cur_op, 6).o; - MVMString *name = GET_REG(i->cur_op, 4).s; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o, *ch = GET_REG(i->cur_op, 2,i).o, + *invocation_handler = GET_REG(i->cur_op, 6,i).o; + MVMString *name = GET_REG(i->cur_op, 4,i).s; MVMInvocationSpec *is = MVM_calloc(1, sizeof(MVMInvocationSpec)); MVMSTable *st = STABLE(obj); MVM_ASSIGN_REF(i->tc, &(st->header), is->class_handle, ch); @@ -3063,19 +3063,19 @@ goto NEXT(i); } __code cbc_isinvokable(INTERP i){ - MVMSTable *st = STABLE(GET_REG(i->cur_op, 2).o); - GET_REG(i->cur_op, 0).i64 = st->invoke == MVM_6model_invoke_default + MVMSTable *st = STABLE(GET_REG(i->cur_op, 2,i).o); + GET_REG(i->cur_op, 0,i).i64 = st->invoke == MVM_6model_invoke_default ? (st->invocation_spec ? 1 : 0) : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_freshcoderef(INTERP i){ - MVMObject * const cr = GET_REG(i->cur_op, 2).o; + MVMObject * const cr = GET_REG(i->cur_op, 2,i).o; MVMCode *ncr; if (REPR(cr)->ID != MVM_REPR_ID_MVMCode) MVM_exception_throw_adhoc(i->tc, "freshcoderef requires a coderef"); - ncr = (MVMCode *)(GET_REG(i->cur_op, 0).o = MVM_repr_clone(i->tc, cr)); + ncr = (MVMCode *)(GET_REG(i->cur_op, 0,i).o = MVM_repr_clone(i->tc, cr)); MVMROOT(i->tc, ncr, { MVMStaticFrame *nsf; if (!ncr->body.sf->body.fully_deserialized) @@ -3089,7 +3089,7 @@ goto NEXT(i); } __code cbc_markcodestatic(INTERP i){ - MVMObject * const cr = GET_REG(i->cur_op, 0).o; + MVMObject * const cr = GET_REG(i->cur_op, 0,i).o; if (REPR(cr)->ID != MVM_REPR_ID_MVMCode) MVM_exception_throw_adhoc(i->tc, "markcodestatic requires a coderef"); ((MVMCode *)cr)->body.is_static = 1; @@ -3097,7 +3097,7 @@ goto NEXT(i); } __code cbc_markcodestub(INTERP i){ - MVMObject * const cr = GET_REG(i->cur_op, 0).o; + MVMObject * const cr = GET_REG(i->cur_op, 0,i).o; if (REPR(cr)->ID != MVM_REPR_ID_MVMCode) MVM_exception_throw_adhoc(i->tc, "markcodestub requires a coderef"); ((MVMCode *)cr)->body.is_compiler_stub = 1; @@ -3105,23 +3105,23 @@ goto NEXT(i); } __code cbc_getstaticcode(INTERP i){ - MVMObject * const cr = GET_REG(i->cur_op, 2).o; + MVMObject * const cr = GET_REG(i->cur_op, 2,i).o; if (REPR(cr)->ID != MVM_REPR_ID_MVMCode) MVM_exception_throw_adhoc(i->tc, "getstaticcode requires a static coderef"); - GET_REG(i->cur_op, 0).o = (MVMObject *)((MVMCode *)cr)->body.sf->body.static_code; + GET_REG(i->cur_op, 0,i).o = (MVMObject *)((MVMCode *)cr)->body.sf->body.static_code; i->cur_op += 4; goto NEXT(i); } __code cbc_getcodecuid(INTERP i){ - MVMObject * const cr = GET_REG(i->cur_op, 2).o; + MVMObject * const cr = GET_REG(i->cur_op, 2,i).o; if (REPR(cr)->ID != MVM_REPR_ID_MVMCode || !IS_CONCRETE(cr)) MVM_exception_throw_adhoc(i->tc, "gei->tcodecuid requires a static coderef"); - GET_REG(i->cur_op, 0).s = ((MVMCode *)cr)->body.sf->body.cuuid; + GET_REG(i->cur_op, 0,i).s = ((MVMCode *)cr)->body.sf->body.cuuid; i->cur_op += 4; goto NEXT(i); } __code cbc_setdispatcher(INTERP i){ - i->tc->cur_dispai->tcher = GET_REG(i->cur_op, 0).o; + i->tc->cur_dispai->tcher = GET_REG(i->cur_op, 0,i).o; i->tc->cur_dispai->tcher_for = NULL; i->cur_op += 2; goto NEXT(i); @@ -3131,18 +3131,18 @@ MVMObject *disp_for = i->tc->cur_dispai->tcher_for; MVMObject *cur_code = i->tc->cur_frame->code_ref; if (disp && (!disp_for || disp_for == cur_code)) { - GET_REG(i->cur_op, 0).o = disp; + GET_REG(i->cur_op, 0,i).o = disp; i->tc->cur_dispai->tcher = NULL; } else { - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; } i->cur_op += 2; goto NEXT(i); } __code cbc_assign(INTERP i){ - MVMObject *cont = GET_REG(i->cur_op, 0).o; - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *cont = GET_REG(i->cur_op, 0,i).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; const MVMContainerSpec *spec = STABLE(cont)->container_spec; i->cur_op += 4; if (spec) { @@ -3153,8 +3153,8 @@ goto NEXT(i); } __code cbc_assignunchecked(INTERP i){ - MVMObject *cont = GET_REG(i->cur_op, 0).o; - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *cont = GET_REG(i->cur_op, 0,i).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; const MVMContainerSpec *spec = STABLE(cont)->container_spec; i->cur_op += 4; if (spec) { @@ -3165,15 +3165,15 @@ goto NEXT(i); } __code cbc_iscont(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = MVM_is_null(i->tc, obj) || STABLE(obj)->container_spec == NULL ? 0 : 1; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = MVM_is_null(i->tc, obj) || STABLE(obj)->container_spec == NULL ? 0 : 1; i->cur_op += 4; goto NEXT(i); } __code cbc_decont(INTERP i){ MVMuint8 *prev_op = i->cur_op; - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; if (obj && IS_CONCRETE(obj) && STABLE(obj)->container_spec) { STABLE(obj)->container_spec->fei->tch(i->tc, obj, r); @@ -3186,8 +3186,8 @@ goto NEXT(i); } __code cbc_setcontspec(INTERP i){ - MVMSTable *st = STABLE(GET_REG(i->cur_op, 0).o); - MVMString *name = GET_REG(i->cur_op, 2).s; + MVMSTable *st = STABLE(GET_REG(i->cur_op, 0,i).o); + MVMString *name = GET_REG(i->cur_op, 2,i).s; const MVMContainerConfigurer *cc = MVM_6model_get_container_config(i->tc, name); if (cc == NULL) { char *c_name = MVM_string_utf8_encode_C_string(i->tc, name); @@ -3200,30 +3200,30 @@ "Cannot change a type's container specification"); cc->set_container_spec(i->tc, st); - cc->configure_container_spec(i->tc, st, GET_REG(i->cur_op, 4).o); + cc->configure_container_spec(i->tc, st, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_sha1(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_sha1(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_sha1(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_createsc(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_sc_create(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).o = MVM_sc_create(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_scsetobj(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 0).o; - MVMObject *obj = GET_REG(i->cur_op, 4).o; + MVMObject *sc = GET_REG(i->cur_op, 0,i).o; + MVMObject *obj = GET_REG(i->cur_op, 4,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scsetobj"); MVM_sc_set_object(i->tc, (MVMSerializationContext *)sc, - GET_REG(i->cur_op, 2).i64, obj); + GET_REG(i->cur_op, 2,i).i64, obj); if (MVM_sc_get_stable_sc(i->tc, STABLE(obj)) == NULL) { /* Need to claim the SC also; typical case for new type objects. */ MVMSTable *st = STABLE(obj); @@ -3234,50 +3234,50 @@ goto NEXT(i); } __code cbc_scsetcode(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 0).o; - MVMObject *code = GET_REG(i->cur_op, 4).o; + MVMObject *sc = GET_REG(i->cur_op, 0,i).o; + MVMObject *code = GET_REG(i->cur_op, 4,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scsei->tcode"); MVM_sc_set_obj_sc(i->tc, code, (MVMSerializationContext *)sc); MVM_sc_set_code(i->tc, (MVMSerializationContext *)sc, - GET_REG(i->cur_op, 2).i64, code); + GET_REG(i->cur_op, 2,i).i64, code); i->cur_op += 6; goto NEXT(i); } __code cbc_scgetobj(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scgetobj"); - GET_REG(i->cur_op, 0).o = MVM_sc_get_object(i->tc, - (MVMSerializationContext *)sc, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_sc_get_object(i->tc, + (MVMSerializationContext *)sc, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_scgethandle(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scgethandle"); - GET_REG(i->cur_op, 0).s = MVM_sc_get_handle(i->tc, + GET_REG(i->cur_op, 0,i).s = MVM_sc_get_handle(i->tc, (MVMSerializationContext *)sc); i->cur_op += 4; goto NEXT(i); } __code cbc_scgetobjidx(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scgetobjidx"); - GET_REG(i->cur_op, 0).i64 = MVM_sc_find_object_idx(i->tc, - (MVMSerializationContext *)sc, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_sc_find_object_idx(i->tc, + (MVMSerializationContext *)sc, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_scsetdesc(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 0).o; - MVMString *desc = GET_REG(i->cur_op, 2).s; + MVMObject *sc = GET_REG(i->cur_op, 0,i).o; + MVMString *desc = GET_REG(i->cur_op, 2,i).s; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scsetdesc"); @@ -3286,18 +3286,18 @@ goto NEXT(i); } __code cbc_scobjcount(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scobjcount"); - GET_REG(i->cur_op, 0).i64 = MVM_sc_get_object_count(i->tc, + GET_REG(i->cur_op, 0,i).i64 = MVM_sc_get_object_count(i->tc, (MVMSerializationContext *)sc); i->cur_op += 4; goto NEXT(i); } __code cbc_setobjsc(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to setobjsc"); @@ -3306,26 +3306,26 @@ goto NEXT(i); } __code cbc_getobjsc(INTERP i){ - GET_REG(i->cur_op, 0).o = (MVMObject *)MVM_sc_get_obj_sc(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = (MVMObject *)MVM_sc_get_obj_sc(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_serialize(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; - MVMObject *obj = GET_REG(i->cur_op, 4).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; + MVMObject *obj = GET_REG(i->cur_op, 4,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to serialize"); - GET_REG(i->cur_op, 0).s = MVM_serialization_serialize(i->tc, (MVMSerializationContext *)sc, obj); + GET_REG(i->cur_op, 0,i).s = MVM_serialization_serialize(i->tc, (MVMSerializationContext *)sc, obj); i->cur_op += 6; goto NEXT(i); } __code cbc_deserialize(INTERP i){ - MVMString *blob = GET_REG(i->cur_op, 0).s; - MVMObject *sc = GET_REG(i->cur_op, 2).o; - MVMObject *sh = GET_REG(i->cur_op, 4).o; - MVMObject *cr = GET_REG(i->cur_op, 6).o; - MVMObject *conf = GET_REG(i->cur_op, 8).o; + MVMString *blob = GET_REG(i->cur_op, 0,i).s; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; + MVMObject *sh = GET_REG(i->cur_op, 4,i).o; + MVMObject *cr = GET_REG(i->cur_op, 6,i).o; + MVMObject *conf = GET_REG(i->cur_op, 8,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to deserialize"); @@ -3337,29 +3337,29 @@ __code cbc_wval(INTERP i){ MVMuint16 dep = GET_UI16(i->cur_op, 2); MVMuint16 idx = GET_UI16(i->cur_op, 4); - GET_REG(i->cur_op, 0).o = MVM_sc_get_sc_object(i->tc, cu, dep, idx); + GET_REG(i->cur_op, 0,i).o = MVM_sc_get_sc_object(i->tc, cu, dep, idx); i->cur_op += 6; goto NEXT(i); } __code cbc_wval_wide(INTERP i){ MVMuint16 dep = GET_UI16(i->cur_op, 2); MVMuint64 idx = MVM_BC_get_I64(i->cur_op, 4); - GET_REG(i->cur_op, 0).o = MVM_sc_get_sc_object(i->tc, cu, dep, idx); + GET_REG(i->cur_op, 0,i).o = MVM_sc_get_sc_object(i->tc, cu, dep, idx); i->cur_op += 12; goto NEXT(i); } __code cbc_scwbdisable(INTERP i){ - GET_REG(i->cur_op, 0).i64 = ++i->tc->sc_wb_disable_depth; + GET_REG(i->cur_op, 0,i).i64 = ++i->tc->sc_wb_disable_depth; i->cur_op += 2; goto NEXT(i); } __code cbc_scwbenable(INTERP i){ - GET_REG(i->cur_op, 0).i64 = --i->tc->sc_wb_disable_depth; + GET_REG(i->cur_op, 0,i).i64 = --i->tc->sc_wb_disable_depth; i->cur_op += 2; goto NEXT(i); } __code cbc_pushcompsc(INTERP i){ - MVMObject * const sc = GET_REG(i->cur_op, 0).o; + MVMObject * const sc = GET_REG(i->cur_op, 0,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Can only push an SCRef with pushcompsc"); if (MVM_is_null(i->tc, i->tc->compiling_scs)) { @@ -3375,16 +3375,16 @@ MVMObject * const scs = i->tc->compiling_scs; if (MVM_is_null(i->tc, scs) || MVM_repr_elems(i->tc, scs) == 0) MVM_exception_throw_adhoc(i->tc, "No current compiling SC"); - GET_REG(i->cur_op, 0).o = MVM_repr_shift_o(i->tc, i->tc->compiling_scs); + GET_REG(i->cur_op, 0,i).o = MVM_repr_shift_o(i->tc, i->tc->compiling_scs); i->cur_op += 2; goto NEXT(i); } __code cbc_scgetdesc(INTERP i){ - MVMObject *sc = GET_REG(i->cur_op, 2).o; + MVMObject *sc = GET_REG(i->cur_op, 2,i).o; if (REPR(sc)->ID != MVM_REPR_ID_SCRef) MVM_exception_throw_adhoc(i->tc, "Must provide an SCRef operand to scgetdesc"); - GET_REG(i->cur_op, 0).s = MVM_sc_get_description(i->tc, + GET_REG(i->cur_op, 0,i).s = MVM_sc_get_description(i->tc, (MVMSerializationContext *)sc); i->cur_op += 4; goto NEXT(i); @@ -3393,8 +3393,8 @@ /* This op will end up returning into the runloop to run * deserialization and load code, so make sure we're done * processing this op really. */ - MVMString *filename = GET_REG(i->cur_op, 2).s; - GET_REG(i->cur_op, 0).s = filename; + MVMString *filename = GET_REG(i->cur_op, 2,i).s; + GET_REG(i->cur_op, 0,i).s = filename; i->cur_op += 4; /* Set up return (really continuation after load) address @@ -3407,7 +3407,7 @@ /* This op will end up returning into the runloop to run * deserialization and load code, so make sure we're done * processing this op really. */ - MVMObject *buffer = GET_REG(i->cur_op, 0).o; + MVMObject *buffer = GET_REG(i->cur_op, 0,i).o; i->cur_op += 2; /* Set up return (really continuation after load) address @@ -3420,8 +3420,8 @@ /* This op will end up returning into the runloop to run * deserialization and load code, so make sure we're done * processing this op really. */ - MVMObject *file = GET_REG(i->cur_op, 0).o; - MVMString *filename = GET_REG(i->cur_op, 2).s; + MVMObject *file = GET_REG(i->cur_op, 0,i).o; + MVMString *filename = GET_REG(i->cur_op, 2,i).s; i->cur_op += 4; /* Set up return (really continuation after load) address @@ -3431,8 +3431,8 @@ goto NEXT(i); } __code cbc_masttofile(INTERP i){ - MVM_mast_to_file(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s); + MVM_mast_to_file(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } @@ -3440,9 +3440,9 @@ /* This op will end up returning into the runloop to run * deserialization and load code, so make sure we're done * processing this op really. */ - MVMObject *node = GET_REG(i->cur_op, 2).o; - MVMObject *types = GET_REG(i->cur_op, 4).o; - MVMRegister *result_reg = &GET_REG(i->cur_op, 0); + MVMObject *node = GET_REG(i->cur_op, 2,i).o; + MVMObject *types = GET_REG(i->cur_op, 4,i).o; + MVMRegister *result_reg = &GET_REG(i->cur_op, 0,i); i->cur_op += 6; /* Set up return (really continuation after load) address @@ -3452,16 +3452,16 @@ goto NEXT(i); } __code cbc_iscompunit(INTERP i){ - MVMObject *maybe_cu = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = REPR(maybe_cu)->ID == MVM_REPR_ID_MVMCompUnit; + MVMObject *maybe_cu = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = REPR(maybe_cu)->ID == MVM_REPR_ID_MVMCompUnit; i->cur_op += 4; goto NEXT(i); } __code cbc_compunitmainline(INTERP i){ - MVMObject *maybe_cu = GET_REG(i->cur_op, 2).o; + MVMObject *maybe_cu = GET_REG(i->cur_op, 2,i).o; if (REPR(maybe_cu)->ID == MVM_REPR_ID_MVMCompUnit) { MVMCompUnit *cu = (MVMCompUnit *)maybe_cu; - GET_REG(i->cur_op, 0).o = cu->body.coderefs[0]; + GET_REG(i->cur_op, 0,i).o = cu->body.coderefs[0]; } else { MVM_exception_throw_adhoc(i->tc, "compunitmainline requires an MVMCompUnit"); @@ -3471,7 +3471,7 @@ } __code cbc_compunitcodes(INTERP i){ MVMObject * const result = MVM_repr_alloc_init(i->tc, MVM_hll_current(i->tc)->slurpy_array_type); - MVMCompUnit * const maybe_cu = (MVMCompUnit *)GET_REG(i->cur_op, 2).o; + MVMCompUnit * const maybe_cu = (MVMCompUnit *)GET_REG(i->cur_op, 2,i).o; if (REPR(maybe_cu)->ID == MVM_REPR_ID_MVMCompUnit) { const MVMuint32 num_frames = maybe_cu->body.num_frames; MVMObject ** const coderefs = maybe_cu->body.coderefs; @@ -3481,7 +3481,7 @@ MVM_repr_push_o(i->tc, result, coderefs[i]); } - GET_REG(i->cur_op, 0).o = result; + GET_REG(i->cur_op, 0,i).o = result; } else { MVM_exception_throw_adhoc(i->tc, "compunii->tcodes requires an MVMCompUnit"); @@ -3490,276 +3490,276 @@ goto NEXT(i); } __code cbc_ctx(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_frame_context_wrapper(i->tc, i->tc->cur_frame); + GET_REG(i->cur_op, 0,i).o = MVM_frame_context_wrapper(i->tc, i->tc->cur_frame); i->cur_op += 2; goto NEXT(i); } __code cbc_ctxouter(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o; MVMFrame *frame; if (!IS_CONCRETE(this_ctx) || REPR(this_ctx)->ID != MVM_REPR_ID_MVMContext) { MVM_exception_throw_adhoc(i->tc, "ctxouter needs an MVMContext"); } if ((frame = ((MVMContext *)this_ctx)->body.context->outer)) - GET_REG(i->cur_op, 0).o = MVM_frame_context_wrapper(i->tc, frame); + GET_REG(i->cur_op, 0,i).o = MVM_frame_context_wrapper(i->tc, frame); else - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_ctxcaller(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o, *ctx = NULL; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o, *ctx = NULL; MVMFrame *frame; if (!IS_CONCRETE(this_ctx) || REPR(this_ctx)->ID != MVM_REPR_ID_MVMContext) { MVM_exception_throw_adhoc(i->tc, "ctxcaller needs an MVMContext"); } if ((frame = ((MVMContext *)this_ctx)->body.context->caller)) ctx = MVM_frame_context_wrapper(i->tc, frame); - GET_REG(i->cur_op, 0).o = ctx ? ctx : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = ctx ? ctx : i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_ctxlexpad(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(this_ctx) || REPR(this_ctx)->ID != MVM_REPR_ID_MVMContext) { MVM_exception_throw_adhoc(i->tc, "ctxlexpad needs an MVMContext"); } - GET_REG(i->cur_op, 0).o = this_ctx; + GET_REG(i->cur_op, 0,i).o = this_ctx; i->cur_op += 4; goto NEXT(i); } __code cbc_curcode(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->cur_frame->code_ref; + GET_REG(i->cur_op, 0,i).o = i->tc->cur_frame->code_ref; i->cur_op += 2; goto NEXT(i); } __code cbc_callercode(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->cur_frame->caller + GET_REG(i->cur_op, 0,i).o = i->tc->cur_frame->caller ? i->tc->cur_frame->caller->code_ref : i->tc->instance->VMNull; i->cur_op += 2; goto NEXT(i); } __code cbc_add_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_add(i->tc, GET_REG(i->cur_op, 6).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_add(i->tc, GET_REG(i->cur_op, 6,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_sub_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_sub(i->tc, GET_REG(i->cur_op, 6).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_sub(i->tc, GET_REG(i->cur_op, 6,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_mul_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_mul(i->tc, GET_REG(i->cur_op, 6).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_mul(i->tc, GET_REG(i->cur_op, 6,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_div_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_div(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_div(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_mod_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_mod(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_mod(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_neg_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; MVMObject * const result = MVM_repr_alloc_init(i->tc, type); - MVM_bigint_neg(i->tc, result, GET_REG(i->cur_op, 2).o); - GET_REG(i->cur_op, 0).o = result; + MVM_bigint_neg(i->tc, result, GET_REG(i->cur_op, 2,i).o); + GET_REG(i->cur_op, 0,i).o = result; i->cur_op += 6; goto NEXT(i); } __code cbc_abs_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; MVMObject * const result = MVM_repr_alloc_init(i->tc, type); - MVM_bigint_abs(i->tc, result, GET_REG(i->cur_op, 2).o); - GET_REG(i->cur_op, 0).o = result; + MVM_bigint_abs(i->tc, result, GET_REG(i->cur_op, 2,i).o); + GET_REG(i->cur_op, 0,i).o = result; i->cur_op += 6; goto NEXT(i); } __code cbc_cmp_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_eq_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_EQ == MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_EQ == MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_ne_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_EQ != MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_EQ != MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_lt_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_LT == MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_LT == MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_le_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_GT != MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_GT != MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_gt_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_GT == MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_GT == MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_ge_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).i64 = MP_LT != MVM_bigint_cmp(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).i64 = MP_LT != MVM_bigint_cmp(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_bor_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_or(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_or(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_bxor_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_xor(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_xor(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_band_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_and(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_and(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_bnot_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_not(i->tc, type, GET_REG(i->cur_op, 2).o); + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_not(i->tc, type, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_blshift_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_shl(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_shl(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_brshift_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 6).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_shr(i->tc, type, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + MVMObject * const type = GET_REG(i->cur_op, 6,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_shr(i->tc, type, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_pow_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_pow(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_pow(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o); i->cur_op += 10; goto NEXT(i); } __code cbc_gcd_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_gcd(i->tc, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_gcd(i->tc, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_lcm_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_lcm(i->tc, GET_REG(i->cur_op, 6).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_lcm(i->tc, GET_REG(i->cur_op, 6,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_expmod_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 8).o; + MVMObject * const type = GET_REG(i->cur_op, 8,i).o; MVMObject * const result = MVM_repr_alloc_init(i->tc, type); - MVM_bigint_expmod(i->tc, result, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o); - GET_REG(i->cur_op, 0).o = result; + MVM_bigint_expmod(i->tc, result, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o); + GET_REG(i->cur_op, 0,i).o = result; i->cur_op += 10; goto NEXT(i); } __code cbc_isprime_I(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o; - MVMint64 b = GET_REG(i->cur_op, 4).i64; - GET_REG(i->cur_op, 0).i64 = MVM_bigint_is_prime(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o; + MVMint64 b = GET_REG(i->cur_op, 4,i).i64; + GET_REG(i->cur_op, 0,i).i64 = MVM_bigint_is_prime(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_rand_I(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_rand(i->tc, type, GET_REG(i->cur_op, 2).o); + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_rand(i->tc, type, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_coerce_In(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).n64 = MVM_bigint_to_num(i->tc, a); + MVMObject *a = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).n64 = MVM_bigint_to_num(i->tc, a); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_Is(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_bigint_to_str(i->tc, GET_REG(i->cur_op, 2).o, 10); + GET_REG(i->cur_op, 0,i).s = MVM_bigint_to_str(i->tc, GET_REG(i->cur_op, 2,i).o, 10); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_nI(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_from_num(i->tc, type, GET_REG(i->cur_op, 2).n64); + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_from_num(i->tc, type, GET_REG(i->cur_op, 2,i).n64); i->cur_op += 6; goto NEXT(i); } __code cbc_coerce_sI(INTERP i){ - MVMString *s = GET_REG(i->cur_op, 2).s; - MVMObject *type = GET_REG(i->cur_op, 4).o; + MVMString *s = GET_REG(i->cur_op, 2,i).s; + MVMObject *type = GET_REG(i->cur_op, 4,i).o; char *buf = MVM_string_ascii_encode(i->tc, s, NULL, 0); MVMObject *a = MVM_repr_alloc_init(i->tc, type); MVM_bigint_from_str(i->tc, a, buf); MVM_free(buf); - GET_REG(i->cur_op, 0).o = a; + GET_REG(i->cur_op, 0,i).o = a; i->cur_op += 6; goto NEXT(i); } __code cbc_isbig_I(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_bigint_is_big(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_bigint_is_big(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_bool_I(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_bigint_bool(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_bigint_bool(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_base_I(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_bigint_to_str(i->tc, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).s = MVM_bigint_to_str(i->tc, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_radix_I(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_bigint_radix(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64, GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_bigint_radix(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64, GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_div_In(INTERP i){ - MVMObject *a = GET_REG(i->cur_op, 2).o, *b = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).n64 = MVM_bigint_div_num(i->tc, a, b); + MVMObject *a = GET_REG(i->cur_op, 2,i).o, *b = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).n64 = MVM_bigint_div_num(i->tc, a, b); i->cur_op += 6; goto NEXT(i); } __code cbc_copy_f(INTERP i){ - MVM_file_copy(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).s); + MVM_file_copy(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } @@ -3768,137 +3768,137 @@ goto NEXT(i); } __code cbc_rename_f(INTERP i){ - MVM_file_rename(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).s); + MVM_file_rename(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_delete_f(INTERP i){ - MVM_file_delete(i->tc, GET_REG(i->cur_op, 0).s); + MVM_file_delete(i->tc, GET_REG(i->cur_op, 0,i).s); i->cur_op += 2; goto NEXT(i); } __code cbc_chmod_f(INTERP i){ - MVM_file_chmod(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).i64); + MVM_file_chmod(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_exists_f(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_exists(i->tc, GET_REG(i->cur_op, 2).s, 0); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_exists(i->tc, GET_REG(i->cur_op, 2,i).s, 0); i->cur_op += 4; goto NEXT(i); } __code cbc_mkdir(INTERP i){ - MVM_dir_mkdir(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).i64); + MVM_dir_mkdir(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_rmdir(INTERP i){ - MVM_dir_rmdir(i->tc, GET_REG(i->cur_op, 0).s); + MVM_dir_rmdir(i->tc, GET_REG(i->cur_op, 0,i).s); i->cur_op += 2; goto NEXT(i); } __code cbc_open_dir(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_dir_open(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).o = MVM_dir_open(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_read_dir(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_dir_read(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).s = MVM_dir_read(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_close_dir(INTERP i){ - MVM_dir_close(i->tc, GET_REG(i->cur_op, 0).o); + MVM_dir_close(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_open_fh(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_file_open_fh(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).o = MVM_file_open_fh(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_close_fh(INTERP i){ - MVM_io_close(i->tc, GET_REG(i->cur_op, 0).o); + MVM_io_close(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_seek_fh(INTERP i){ - MVM_io_seek(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4).i64); + MVM_io_seek(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_lock_fh(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_lock(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_lock(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_unlock_fh(INTERP i){ - MVM_io_unlock(i->tc, GET_REG(i->cur_op, 0).o); + MVM_io_unlock(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_sync_fh(INTERP i){ - MVM_io_flush(i->tc, GET_REG(i->cur_op, 0).o, 1); + MVM_io_flush(i->tc, GET_REG(i->cur_op, 0,i).o, 1); i->cur_op += 2; goto NEXT(i); } __code cbc_trunc_fh(INTERP i){ - MVM_io_truncate(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64); + MVM_io_truncate(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_eof_fh(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_eof(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_eof(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_getstdin(INTERP i){ if (MVM_is_null(i->tc, i->tc->instance->stdin_handle)) MVM_exception_throw_adhoc(i->tc, "STDIN filehandle was never initialized"); - GET_REG(i->cur_op, 0).o = i->tc->instance->stdin_handle; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->stdin_handle; i->cur_op += 2; goto NEXT(i); } __code cbc_getstdout(INTERP i){ if (MVM_is_null(i->tc, i->tc->instance->stdout_handle)) MVM_exception_throw_adhoc(i->tc, "STDOUT filehandle was never initialized"); - GET_REG(i->cur_op, 0).o = i->tc->instance->stdout_handle; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->stdout_handle; i->cur_op += 2; goto NEXT(i); } __code cbc_getstderr(INTERP i){ if (MVM_is_null(i->tc, i->tc->instance->stderr_handle)) MVM_exception_throw_adhoc(i->tc, "STDERR filehandle was never initialized"); - GET_REG(i->cur_op, 0).o = i->tc->instance->stderr_handle; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->stderr_handle; i->cur_op += 2; goto NEXT(i); } __code cbc_connect_sk(INTERP i){ - MVM_io_connect(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + MVM_io_connect(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_socket(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_socket_create(i->tc, GET_REG(i->cur_op, 2).i64); + GET_REG(i->cur_op, 0,i).o = MVM_io_socket_create(i->tc, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_getport_sk(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_getport(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_getport(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_bind_sk(INTERP i){ - MVM_io_bind(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, (int)GET_REG(i->cur_op, 6).i64); + MVM_io_bind(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, (int)GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_accept_sk(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_accept(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_accept(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } @@ -3909,257 +3909,257 @@ MVM_exception_throw_adhoc(i->tc, "NYI"); } __code cbc_print(INTERP i){ - MVM_string_print(i->tc, GET_REG(i->cur_op, 0).s); + MVM_string_print(i->tc, GET_REG(i->cur_op, 0,i).s); i->cur_op += 2; goto NEXT(i); } __code cbc_say(INTERP i){ - MVM_string_say(i->tc, GET_REG(i->cur_op, 0).s); + MVM_string_say(i->tc, GET_REG(i->cur_op, 0,i).s); i->cur_op += 2; goto NEXT(i); } __code cbc_tell_fh(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_tell(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_tell(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_stat(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_stat(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, 0); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_stat(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, 0); i->cur_op += 6; goto NEXT(i); } __code cbc_tryfindmeth(INTERP i){ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; MVMString *name = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)); i->cur_op += 8; MVM_6model_find_method(i->tc, obj, name, res, 0); goto NEXT(i); } __code cbc_tryfindmeth_s(INTERP i){ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMString *name = GET_REG(i->cur_op, 4).s; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMString *name = GET_REG(i->cur_op, 4,i).s; i->cur_op += 6; MVM_6model_find_method(i->tc, obj, name, res, 0); goto NEXT(i); } __code cbc_chdir(INTERP i){ - MVM_dir_chdir(i->tc, GET_REG(i->cur_op, 0).s); + MVM_dir_chdir(i->tc, GET_REG(i->cur_op, 0,i).s); i->cur_op += 2; goto NEXT(i); } __code cbc_srand(INTERP i){ - MVM_proc_seed(i->tc, GET_REG(i->cur_op, 0).i64); + MVM_proc_seed(i->tc, GET_REG(i->cur_op, 0,i).i64); i->cur_op += 2; goto NEXT(i); } __code cbc_rand_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_proc_rand_i(i->tc); + GET_REG(i->cur_op, 0,i).i64 = MVM_proc_rand_i(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_rand_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_proc_rand_n(i->tc); + GET_REG(i->cur_op, 0,i).n64 = MVM_proc_rand_n(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_time_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_proc_time_i(i->tc); + GET_REG(i->cur_op, 0,i).i64 = MVM_proc_time_i(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_sleep(INTERP i){ MVM_gc_mark_thread_blocked(i->tc); - MVM_platform_sleep(GET_REG(i->cur_op, 0).n64); + MVM_platform_sleep(GET_REG(i->cur_op, 0,i).n64); MVM_gc_mark_thread_unblocked(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_newthread(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_thread_new(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_thread_new(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_threadjoin(INTERP i){ - MVM_thread_join(i->tc, GET_REG(i->cur_op, 0).o); + MVM_thread_join(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_time_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_proc_time_n(i->tc); + GET_REG(i->cur_op, 0,i).n64 = MVM_proc_time_n(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_exit(INTERP i){ - MVMint64 exit_code = GET_REG(i->cur_op, 0).i64; + MVMint64 exit_code = GET_REG(i->cur_op, 0,i).i64; MVM_io_flush_standard_handles(i->tc); exit(exit_code); } __code cbc_cwd(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_dir_cwd(i->tc); + GET_REG(i->cur_op, 0,i).s = MVM_dir_cwd(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_clargs(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_proc_clargs(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_proc_clargs(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_getenvhash(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_proc_getenvhash(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_proc_getenvhash(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_loadlib(INTERP i){ - MVMString *name = GET_REG(i->cur_op, 0).s; - MVMString *path = GET_REG(i->cur_op, 2).s; + MVMString *name = GET_REG(i->cur_op, 0,i).s; + MVMString *path = GET_REG(i->cur_op, 2,i).s; MVM_dll_load(i->tc, name, path); i->cur_op += 4; goto NEXT(i); } __code cbc_freelib(INTERP i){ - MVMString *name = GET_REG(i->cur_op, 0).s; + MVMString *name = GET_REG(i->cur_op, 0,i).s; MVM_dll_free(i->tc, name); i->cur_op += 2; goto NEXT(i); } __code cbc_findsym(INTERP i){ - MVMString *lib = GET_REG(i->cur_op, 2).s; - MVMString *sym = GET_REG(i->cur_op, 4).s; + MVMString *lib = GET_REG(i->cur_op, 2,i).s; + MVMString *sym = GET_REG(i->cur_op, 4,i).s; MVMObject *obj = MVM_dll_find_symbol(i->tc, lib, sym); if (MVM_is_null(i->tc, obj)) MVM_exception_throw_adhoc(i->tc, "symbol not found in DLL"); - GET_REG(i->cur_op, 0).o = obj; + GET_REG(i->cur_op, 0,i).o = obj; i->cur_op += 6; goto NEXT(i); } __code cbc_dropsym(INTERP i){ - MVM_dll_drop_symbol(i->tc, GET_REG(i->cur_op, 0).o); + MVM_dll_drop_symbol(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_loadext(INTERP i){ - MVMString *lib = GET_REG(i->cur_op, 0).s; - MVMString *ext = GET_REG(i->cur_op, 2).s; + MVMString *lib = GET_REG(i->cur_op, 0,i).s; + MVMString *ext = GET_REG(i->cur_op, 2,i).s; MVM_ext_load(i->tc, lib, ext); i->cur_op += 4; goto NEXT(i); } __code cbc_backendconfig(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_backend_config(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_backend_config(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_getlexouter(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_frame_find_lexical_by_name_outer(i->tc, - GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).o = MVM_frame_find_lexical_by_name_outer(i->tc, + GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_getlexrel(INTERP i){ - MVMObject *ctx = GET_REG(i->cur_op, 2).o; + MVMObject *ctx = GET_REG(i->cur_op, 2,i).o; MVMRegister *r; if (REPR(ctx)->ID != MVM_REPR_ID_MVMContext || !IS_CONCRETE(ctx)) MVM_exception_throw_adhoc(i->tc, "getlexrel needs a context"); r = MVM_frame_find_lexical_by_name_rel(i->tc, - GET_REG(i->cur_op, 4).s, ((MVMContext *)ctx)->body.context); - GET_REG(i->cur_op, 0).o = r ? r->o : i->tc->instance->VMNull; + GET_REG(i->cur_op, 4,i).s, ((MVMContext *)ctx)->body.context); + GET_REG(i->cur_op, 0,i).o = r ? r->o : i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_getlexreldyn(INTERP i){ - MVMObject *ctx = GET_REG(i->cur_op, 2).o; + MVMObject *ctx = GET_REG(i->cur_op, 2,i).o; if (REPR(ctx)->ID != MVM_REPR_ID_MVMContext || !IS_CONCRETE(ctx)) MVM_exception_throw_adhoc(i->tc, "getlexreldyn needs a context"); - GET_REG(i->cur_op, 0).o = MVM_frame_getdynlex(i->tc, GET_REG(i->cur_op, 4).s, + GET_REG(i->cur_op, 0,i).o = MVM_frame_getdynlex(i->tc, GET_REG(i->cur_op, 4,i).s, ((MVMContext *)ctx)->body.context); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexrelcaller(INTERP i){ - MVMObject *ctx = GET_REG(i->cur_op, 2).o; + MVMObject *ctx = GET_REG(i->cur_op, 2,i).o; MVMRegister *res; if (REPR(ctx)->ID != MVM_REPR_ID_MVMContext || !IS_CONCRETE(ctx)) MVM_exception_throw_adhoc(i->tc, "getlexrelcaller needs a context"); - res = MVM_frame_find_lexical_by_name_rel_caller(i->tc, GET_REG(i->cur_op, 4).s, + res = MVM_frame_find_lexical_by_name_rel_caller(i->tc, GET_REG(i->cur_op, 4,i).s, ((MVMContext *)ctx)->body.context); - GET_REG(i->cur_op, 0).o = res ? res->o : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = res ? res->o : i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_getlexcaller(INTERP i){ MVMRegister *res = MVM_frame_find_lexical_by_name_rel_caller(i->tc, - GET_REG(i->cur_op, 2).s, i->tc->cur_frame->caller); - GET_REG(i->cur_op, 0).o = res ? res->o : i->tc->instance->VMNull; + GET_REG(i->cur_op, 2,i).s, i->tc->cur_frame->caller); + GET_REG(i->cur_op, 0,i).o = res ? res->o : i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_bitand_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_bitand(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_bitand(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_bitor_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_bitor(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_bitor(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_bitxor_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_bitxor(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_bitxor(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_isnanorinf(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_num_isnanorinf(i->tc, GET_REG(i->cur_op, 2).n64); + GET_REG(i->cur_op, 0,i).i64 = MVM_num_isnanorinf(i->tc, GET_REG(i->cur_op, 2,i).n64); i->cur_op += 4; goto NEXT(i); } __code cbc_inf(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_num_posinf(i->tc); + GET_REG(i->cur_op, 0,i).n64 = MVM_num_posinf(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_neginf(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_num_neginf(i->tc); + GET_REG(i->cur_op, 0,i).n64 = MVM_num_neginf(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_nan(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_num_nan(i->tc); + GET_REG(i->cur_op, 0,i).n64 = MVM_num_nan(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_getpid(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_proc_getpid(i->tc); + GET_REG(i->cur_op, 0,i).i64 = MVM_proc_getpid(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_filereadable(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_isreadable(i->tc, GET_REG(i->cur_op, 2).s,0); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_isreadable(i->tc, GET_REG(i->cur_op, 2,i).s,0); i->cur_op += 4; goto NEXT(i); } __code cbc_filewritable(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_iswritable(i->tc, GET_REG(i->cur_op, 2).s,0); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_iswritable(i->tc, GET_REG(i->cur_op, 2,i).s,0); i->cur_op += 4; goto NEXT(i); } __code cbc_fileexecutable(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_isexecutable(i->tc, GET_REG(i->cur_op, 2).s,0); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_isexecutable(i->tc, GET_REG(i->cur_op, 2,i).s,0); i->cur_op += 4; goto NEXT(i); } __code cbc_capturenamedshash(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(obj) && REPR(obj)->ID == MVM_REPR_ID_MVMCallCapture) { MVMCallCapture *cc = (MVMCallCapture *)obj; - GET_REG(i->cur_op, 0).o = MVM_args_slurpy_named(i->tc, cc->body.apc); + GET_REG(i->cur_op, 0,i).o = MVM_args_slurpy_named(i->tc, cc->body.apc); } else { MVM_exception_throw_adhoc(i->tc, "capturehasnameds needs a MVMCallCapture"); @@ -4168,108 +4168,108 @@ goto NEXT(i); } __code cbc_read_fhb(INTERP i){ - MVM_io_read_bytes(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64); + MVM_io_read_bytes(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_write_fhb(INTERP i){ - MVM_io_write_bytes(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).o); + MVM_io_write_bytes(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_replace(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_replace(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_replace(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).s); i->cur_op += 10; goto NEXT(i); } __code cbc_newexception(INTERP i){ - GET_REG(i->cur_op, 0).o = (MVMObject *)MVM_repr_alloc_init(i->tc, + GET_REG(i->cur_op, 0,i).o = (MVMObject *)MVM_repr_alloc_init(i->tc, i->tc->instance->boot_types.BOOTException); i->cur_op += 2; goto NEXT(i); } __code cbc_permit(INTERP i){ - MVM_io_eventloop_permit(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64, - GET_REG(i->cur_op, 4).i64); + MVM_io_eventloop_permit(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64, + GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_backtrace(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_exception_backtrace(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_exception_backtrace(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_symlink(INTERP i){ - MVM_file_symlink(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).s); + MVM_file_symlink(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_link(INTERP i){ - MVM_file_link(i->tc, GET_REG(i->cur_op, 0).s, GET_REG(i->cur_op, 2).s); + MVM_file_link(i->tc, GET_REG(i->cur_op, 0,i).s, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_gethostname(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_io_get_hostname(i->tc); + GET_REG(i->cur_op, 0,i).s = MVM_io_get_hostname(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_exreturnafterunwind(INTERP i){ - MVMObject *ex = GET_REG(i->cur_op, 0).o; + MVMObject *ex = GET_REG(i->cur_op, 0,i).o; MVM_exception_returnafterunwind(i->tc, ex); i->cur_op += 2; goto NEXT(i); } __code cbc_continuationreset(INTERP i){ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *tag = GET_REG(i->cur_op, 2).o; - MVMObject *code = GET_REG(i->cur_op, 4).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *tag = GET_REG(i->cur_op, 2,i).o; + MVMObject *code = GET_REG(i->cur_op, 4,i).o; i->cur_op += 6; MVM_continuation_reset(i->tc, tag, code, res); goto NEXT(i); } __code cbc_continuationcontrol(INTERP i){ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMint64 protect = GET_REG(i->cur_op, 2).i64; - MVMObject *tag = GET_REG(i->cur_op, 4).o; - MVMObject *code = GET_REG(i->cur_op, 6).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMint64 protect = GET_REG(i->cur_op, 2,i).i64; + MVMObject *tag = GET_REG(i->cur_op, 4,i).o; + MVMObject *code = GET_REG(i->cur_op, 6,i).o; i->cur_op += 8; MVM_continuation_control(i->tc, protect, tag, code, res); goto NEXT(i); } __code cbc_continuationinvoke(INTERP i){ - MVMRegister *res = &GET_REG(i->cur_op, 0); - MVMObject *cont = GET_REG(i->cur_op, 2).o; - MVMObject *code = GET_REG(i->cur_op, 4).o; + MVMRegister *res = &GET_REG(i->cur_op, 0,i); + MVMObject *cont = GET_REG(i->cur_op, 2,i).o; + MVMObject *code = GET_REG(i->cur_op, 4,i).o; i->cur_op += 6; MVM_continuation_invoke(i->tc, (MVMContinuation *)cont, code, res); goto NEXT(i); } __code cbc_randscale_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_proc_rand_n(i->tc) * GET_REG(i->cur_op, 2).n64; + GET_REG(i->cur_op, 0,i).n64 = MVM_proc_rand_n(i->tc) * GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } __code cbc_uniisblock(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)MVM_unicode_is_in_block(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).s); + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)MVM_unicode_is_in_block(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).s); i->cur_op += 8; goto NEXT(i); } __code cbc_assertparamcheck(INTERP i){ - MVMint64 ok = GET_REG(i->cur_op, 0).i64; + MVMint64 ok = GET_REG(i->cur_op, 0,i).i64; i->cur_op += 2; if (!ok) MVM_args_bind_failed(i->tc); goto NEXT(i); } __code cbc_hintfor(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = REPR(obj)->attr_funcs.hint_for(i->tc, + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = REPR(obj)->attr_funcs.hint_for(i->tc, STABLE(obj), obj, - GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } @@ -4280,60 +4280,60 @@ goto NEXT(i); } __code cbc_getuniname(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_unicode_get_name(i->tc, GET_REG(i->cur_op, 2).i64); + GET_REG(i->cur_op, 0,i).s = MVM_unicode_get_name(i->tc, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_getuniprop_int(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_unicode_codepoint_get_property_int(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_unicode_codepoint_get_property_int(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_getuniprop_bool(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_unicode_codepoint_get_property_bool(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_unicode_codepoint_get_property_bool(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_getuniprop_str(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_unicode_codepoint_get_property_str(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).s = MVM_unicode_codepoint_get_property_str(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_matchuniprop(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_unicode_codepoint_has_property_value(i->tc, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_unicode_codepoint_has_property_value(i->tc, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_nativecallbuild(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_nativecall_build(i->tc, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).s, GET_REG(i->cur_op, 8).s, - GET_REG(i->cur_op, 10).o, GET_REG(i->cur_op, 12).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_nativecall_build(i->tc, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).s, GET_REG(i->cur_op, 8,i).s, + GET_REG(i->cur_op, 10,i).o, GET_REG(i->cur_op, 12,i).o); i->cur_op += 14; goto NEXT(i); } __code cbc_nativecallinvoke(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativecall_invoke(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativecall_invoke(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_nativecallrefresh(INTERP i){ - MVM_nativecall_refresh(i->tc, GET_REG(i->cur_op, 0).o); + MVM_nativecall_refresh(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_threadrun(INTERP i){ - MVM_thread_run(i->tc, GET_REG(i->cur_op, 0).o); + MVM_thread_run(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_threadid(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_thread_id(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_thread_id(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } @@ -4342,22 +4342,22 @@ goto NEXT(i); } __code cbc_currentthread(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_thread_current(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_thread_current(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_lock(INTERP i){ - MVM_reentrantmutex_lock_checked(i->tc, GET_REG(i->cur_op, 0).o); + MVM_reentrantmutex_lock_checked(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_unlock(INTERP i){ - MVM_reentrantmutex_unlock_checked(i->tc, GET_REG(i->cur_op, 0).o); + MVM_reentrantmutex_unlock_checked(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_semacquire(INTERP i){ - MVMObject *sem = GET_REG(i->cur_op, 0).o; + MVMObject *sem = GET_REG(i->cur_op, 0,i).o; if (REPR(sem)->ID == MVM_REPR_ID_Semaphore && IS_CONCRETE(sem)) MVM_semaphore_acquire(i->tc, (MVMSemaphore *)sem); else @@ -4367,9 +4367,9 @@ goto NEXT(i); } __code cbc_semtryacquire(INTERP i){ - MVMObject *sem = GET_REG(i->cur_op, 2).o; + MVMObject *sem = GET_REG(i->cur_op, 2,i).o; if (REPR(sem)->ID == MVM_REPR_ID_Semaphore && IS_CONCRETE(sem)) - GET_REG(i->cur_op, 0).i64 = MVM_semaphore_tryacquire(i->tc, + GET_REG(i->cur_op, 0,i).i64 = MVM_semaphore_tryacquire(i->tc, (MVMSemaphore *)sem); else MVM_exception_throw_adhoc(i->tc, @@ -4378,7 +4378,7 @@ goto NEXT(i); } __code cbc_semrelease(INTERP i){ - MVMObject *sem = GET_REG(i->cur_op, 0).o; + MVMObject *sem = GET_REG(i->cur_op, 0,i).o; if (REPR(sem)->ID == MVM_REPR_ID_Semaphore && IS_CONCRETE(sem)) MVM_semaphore_release(i->tc, (MVMSemaphore *)sem); else @@ -4388,10 +4388,10 @@ goto NEXT(i); } __code cbc_getlockcondvar(INTERP i){ - MVMObject *lock = GET_REG(i->cur_op, 2).o; + MVMObject *lock = GET_REG(i->cur_op, 2,i).o; if (REPR(lock)->ID == MVM_REPR_ID_ReentrantMutex && IS_CONCRETE(lock)) - GET_REG(i->cur_op, 0).o = MVM_conditionvariable_from_lock(i->tc, - (MVMReentrantMutex *)lock, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_conditionvariable_from_lock(i->tc, + (MVMReentrantMutex *)lock, GET_REG(i->cur_op, 4,i).o); else MVM_exception_throw_adhoc(i->tc, "getlockcondvar requires a concrete object with REPR ReentrantMutex"); @@ -4399,7 +4399,7 @@ goto NEXT(i); } __code cbc_condwait(INTERP i){ - MVMObject *cv = GET_REG(i->cur_op, 0).o; + MVMObject *cv = GET_REG(i->cur_op, 0,i).o; if (REPR(cv)->ID == MVM_REPR_ID_ConditionVariable && IS_CONCRETE(cv)) MVM_conditionvariable_wait(i->tc, (MVMConditionVariable *)cv); else @@ -4409,7 +4409,7 @@ goto NEXT(i); } __code cbc_condsignalone(INTERP i){ - MVMObject *cv = GET_REG(i->cur_op, 0).o; + MVMObject *cv = GET_REG(i->cur_op, 0,i).o; if (REPR(cv)->ID == MVM_REPR_ID_ConditionVariable && IS_CONCRETE(cv)) MVM_conditionvariable_signal_one(i->tc, (MVMConditionVariable *)cv); else @@ -4419,7 +4419,7 @@ goto NEXT(i); } __code cbc_condsignalall(INTERP i){ - MVMObject *cv = GET_REG(i->cur_op, 0).o; + MVMObject *cv = GET_REG(i->cur_op, 0,i).o; if (REPR(cv)->ID == MVM_REPR_ID_ConditionVariable && IS_CONCRETE(cv)) MVM_conditionvariable_signal_all(i->tc, (MVMConditionVariable *)cv); else @@ -4429,9 +4429,9 @@ goto NEXT(i); } __code cbc_queuepoll(INTERP i){ - MVMObject *queue = GET_REG(i->cur_op, 2).o; + MVMObject *queue = GET_REG(i->cur_op, 2,i).o; if (REPR(queue)->ID == MVM_REPR_ID_ConcBlockingQueue && IS_CONCRETE(queue)) - GET_REG(i->cur_op, 0).o = MVM_concblockingqueue_poll(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_concblockingqueue_poll(i->tc, (MVMConcBlockingQueue *)queue); else MVM_exception_throw_adhoc(i->tc, @@ -4440,10 +4440,10 @@ goto NEXT(i); } __code cbc_setmultispec(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; - MVMObject *ch = GET_REG(i->cur_op, 2).o; - MVMString *valid_attr = GET_REG(i->cur_op, 4).s; - MVMString *cache_attr = GET_REG(i->cur_op, 6).s; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; + MVMObject *ch = GET_REG(i->cur_op, 2,i).o; + MVMString *valid_attr = GET_REG(i->cur_op, 4,i).s; + MVMString *cache_attr = GET_REG(i->cur_op, 6,i).s; MVMSTable *st = STABLE(obj); MVMInvocationSpec *is = st->invocation_spec; if (!is) @@ -4460,7 +4460,7 @@ goto NEXT(i); } __code cbc_ctxouterskipthunks(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o; MVMFrame *frame; if (!IS_CONCRETE(this_ctx) || REPR(this_ctx)->ID != MVM_REPR_ID_MVMContext) { MVM_exception_throw_adhoc(i->tc, "ctxouter needs an MVMContext"); @@ -4469,14 +4469,14 @@ while (frame && frame->static_info->body.is_thunk) frame = frame->caller; if (frame) - GET_REG(i->cur_op, 0).o = MVM_frame_context_wrapper(i->tc, frame); + GET_REG(i->cur_op, 0,i).o = MVM_frame_context_wrapper(i->tc, frame); else - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_ctxcallerskipthunks(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o, *ctx = NULL; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o, *ctx = NULL; MVMFrame *frame; if (!IS_CONCRETE(this_ctx) || REPR(this_ctx)->ID != MVM_REPR_ID_MVMContext) { MVM_exception_throw_adhoc(i->tc, "ctxcaller needs an MVMContext"); @@ -4486,108 +4486,108 @@ frame = frame->caller; if (frame) ctx = MVM_frame_context_wrapper(i->tc, frame); - GET_REG(i->cur_op, 0).o = ctx ? ctx : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = ctx ? ctx : i->tc->instance->VMNull; i->cur_op += 4; goto NEXT(i); } __code cbc_timer(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_timer_create(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).i64, - GET_REG(i->cur_op, 8).i64, GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_timer_create(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).i64, + GET_REG(i->cur_op, 8,i).i64, GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_cancel(INTERP i){ - MVM_io_eventloop_cancel_work(i->tc, GET_REG(i->cur_op, 0).o, NULL, NULL); + MVM_io_eventloop_cancel_work(i->tc, GET_REG(i->cur_op, 0,i).o, NULL, NULL); i->cur_op += 2; goto NEXT(i); } __code cbc_signal(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_signal_handle(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_signal_handle(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).o); i->cur_op += 10; goto NEXT(i); } __code cbc_watchfile(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_file_wai->tch(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, GET_REG(i->cur_op, 8).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_file_wai->tch(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, GET_REG(i->cur_op, 8,i).o); i->cur_op += 10; goto NEXT(i); } __code cbc_asyncconnect(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_socket_connect_async(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - GET_REG(i->cur_op, 8).i64, GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_socket_connect_async(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + GET_REG(i->cur_op, 8,i).i64, GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_asynclisten(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_socket_listen_async(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - GET_REG(i->cur_op, 8).i64, (int)GET_REG(i->cur_op, 10).i64, GET_REG(i->cur_op, 12).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_socket_listen_async(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + GET_REG(i->cur_op, 8,i).i64, (int)GET_REG(i->cur_op, 10,i).i64, GET_REG(i->cur_op, 12,i).o); i->cur_op += 14; goto NEXT(i); } __code cbc_asyncwritebytes(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_write_bytes_async(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o, - GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_write_bytes_async(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o, + GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_asyncreadbytes(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_read_bytes_async(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o, - GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_read_bytes_async(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o, + GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_getlexstatic_o(INTERP i){ MVMRegister *found = MVM_frame_find_lexical_by_name(i->tc, - GET_REG(i->cur_op, 2).s, MVM_reg_obj); + GET_REG(i->cur_op, 2,i).s, MVM_reg_obj); if (found) { - GET_REG(i->cur_op, 0).o = found->o; + GET_REG(i->cur_op, 0,i).o = found->o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_static(i->tc, found->o); } else { - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; } i->cur_op += 4; goto NEXT(i); } __code cbc_getlexperinvtype_o(INTERP i){ MVMRegister *found = MVM_frame_find_lexical_by_name(i->tc, - GET_REG(i->cur_op, 2).s, MVM_reg_obj); + GET_REG(i->cur_op, 2,i).s, MVM_reg_obj); if (found) { - GET_REG(i->cur_op, 0).o = found->o; + GET_REG(i->cur_op, 0,i).o = found->o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_type(i->tc, found->o); } else { - GET_REG(i->cur_op, 0).o = i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = i->tc->instance->VMNull; } i->cur_op += 4; goto NEXT(i); } __code cbc_execname(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_executable_name(i->tc); + GET_REG(i->cur_op, 0,i).s = MVM_executable_name(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_const_i64_16(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_I16(i->cur_op, 2); + GET_REG(i->cur_op, 0,i).i64 = GET_I16(i->cur_op, 2); i->cur_op += 4; goto NEXT(i); } __code cbc_const_i64_32(INTERP i){ - GET_REG(i->cur_op, 0).i64 = GET_I32(i->cur_op, 2); + GET_REG(i->cur_op, 0,i).i64 = GET_I32(i->cur_op, 2); i->cur_op += 6; goto NEXT(i); } __code cbc_isnonnull(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).i64 = !MVM_is_null(i->tc, obj); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).i64 = !MVM_is_null(i->tc, obj); i->cur_op += 4; goto NEXT(i); } @@ -4595,9 +4595,9 @@ MVMArgInfo param = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) - GET_REG(i->cur_op, 0).i64 = param.arg.i64; + GET_REG(i->cur_op, 0,i).i64 = param.arg.i64; else - GET_REG(i->cur_op, 0).i64 = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).i64 = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_REQUIRED).arg.i64; i->cur_op += 10; goto NEXT(i); @@ -4606,9 +4606,9 @@ MVMArgInfo param = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) - GET_REG(i->cur_op, 0).n64 = param.arg.n64; + GET_REG(i->cur_op, 0,i).n64 = param.arg.n64; else - GET_REG(i->cur_op, 0).n64 = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).n64 = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_REQUIRED).arg.n64; i->cur_op += 10; goto NEXT(i); @@ -4617,9 +4617,9 @@ MVMArgInfo param = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) - GET_REG(i->cur_op, 0).s = param.arg.s; + GET_REG(i->cur_op, 0,i).s = param.arg.s; else - GET_REG(i->cur_op, 0).s = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).s = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_REQUIRED).arg.s; i->cur_op += 10; goto NEXT(i); @@ -4630,7 +4630,7 @@ if (!param.exists) param = MVM_args_get_named_obj(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_REQUIRED); - GET_REG(i->cur_op, 0).o = param.arg.o; + GET_REG(i->cur_op, 0,i).o = param.arg.o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, param.arg_idx, param.arg.o); i->cur_op += 10; @@ -4643,7 +4643,7 @@ param = MVM_args_get_named_int(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).i64 = param.arg.i64; + GET_REG(i->cur_op, 0,i).i64 = param.arg.i64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 10); } else { @@ -4658,7 +4658,7 @@ param = MVM_args_get_named_num(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).n64 = param.arg.n64; + GET_REG(i->cur_op, 0,i).n64 = param.arg.n64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 10); } else { @@ -4673,7 +4673,7 @@ param = MVM_args_get_named_str(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).s = param.arg.s; + GET_REG(i->cur_op, 0,i).s = param.arg.s; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 10); } else { @@ -4688,7 +4688,7 @@ param = MVM_args_get_named_obj(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).o = param.arg.o; + GET_REG(i->cur_op, 0,i).o = param.arg.o; if (MVM_spesh_log_is_logging(i->tc)) MVM_spesh_log_parameter(i->tc, param.arg_idx, param.arg.o); i->cur_op = bytecode_start + GET_UI32(i->cur_op, 10); @@ -4705,40 +4705,40 @@ goto NEXT(i); } __code cbc_nativecallcast(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativecall_cast(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativecall_cast(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_spawnprocasync(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_proc_spawn_async(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - GET_REG(i->cur_op, 8).o, GET_REG(i->cur_op, 10).o); + GET_REG(i->cur_op, 0,i).o = MVM_proc_spawn_async(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + GET_REG(i->cur_op, 8,i).o, GET_REG(i->cur_op, 10,i).o); i->cur_op += 12; goto NEXT(i); } __code cbc_killprocasync(INTERP i){ - MVM_proc_kill_async(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64); + MVM_proc_kill_async(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } __code cbc_startprofile(INTERP i){ - MVM_profile_start(i->tc, GET_REG(i->cur_op, 0).o); + MVM_profile_start(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_endprofile(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_profile_end(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_profile_end(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_objectid(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)MVM_gc_object_id(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)MVM_gc_object_id(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_settypefinalize(INTERP i){ - MVM_gc_finalize_set(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).i64); + MVM_gc_finalize_set(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } @@ -4747,219 +4747,219 @@ goto NEXT(i); } __code cbc_nativecallglobal(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativecall_global(i->tc, GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativecall_global(i->tc, GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o); i->cur_op += 10; goto NEXT(i); } __code cbc_setparameterizer(INTERP i){ - MVM_6model_parametric_setup(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).o); + MVM_6model_parametric_setup(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_parameterizetype(INTERP i){ - MVMObject *type = GET_REG(i->cur_op, 2).o; - MVMObject *params = GET_REG(i->cur_op, 4).o; - MVMRegister *result = &(GET_REG(i->cur_op, 0)); + MVMObject *type = GET_REG(i->cur_op, 2,i).o; + MVMObject *params = GET_REG(i->cur_op, 4,i).o; + MVMRegister *result = &(GET_REG(i->cur_op, 0,i)); i->cur_op += 6; MVM_6model_parametric_parameterize(i->tc, type, params, result); goto NEXT(i); } __code cbc_typeparameterized(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_6model_parametric_type_parameterized(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_6model_parametric_type_parameterized(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_typeparameters(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_6model_parametric_type_parameters(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_6model_parametric_type_parameters(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_typeparameterat(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_6model_parametric_type_parameter_at(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_6model_parametric_type_parameter_at(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_readlink(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_file_readlink(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_file_readlink(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_lstat(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_file_stat(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, 1); + GET_REG(i->cur_op, 0,i).i64 = MVM_file_stat(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, 1); i->cur_op += 6; goto NEXT(i); } __code cbc_iscont_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_iscont_i(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_iscont_i(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_iscont_n(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_iscont_n(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_iscont_n(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_iscont_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_iscont_s(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_iscont_s(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_assign_i(INTERP i){ - MVMObject *cont = GET_REG(i->cur_op, 0).o; - MVMint64 value = GET_REG(i->cur_op, 2).i64; + MVMObject *cont = GET_REG(i->cur_op, 0,i).o; + MVMint64 value = GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; MVM_6model_container_assign_i(i->tc, cont, value); goto NEXT(i); } __code cbc_assign_n(INTERP i){ - MVMObject *cont = GET_REG(i->cur_op, 0).o; - MVMnum64 value = GET_REG(i->cur_op, 2).n64; + MVMObject *cont = GET_REG(i->cur_op, 0,i).o; + MVMnum64 value = GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; MVM_6model_container_assign_n(i->tc, cont, value); goto NEXT(i); } __code cbc_assign_s(INTERP i){ - MVMObject *cont = GET_REG(i->cur_op, 0).o; - MVMString *value = GET_REG(i->cur_op, 2).s; + MVMObject *cont = GET_REG(i->cur_op, 0,i).o; + MVMString *value = GET_REG(i->cur_op, 2,i).s; i->cur_op += 4; MVM_6model_container_assign_s(i->tc, cont, value); goto NEXT(i); } __code cbc_decont_i(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_6model_container_decont_i(i->tc, obj, r); goto NEXT(i); } __code cbc_decont_n(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_6model_container_decont_n(i->tc, obj, r); goto NEXT(i); } __code cbc_decont_s(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_6model_container_decont_s(i->tc, obj, r); goto NEXT(i); } __code cbc_getrusage(INTERP i){ - MVM_proc_getrusage(i->tc, GET_REG(i->cur_op, 0).o); + MVM_proc_getrusage(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_threadlockcount(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_thread_lock_count(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_thread_lock_count(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_getlexref_i(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_i(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_i(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_n(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_n(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_n(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_s(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_s(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_s(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_ni(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_name_i(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_name_i(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2))); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_nn(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_name_n(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_name_n(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2))); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_ns(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_name_s(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_name_s(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2))); i->cur_op += 6; goto NEXT(i); } __code cbc_atposref_i(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_pos_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_pos_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_atposref_n(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_pos_n(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_pos_n(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_atposref_s(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_pos_s(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_pos_s(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_getattrref_i(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6))); i->cur_op += 12; goto NEXT(i); } __code cbc_getattrref_n(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_n(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_n(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6))); i->cur_op += 12; goto NEXT(i); } __code cbc_getattrref_s(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_s(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_s(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6))); i->cur_op += 12; goto NEXT(i); } __code cbc_getattrsref_i(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, - GET_REG(i->cur_op, 6).s); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, + GET_REG(i->cur_op, 6,i).s); i->cur_op += 8; goto NEXT(i); } __code cbc_getattrsref_n(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_n(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, - GET_REG(i->cur_op, 6).s); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_n(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, + GET_REG(i->cur_op, 6,i).s); i->cur_op += 8; goto NEXT(i); } __code cbc_getattrsref_s(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_attr_s(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, - GET_REG(i->cur_op, 6).s); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_attr_s(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, + GET_REG(i->cur_op, 6,i).s); i->cur_op += 8; goto NEXT(i); } __code cbc_nativecallsizeof(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_nativecall_sizeof(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_nativecall_sizeof(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } @@ -4967,223 +4967,223 @@ MVM_exception_throw_adhoc(i->tc, "NYI"); } __code cbc_normalizecodes(INTERP i){ - MVM_unicode_normalize_codepoints(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 4).o, - MVM_unicode_normalizer_form(i->tc, GET_REG(i->cur_op, 2).i64)); + MVM_unicode_normalize_codepoints(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 4,i).o, + MVM_unicode_normalizer_form(i->tc, GET_REG(i->cur_op, 2,i).i64)); i->cur_op += 6; goto NEXT(i); } __code cbc_strfromcodes(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_unicode_codepoints_to_nfg_string(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).s = MVM_unicode_codepoints_to_nfg_string(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_strtocodes(INTERP i){ - MVM_unicode_string_to_codepoints(i->tc, GET_REG(i->cur_op, 0).s, - MVM_unicode_normalizer_form(i->tc, GET_REG(i->cur_op, 2).i64), - GET_REG(i->cur_op, 4).o); + MVM_unicode_string_to_codepoints(i->tc, GET_REG(i->cur_op, 0,i).s, + MVM_unicode_normalizer_form(i->tc, GET_REG(i->cur_op, 2,i).i64), + GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_getcodelocation(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_code_location(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_code_location(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_eqatim_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_equal_at_ignore_mark(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_equal_at_ignore_mark(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_ordbaseat(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_ord_basechar_at(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_ord_basechar_at(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_neverrepossess(INTERP i){ - MVM_6model_never_repossess(i->tc, GET_REG(i->cur_op, 0).o); + MVM_6model_never_repossess(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_scdisclaim(INTERP i){ - MVM_sc_disclaim(i->tc, (MVMSerializationContext *)GET_REG(i->cur_op, 0).o); + MVM_sc_disclaim(i->tc, (MVMSerializationContext *)GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_atpos2d_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_repr_at_pos_2d_i(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_repr_at_pos_2d_i(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_atpos2d_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_repr_at_pos_2d_n(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).n64 = MVM_repr_at_pos_2d_n(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_atpos2d_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_repr_at_pos_2d_s(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).s = MVM_repr_at_pos_2d_s(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_atpos2d_o(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_repr_at_pos_2d_o(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).o = MVM_repr_at_pos_2d_o(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_atpos3d_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_repr_at_pos_3d_i(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_repr_at_pos_3d_i(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_atpos3d_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_repr_at_pos_3d_n(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).n64 = MVM_repr_at_pos_3d_n(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_atpos3d_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_repr_at_pos_3d_s(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).s = MVM_repr_at_pos_3d_s(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_atpos3d_o(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_repr_at_pos_3d_o(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).o = MVM_repr_at_pos_3d_o(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_atposnd_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_repr_at_pos_multidim_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_repr_at_pos_multidim_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_atposnd_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_repr_at_pos_multidim_n(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).n64 = MVM_repr_at_pos_multidim_n(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_atposnd_s(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_repr_at_pos_multidim_s(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).s = MVM_repr_at_pos_multidim_s(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_atposnd_o(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_repr_at_pos_multidim_o(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_repr_at_pos_multidim_o(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_bindpos2d_i(INTERP i){ - MVM_repr_bind_pos_2d_i(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64); + MVM_repr_bind_pos_2d_i(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_bindpos2d_n(INTERP i){ - MVM_repr_bind_pos_2d_n(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).n64); + MVM_repr_bind_pos_2d_n(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).n64); i->cur_op += 8; goto NEXT(i); } __code cbc_bindpos2d_s(INTERP i){ - MVM_repr_bind_pos_2d_s(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).s); + MVM_repr_bind_pos_2d_s(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).s); i->cur_op += 8; goto NEXT(i); } __code cbc_bindpos2d_o(INTERP i){ - MVM_repr_bind_pos_2d_o(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).o); + MVM_repr_bind_pos_2d_o(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).o); i->cur_op += 8; goto NEXT(i); } __code cbc_bindpos3d_i(INTERP i){ - MVM_repr_bind_pos_3d_i(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).i64); + MVM_repr_bind_pos_3d_i(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_bindpos3d_n(INTERP i){ - MVM_repr_bind_pos_3d_n(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).n64); + MVM_repr_bind_pos_3d_n(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).n64); i->cur_op += 10; goto NEXT(i); } __code cbc_bindpos3d_s(INTERP i){ - MVM_repr_bind_pos_3d_s(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).s); + MVM_repr_bind_pos_3d_s(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).s); i->cur_op += 10; goto NEXT(i); } __code cbc_bindpos3d_o(INTERP i){ - MVM_repr_bind_pos_3d_o(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64, GET_REG(i->cur_op, 8).o); + MVM_repr_bind_pos_3d_o(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64, GET_REG(i->cur_op, 8,i).o); i->cur_op += 10; goto NEXT(i); } __code cbc_bindposnd_i(INTERP i){ - MVM_repr_bind_pos_multidim_i(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + MVM_repr_bind_pos_multidim_i(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_bindposnd_n(INTERP i){ - MVM_repr_bind_pos_multidim_n(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).n64); + MVM_repr_bind_pos_multidim_n(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).n64); i->cur_op += 6; goto NEXT(i); } __code cbc_bindposnd_s(INTERP i){ - MVM_repr_bind_pos_multidim_s(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s); + MVM_repr_bind_pos_multidim_s(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_bindposnd_o(INTERP i){ - MVM_repr_bind_pos_multidim_o(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVM_repr_bind_pos_multidim_o(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_dimensions(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_repr_dimensions(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_repr_dimensions(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_setdimensions(INTERP i){ - MVM_repr_set_dimensions(i->tc, GET_REG(i->cur_op, 0).o, GET_REG(i->cur_op, 2).o); + MVM_repr_set_dimensions(i->tc, GET_REG(i->cur_op, 0,i).o, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_numdimensions(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_repr_num_dimensions(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_repr_num_dimensions(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_ctxcode(INTERP i){ - MVMObject *this_ctx = GET_REG(i->cur_op, 2).o; + MVMObject *this_ctx = GET_REG(i->cur_op, 2,i).o; if (IS_CONCRETE(this_ctx) && REPR(this_ctx)->ID == MVM_REPR_ID_MVMContext) { MVMObject *code_obj = ((MVMContext *)this_ctx)->body.context->code_ref; - GET_REG(i->cur_op, 0).o = code_obj ? code_obj : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = code_obj ? code_obj : i->tc->instance->VMNull; i->cur_op += 4; } else { @@ -5192,90 +5192,90 @@ goto NEXT(i); } __code cbc_isrwcont(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; MVMint64 is_rw = 0; if (!MVM_is_null(i->tc, obj)) { const MVMContainerSpec *cs = STABLE(obj)->container_spec; is_rw = cs && cs->can_store(i->tc, obj); } - GET_REG(i->cur_op, 0).i64 = is_rw; + GET_REG(i->cur_op, 0,i).i64 = is_rw; i->cur_op += 4; goto NEXT(i); } __code cbc_fc(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_fc(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_fc(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_encoderep(INTERP i){ - GET_REG(i->cur_op, 8).o = MVM_string_encode_to_buf(i->tc, GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 8).o, GET_REG(i->cur_op, 6).s); + GET_REG(i->cur_op, 8,i).o = MVM_string_encode_to_buf(i->tc, GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 8,i).o, GET_REG(i->cur_op, 6,i).s); i->cur_op += 10; goto NEXT(i); } __code cbc_istty_fh(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_is_tty(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_is_tty(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_multidimref_i(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_multidim_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_multidim_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_multidimref_n(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_multidim_n(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_multidim_n(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_multidimref_s(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_multidim_s(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_multidim_s(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_fileno_fh(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_io_fileno(i->tc, GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_io_fileno(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_asyncudp(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_socket_udp_async(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).s, - GET_REG(i->cur_op, 8).i64, GET_REG(i->cur_op, 10).i64, - GET_REG(i->cur_op, 12).o); + GET_REG(i->cur_op, 0,i).o = MVM_io_socket_udp_async(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).s, + GET_REG(i->cur_op, 8,i).i64, GET_REG(i->cur_op, 10,i).i64, + GET_REG(i->cur_op, 12,i).o); i->cur_op += 14; goto NEXT(i); } __code cbc_asyncwritebytesto(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_write_bytes_to_async(i->tc, GET_REG(i->cur_op, 2).o, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).o, GET_REG(i->cur_op, 8).o, - GET_REG(i->cur_op, 10).o, GET_REG(i->cur_op, 12).s, GET_REG(i->cur_op, 14).i64); + GET_REG(i->cur_op, 0,i).o = MVM_io_write_bytes_to_async(i->tc, GET_REG(i->cur_op, 2,i).o, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).o, GET_REG(i->cur_op, 8,i).o, + GET_REG(i->cur_op, 10,i).o, GET_REG(i->cur_op, 12,i).s, GET_REG(i->cur_op, 14,i).i64); i->cur_op += 16; goto NEXT(i); } __code cbc_objprimbits(INTERP i){ - MVMObject *type = GET_REG(i->cur_op, 2).o; + MVMObject *type = GET_REG(i->cur_op, 2,i).o; if (type) { const MVMStorageSpec *ss = REPR(type)->get_storage_spec(i->tc, STABLE(type)); - GET_REG(i->cur_op, 0).i64 = ss->boxed_primitive ? ss->bits : 0; + GET_REG(i->cur_op, 0,i).i64 = ss->boxed_primitive ? ss->bits : 0; } else { - GET_REG(i->cur_op, 0).i64 = 0; + GET_REG(i->cur_op, 0,i).i64 = 0; } i->cur_op += 4; goto NEXT(i); } __code cbc_objprimunsigned(INTERP i){ - MVMObject *type = GET_REG(i->cur_op, 2).o; + MVMObject *type = GET_REG(i->cur_op, 2,i).o; if (type) { const MVMStorageSpec *ss = REPR(type)->get_storage_spec(i->tc, STABLE(type)); - GET_REG(i->cur_op, 0).i64 = ss->boxed_primitive == 1 ? ss->is_unsigned : 0; + GET_REG(i->cur_op, 0,i).i64 = ss->boxed_primitive == 1 ? ss->is_unsigned : 0; } else { - GET_REG(i->cur_op, 0).i64 = 0; + GET_REG(i->cur_op, 0,i).i64 = 0; } i->cur_op += 4; goto NEXT(i); @@ -5287,55 +5287,55 @@ goto cbc_getlexref_i8(i); } __code cbc_getlexref_i8(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_i(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_i(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_getlexref_n32(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_n(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_n(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_box_u(INTERP i){ - MVM_box_uint(i->tc, GET_REG(i->cur_op, 2).u64, GET_REG(i->cur_op, 4).o, - &GET_REG(i->cur_op, 0)); + MVM_box_uint(i->tc, GET_REG(i->cur_op, 2,i).u64, GET_REG(i->cur_op, 4,i).o, + &GET_REG(i->cur_op, 0,i)); i->cur_op += 6; goto NEXT(i); } __code cbc_unbox_u(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; if (!IS_CONCRETE(obj)) MVM_exception_throw_adhoc(i->tc, "Cannot unbox a type object"); - GET_REG(i->cur_op, 0).u64 = REPR(obj)->box_funcs.get_uint(i->tc, + GET_REG(i->cur_op, 0,i).u64 = REPR(obj)->box_funcs.get_uint(i->tc, STABLE(obj), obj, OBJECT_BODY(obj)); i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_iu(INTERP i){ - GET_REG(i->cur_op, 0).u64 = (MVMuint64)GET_REG(i->cur_op, 2).i64; + GET_REG(i->cur_op, 0,i).u64 = (MVMuint64)GET_REG(i->cur_op, 2,i).i64; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_ui(INTERP i){ - GET_REG(i->cur_op, 0).i64 = (MVMint64)GET_REG(i->cur_op, 2).u64; + GET_REG(i->cur_op, 0,i).i64 = (MVMint64)GET_REG(i->cur_op, 2,i).u64; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_nu(INTERP i){ - GET_REG(i->cur_op, 0).u64 = (MVMuint64)GET_REG(i->cur_op, 2).n64; + GET_REG(i->cur_op, 0,i).u64 = (MVMuint64)GET_REG(i->cur_op, 2,i).n64; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_un(INTERP i){ - GET_REG(i->cur_op, 0).n64 = (MVMnum64)GET_REG(i->cur_op, 2).u64; + GET_REG(i->cur_op, 0,i).n64 = (MVMnum64)GET_REG(i->cur_op, 2,i).u64; i->cur_op += 4; goto NEXT(i); } __code cbc_decont_u(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; MVM_6model_container_decont_u(i->tc, obj, r); goto NEXT(i); @@ -5351,13 +5351,13 @@ } __code cbc_getlexref_u8(INTERP i){ /* XXX Cheat should have a _u here. */ - GET_REG(i->cur_op, 0).o = MVM_nativeref_lex_i(i->tc, + GET_REG(i->cur_op, 0,i).o = MVM_nativeref_lex_i(i->tc, GET_UI16(i->cur_op, 4), GET_UI16(i->cur_op, 2)); i->cur_op += 6; goto NEXT(i); } __code cbc_param_rp_u(INTERP i){ - GET_REG(i->cur_op, 0).u64 = MVM_args_get_pos_uint(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).u64 = MVM_args_get_pos_uint(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2), MVM_ARG_REQUIRED).arg.u64; i->cur_op += 4; goto NEXT(i); @@ -5366,7 +5366,7 @@ MVMArgInfo param = MVM_args_get_pos_uint(i->tc, &i->tc->cur_frame->params, GET_UI16(i->cur_op, 2), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).u64 = param.arg.u64; + GET_REG(i->cur_op, 0,i).u64 = param.arg.u64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 4); } else { @@ -5375,7 +5375,7 @@ goto NEXT(i); } __code cbc_param_rn_u(INTERP i){ - GET_REG(i->cur_op, 0).u64 = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).u64 = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_REQUIRED).arg.u64; i->cur_op += 6; goto NEXT(i); @@ -5384,7 +5384,7 @@ MVMArgInfo param = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).u64 = param.arg.u64; + GET_REG(i->cur_op, 0,i).u64 = param.arg.u64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 6); } else { @@ -5396,9 +5396,9 @@ MVMArgInfo param = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_ARG_OPTIONAL); if (param.exists) - GET_REG(i->cur_op, 0).u64 = param.arg.u64; + GET_REG(i->cur_op, 0,i).u64 = param.arg.u64; else - GET_REG(i->cur_op, 0).u64 = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, + GET_REG(i->cur_op, 0,i).u64 = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_REQUIRED).arg.u64; i->cur_op += 10; goto NEXT(i); @@ -5410,7 +5410,7 @@ param = MVM_args_get_named_uint(i->tc, &i->tc->cur_frame->params, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 6)), MVM_ARG_OPTIONAL); if (param.exists) { - GET_REG(i->cur_op, 0).u64 = param.arg.u64; + GET_REG(i->cur_op, 0,i).u64 = param.arg.u64; i->cur_op = bytecode_start + GET_UI32(i->cur_op, 10); } else { @@ -5419,19 +5419,19 @@ goto NEXT(i); } __code cbc_stat_time(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_file_time(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, 0); + GET_REG(i->cur_op, 0,i).n64 = MVM_file_time(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, 0); i->cur_op += 6; goto NEXT(i); } __code cbc_lstat_time(INTERP i){ - GET_REG(i->cur_op, 0).n64 = MVM_file_time(i->tc, GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).i64, 1); + GET_REG(i->cur_op, 0,i).n64 = MVM_file_time(i->tc, GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).i64, 1); i->cur_op += 6; goto NEXT(i); } __code cbc_setdebugtypename(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; - if (MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2).s)) { - char *debugname = MVM_string_utf8_encode_C_string(i->tc, GET_REG(i->cur_op, 2).s); + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; + if (MVM_string_graphs(i->tc, GET_REG(i->cur_op, 2,i).s)) { + char *debugname = MVM_string_utf8_encode_C_string(i->tc, GET_REG(i->cur_op, 2,i).s); if (STABLE(obj)->debug_name) { MVM_free(STABLE(obj)->debug_name); } @@ -5443,125 +5443,125 @@ goto NEXT(i); } __code cbc_throwpayloadlex(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); MVMuint32 cat = (MVMuint32)MVM_BC_get_I64(i->cur_op, 2); - MVMObject *payload = GET_REG(i->cur_op, 10).o; + MVMObject *payload = GET_REG(i->cur_op, 10,i).o; i->cur_op += 12; MVM_exception_throwpayload(i->tc, MVM_EX_THROW_LEX, cat, payload, rr); goto NEXT(i); } __code cbc_throwpayloadlexcaller(INTERP i){ - MVMRegister *rr = &GET_REG(i->cur_op, 0); + MVMRegister *rr = &GET_REG(i->cur_op, 0,i); MVMuint32 cat = (MVMuint32)MVM_BC_get_I64(i->cur_op, 2); - MVMObject *payload = GET_REG(i->cur_op, 10).o; + MVMObject *payload = GET_REG(i->cur_op, 10,i).o; i->cur_op += 12; MVM_exception_throwpayload(i->tc, MVM_EX_THROW_LEX_CALLER, cat, payload, rr); goto NEXT(i); } __code cbc_lastexpayload(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->last_payload; + GET_REG(i->cur_op, 0,i).o = i->tc->last_payload; i->cur_op += 2; goto NEXT(i); } __code cbc_cancelnotify(INTERP i){ - MVM_io_eventloop_cancel_work(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); + MVM_io_eventloop_cancel_work(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_decoderconfigure(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 0).o; + MVMObject *decoder = GET_REG(i->cur_op, 0,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decoderconfigure"); MVM_decoder_configure(i->tc, (MVMDecoder *)decoder, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).o); + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_decodersetlineseps(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 0).o; + MVMObject *decoder = GET_REG(i->cur_op, 0,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodersetlineseps"); - MVM_decoder_set_separators(i->tc, (MVMDecoder *)decoder, GET_REG(i->cur_op, 2).o); + MVM_decoder_set_separators(i->tc, (MVMDecoder *)decoder, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_decoderaddbytes(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 0).o; + MVMObject *decoder = GET_REG(i->cur_op, 0,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decoderaddbytes"); - MVM_decoder_add_bytes(i->tc, (MVMDecoder *)decoder, GET_REG(i->cur_op, 2).o); + MVM_decoder_add_bytes(i->tc, (MVMDecoder *)decoder, GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_decodertakechars(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakechars"); - GET_REG(i->cur_op, 0).s = MVM_decoder_take_chars(i->tc, (MVMDecoder *)decoder, - GET_REG(i->cur_op, 4).i64, 0); + GET_REG(i->cur_op, 0,i).s = MVM_decoder_take_chars(i->tc, (MVMDecoder *)decoder, + GET_REG(i->cur_op, 4,i).i64, 0); i->cur_op += 6; goto NEXT(i); } __code cbc_indexim_s(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_string_index_ignore_mark(i->tc, - GET_REG(i->cur_op, 2).s, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_string_index_ignore_mark(i->tc, + GET_REG(i->cur_op, 2,i).s, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_decodertakeallchars(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakeallchars"); - GET_REG(i->cur_op, 0).s = MVM_decoder_take_all_chars(i->tc, (MVMDecoder *)decoder); + GET_REG(i->cur_op, 0,i).s = MVM_decoder_take_all_chars(i->tc, (MVMDecoder *)decoder); i->cur_op += 4; goto NEXT(i); } __code cbc_decodertakeavailablechars(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakeavailablechars"); - GET_REG(i->cur_op, 0).s = MVM_decoder_take_available_chars(i->tc, (MVMDecoder *)decoder); + GET_REG(i->cur_op, 0,i).s = MVM_decoder_take_available_chars(i->tc, (MVMDecoder *)decoder); i->cur_op += 4; goto NEXT(i); } __code cbc_decodertakeline(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakeline"); - GET_REG(i->cur_op, 0).s = MVM_decoder_take_line(i->tc, (MVMDecoder *)decoder, - GET_REG(i->cur_op, 4).i64, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).s = MVM_decoder_take_line(i->tc, (MVMDecoder *)decoder, + GET_REG(i->cur_op, 4,i).i64, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_decoderbytesavailable(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decoderbytesavailable"); - GET_REG(i->cur_op, 0).i64 = MVM_decoder_bytes_available(i->tc, (MVMDecoder *)decoder); + GET_REG(i->cur_op, 0,i).i64 = MVM_decoder_bytes_available(i->tc, (MVMDecoder *)decoder); i->cur_op += 4; goto NEXT(i); } __code cbc_decodertakebytes(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakebytes"); - GET_REG(i->cur_op, 0).o = MVM_decoder_take_bytes(i->tc, (MVMDecoder *)decoder, - GET_REG(i->cur_op, 4).o, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).o = MVM_decoder_take_bytes(i->tc, (MVMDecoder *)decoder, + GET_REG(i->cur_op, 4,i).o, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_decoderempty(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decoderempty"); - GET_REG(i->cur_op, 0).i64 = MVM_decoder_empty(i->tc, (MVMDecoder *)decoder); + GET_REG(i->cur_op, 0,i).i64 = MVM_decoder_empty(i->tc, (MVMDecoder *)decoder); i->cur_op += 4; goto NEXT(i); } __code cbc_indexingoptimized(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_indexing_optimized(i->tc, GET_REG(i->cur_op, 2).s); + GET_REG(i->cur_op, 0,i).s = MVM_string_indexing_optimized(i->tc, GET_REG(i->cur_op, 2,i).s); i->cur_op += 4; goto NEXT(i); } __code cbc_captureinnerlex(INTERP i){ - MVM_frame_capture_inner(i->tc, GET_REG(i->cur_op, 0).o); + MVM_frame_capture_inner(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_setdispatcherfor(INTERP i){ - MVMObject *disp_for = GET_REG(i->cur_op, 2).o; - i->tc->cur_dispai->tcher = GET_REG(i->cur_op, 0).o; + MVMObject *disp_for = GET_REG(i->cur_op, 2,i).o; + i->tc->cur_dispai->tcher = GET_REG(i->cur_op, 0,i).o; i->tc->cur_dispai->tcher_for = REPR(disp_for)->ID == MVM_REPR_ID_MVMCode ? disp_for : MVM_frame_find_invokee(i->tc, disp_for, NULL); @@ -5569,74 +5569,74 @@ goto NEXT(i); } __code cbc_cpucores(INTERP i){ - GET_REG(i->cur_op, 0).i32 = MVM_platform_cpu_count(); + GET_REG(i->cur_op, 0,i).i32 = MVM_platform_cpu_count(); i->cur_op += 2; goto NEXT(i); } __code cbc_decodertakecharseof(INTERP i){ - MVMObject *decoder = GET_REG(i->cur_op, 2).o; + MVMObject *decoder = GET_REG(i->cur_op, 2,i).o; MVM_decoder_ensure_decoder(i->tc, decoder, "decodertakecharseof"); - GET_REG(i->cur_op, 0).s = MVM_decoder_take_chars(i->tc, (MVMDecoder *)decoder, - GET_REG(i->cur_op, 4).i64, 1); + GET_REG(i->cur_op, 0,i).s = MVM_decoder_take_chars(i->tc, (MVMDecoder *)decoder, + GET_REG(i->cur_op, 4,i).i64, 1); i->cur_op += 6; goto NEXT(i); } __code cbc_cas_o(INTERP i){ - MVMRegister *result = &GET_REG(i->cur_op, 0); - MVMObject *target = GET_REG(i->cur_op, 2).o; - MVMObject *expected = GET_REG(i->cur_op, 4).o; - MVMObject *value = GET_REG(i->cur_op, 6).o; + MVMRegister *result = &GET_REG(i->cur_op, 0,i); + MVMObject *target = GET_REG(i->cur_op, 2,i).o; + MVMObject *expected = GET_REG(i->cur_op, 4,i).o; + MVMObject *value = GET_REG(i->cur_op, 6,i).o; i->cur_op += 8; MVM_6model_container_cas(i->tc, target, expected, value, result); goto NEXT(i); } __code cbc_cas_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_cas_i(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64, - GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_cas_i(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64, + GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_atomicinc_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_atomic_inc(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_atomic_inc(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_atomicdec_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_atomic_dec(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_atomic_dec(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_atomicadd_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_atomic_add(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).i64); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_atomic_add(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).i64); i->cur_op += 6; goto NEXT(i); } __code cbc_atomicload_o(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_6model_container_atomic_load(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_6model_container_atomic_load(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_atomicload_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_6model_container_atomic_load_i(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_6model_container_atomic_load_i(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_atomicstore_o(INTERP i){ - MVMObject *target = GET_REG(i->cur_op, 0).o; - MVMObject *value = GET_REG(i->cur_op, 2).o; + MVMObject *target = GET_REG(i->cur_op, 0,i).o; + MVMObject *value = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; MVM_6model_container_atomic_store(i->tc, target, value); goto NEXT(i); } __code cbc_atomicstore_i(INTERP i){ - MVM_6model_container_atomic_store_i(i->tc, GET_REG(i->cur_op, 0).o, - GET_REG(i->cur_op, 2).i64); + MVM_6model_container_atomic_store_i(i->tc, GET_REG(i->cur_op, 0,i).o, + GET_REG(i->cur_op, 2,i).i64); i->cur_op += 4; goto NEXT(i); } @@ -5647,100 +5647,100 @@ __code cbc_nativeinvoke_v(INTERP i){ i->tc->cur_frame->return_value = NULL; i->tc->cur_frame->return_type = MVM_RETURN_VOID; - MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2).o); + MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_nativeinvoke_i(INTERP i){ - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_INT; - MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2).o); + MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_nativeinvoke_n(INTERP i){ - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_NUM; - MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2).o); + MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_nativeinvoke_s(INTERP i){ - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_STR; - MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2).o); + MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_nativeinvoke_o(INTERP i){ - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_OBJ; - MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2).o); + MVM_nativecall_invoke_jit(i->tc, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_getarg_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = i->tc->cur_frame->args[GET_REG(i->cur_op, 2).u16].i64; + GET_REG(i->cur_op, 0,i).i64 = i->tc->cur_frame->args[GET_REG(i->cur_op, 2,i).u16].i64; i->cur_op += 4; goto NEXT(i); } __code cbc_getarg_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = i->tc->cur_frame->args[GET_REG(i->cur_op, 2).u16].n64; + GET_REG(i->cur_op, 0,i).n64 = i->tc->cur_frame->args[GET_REG(i->cur_op, 2,i).u16].n64; i->cur_op += 4; goto NEXT(i); } __code cbc_getarg_s(INTERP i){ - GET_REG(i->cur_op, 0).s = i->tc->cur_frame->args[GET_REG(i->cur_op, 2).u16].s; + GET_REG(i->cur_op, 0,i).s = i->tc->cur_frame->args[GET_REG(i->cur_op, 2,i).u16].s; i->cur_op += 4; goto NEXT(i); } __code cbc_getarg_o(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->cur_frame->args[GET_REG(i->cur_op, 2).u16].o; + GET_REG(i->cur_op, 0,i).o = i->tc->cur_frame->args[GET_REG(i->cur_op, 2,i).u16].o; i->cur_op += 4; goto NEXT(i); } __code cbc_coerce_II(INTERP i){ - MVMObject * const type = GET_REG(i->cur_op, 4).o; - GET_REG(i->cur_op, 0).o = MVM_bigint_from_bigint(i->tc, type, GET_REG(i->cur_op, 2).o); + MVMObject * const type = GET_REG(i->cur_op, 4,i).o; + GET_REG(i->cur_op, 0,i).o = MVM_bigint_from_bigint(i->tc, type, GET_REG(i->cur_op, 2,i).o); i->cur_op += 6; goto NEXT(i); } __code cbc_encoderepconf(INTERP i){ - GET_REG(i->cur_op, 8).o = MVM_string_encode_to_buf_config(i->tc, GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 8).o, GET_REG(i->cur_op, 6).s, GET_REG(i->cur_op, 10).i64); + GET_REG(i->cur_op, 8,i).o = MVM_string_encode_to_buf_config(i->tc, GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 8,i).o, GET_REG(i->cur_op, 6,i).s, GET_REG(i->cur_op, 10,i).i64); i->cur_op += 12; goto NEXT(i); } __code cbc_encodeconf(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_string_encode_to_buf_config(i->tc, GET_REG(i->cur_op, 2).s, - GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).o, NULL, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).o = MVM_string_encode_to_buf_config(i->tc, GET_REG(i->cur_op, 2,i).s, + GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).o, NULL, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_decodeconf(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_decode_from_buf_config(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, NULL, GET_REG(i->cur_op, 6).i64); + GET_REG(i->cur_op, 0,i).s = MVM_string_decode_from_buf_config(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, NULL, GET_REG(i->cur_op, 6,i).i64); i->cur_op += 8; goto NEXT(i); } __code cbc_decoderepconf(INTERP i){ - GET_REG(i->cur_op, 0).s = MVM_string_decode_from_buf_config(i->tc, - GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).s, GET_REG(i->cur_op, 6).s, GET_REG(i->cur_op, 8).i64); + GET_REG(i->cur_op, 0,i).s = MVM_string_decode_from_buf_config(i->tc, + GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).s, GET_REG(i->cur_op, 6,i).s, GET_REG(i->cur_op, 8,i).i64); i->cur_op += 10; goto NEXT(i); } __code cbc_getppid(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_proc_getppid(i->tc); + GET_REG(i->cur_op, 0,i).i64 = MVM_proc_getppid(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_getsignals(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_io_get_signals(i->tc); + GET_REG(i->cur_op, 0,i).o = MVM_io_get_signals(i->tc); i->cur_op += 2; goto NEXT(i); } __code cbc_sp_guard(INTERP i){ - MVMObject *check = GET_REG(i->cur_op, 0).o; + MVMObject *check = GET_REG(i->cur_op, 0,i).o; MVMSTable *want = (MVMSTable *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 8; @@ -5749,7 +5749,7 @@ goto NEXT(i); } __code cbc_sp_guardconc(INTERP i){ - MVMObject *check = GET_REG(i->cur_op, 0).o; + MVMObject *check = GET_REG(i->cur_op, 0,i).o; MVMSTable *want = (MVMSTable *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 8; @@ -5758,7 +5758,7 @@ goto NEXT(i); } __code cbc_sp_guardtype(INTERP i){ - MVMObject *check = GET_REG(i->cur_op, 0).o; + MVMObject *check = GET_REG(i->cur_op, 0,i).o; MVMSTable *want = (MVMSTable *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 8; @@ -5767,7 +5767,7 @@ goto NEXT(i); } __code cbc_sp_guardsf(INTERP i){ - MVMObject *check = GET_REG(i->cur_op, 0).o; + MVMObject *check = GET_REG(i->cur_op, 0,i).o; MVMStaticFrame *want = (MVMStaticFrame *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 8; @@ -5777,7 +5777,7 @@ goto NEXT(i); } __code cbc_sp_guardsfouter(INTERP i){ - MVMObject *check = GET_REG(i->cur_op, 0).o; + MVMObject *check = GET_REG(i->cur_op, 0,i).o; MVMStaticFrame *want = (MVMStaticFrame *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 8; @@ -5788,26 +5788,26 @@ goto NEXT(i); } __code cbc_sp_rebless(INTERP i){ - if (!REPR(GET_REG(i->cur_op, 2).o)->change_type) { + if (!REPR(GET_REG(i->cur_op, 2,i).o)->change_type) { MVM_exception_throw_adhoc(i->tc, "This REPR cannot change type"); } - REPR(GET_REG(i->cur_op, 2).o)->change_type(i->tc, GET_REG(i->cur_op, 2).o, GET_REG(i->cur_op, 4).o); - GET_REG(i->cur_op, 0).o = GET_REG(i->cur_op, 2).o; - MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0).o); + REPR(GET_REG(i->cur_op, 2,i).o)->change_type(i->tc, GET_REG(i->cur_op, 2,i).o, GET_REG(i->cur_op, 4,i).o); + GET_REG(i->cur_op, 0,i).o = GET_REG(i->cur_op, 2,i).o; + MVM_SC_WB_OBJ(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 10; MVM_spesh_deopt_all(i->tc); MVM_spesh_deopt_one(i->tc, GET_UI32(i->cur_op, -4)); goto NEXT(i); } __code cbc_sp_resolvecode(INTERP i){ - GET_REG(i->cur_op, 0).o = MVM_frame_resolve_invokee_spesh(i->tc, - GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).o = MVM_frame_resolve_invokee_spesh(i->tc, + GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_sp_decont(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 2).o; - MVMRegister *r = &GET_REG(i->cur_op, 0); + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; + MVMRegister *r = &GET_REG(i->cur_op, 0,i); i->cur_op += 4; if (obj && IS_CONCRETE(obj) && STABLE(obj)->container_spec) STABLE(obj)->container_spec->fei->tch(i->tc, obj, r); @@ -5827,7 +5827,7 @@ outers--; } found = GET_LEX(i->cur_op, 2, f); - GET_REG(i->cur_op, 0).o = found.o == NULL + GET_REG(i->cur_op, 0,i).o = found.o == NULL ? MVM_frame_vivify_lexical(i->tc, f, idx) : found.o; i->cur_op += 6; @@ -5843,39 +5843,39 @@ f = f->outer; outers--; } - GET_REG(i->cur_op, 0) = GET_LEX(i->cur_op, 2, f); + GET_REG(i->cur_op, 0,i) = GET_LEX(i->cur_op, 2, f); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_getlex_no(INTERP i){ MVMRegister *found = MVM_frame_find_lexical_by_name(i->tc, MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 2)), MVM_reg_obj); - GET_REG(i->cur_op, 0).o = found ? found->o : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = found ? found->o : i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_getarg_o(INTERP i){ - GET_REG(i->cur_op, 0).o = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].o; + GET_REG(i->cur_op, 0,i).o = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].o; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_getarg_i(INTERP i){ - GET_REG(i->cur_op, 0).i64 = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].i64; + GET_REG(i->cur_op, 0,i).i64 = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].i64; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_getarg_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].n64; + GET_REG(i->cur_op, 0,i).n64 = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].n64; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_getarg_s(INTERP i){ - GET_REG(i->cur_op, 0).s = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].s; + GET_REG(i->cur_op, 0,i).s = i->tc->cur_frame->params.args[GET_UI16(i->cur_op, 2)].s; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_fastinvoke_v(INTERP i){ - MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 0).o; + MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 0,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMint32 spesh_cand = GET_UI16(i->cur_op, 2); i->tc->cur_frame->return_value = NULL; @@ -5887,10 +5887,10 @@ goto NEXT(i); } __code cbc_sp_fastinvoke_i(INTERP i){ - MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2).o; + MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMint32 spesh_cand = GET_UI16(i->cur_op, 4); - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_INT; i->cur_op += 6; i->tc->cur_frame->return_address = i->cur_op; @@ -5899,10 +5899,10 @@ goto NEXT(i); } __code cbc_sp_fastinvoke_n(INTERP i){ - MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2).o; + MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMint32 spesh_cand = GET_UI16(i->cur_op, 4); - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_NUM; i->cur_op += 6; i->tc->cur_frame->return_address = i->cur_op; @@ -5911,10 +5911,10 @@ goto NEXT(i); } __code cbc_sp_fastinvoke_s(INTERP i){ - MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2).o; + MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMint32 spesh_cand = GET_UI16(i->cur_op, 4); - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_STR; i->cur_op += 6; i->tc->cur_frame->return_address = i->cur_op; @@ -5923,10 +5923,10 @@ goto NEXT(i); } __code cbc_sp_fastinvoke_o(INTERP i){ - MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2).o; + MVMCode *code = (MVMCode *)GET_REG(i->cur_op, 2,i).o; MVMRegister *args = i->tc->cur_frame->args; MVMint32 spesh_cand = GET_UI16(i->cur_op, 4); - i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0); + i->tc->cur_frame->return_value = &GET_REG(i->cur_op, 0,i); i->tc->cur_frame->return_type = MVM_RETURN_OBJ; i->cur_op += 6; i->tc->cur_frame->return_address = i->cur_op; @@ -5941,23 +5941,23 @@ goto NEXT(i); } __code cbc_sp_getspeshslot(INTERP i){ - GET_REG(i->cur_op, 0).o = (MVMObject *)i->tc->cur_frame + GET_REG(i->cur_op, 0,i).o = (MVMObject *)i->tc->cur_frame ->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_findmeth(INTERP i){ /* Obtain object and cache index; see if we get a mai->tch. */ - MVMObject *obj = GET_REG(i->cur_op, 2).o; + MVMObject *obj = GET_REG(i->cur_op, 2,i).o; MVMuint16 idx = GET_UI16(i->cur_op, 8); if ((MVMSTable *)i->tc->cur_frame->effective_spesh_slots[idx] == STABLE(obj)) { - GET_REG(i->cur_op, 0).o = (MVMObject *)i->tc->cur_frame->effective_spesh_slots[idx + 1]; + GET_REG(i->cur_op, 0,i).o = (MVMObject *)i->tc->cur_frame->effective_spesh_slots[idx + 1]; i->cur_op += 10; } else { /* May invoke, so pre-increment op counter */ MVMString *name = MVM_cu_string(i->tc, cu, GET_UI32(i->cur_op, 4)); - MVMRegister *res = &GET_REG(i->cur_op, 0); + MVMRegister *res = &GET_REG(i->cur_op, 0,i); i->cur_op += 10; MVM_6model_find_method_spesh(i->tc, obj, name, idx, res); @@ -5972,205 +5972,205 @@ obj->st = (MVMSTable *)i->tc->cur_frame->effective_spesh_slots[GET_UI16(i->cur_op, 4)]; obj->header.size = size; obj->header.owner = i->tc->thread_id; - GET_REG(i->cur_op, 0).o = obj; + GET_REG(i->cur_op, 0,i).o = obj; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_o(INTERP i){ - MVMObject *val = ((MVMObject *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); - GET_REG(i->cur_op, 0).o = val ? val : i->tc->instance->VMNull; + MVMObject *val = ((MVMObject *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).o = val ? val : i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_i64(INTERP i){ - GET_REG(i->cur_op, 0).i64 = *((MVMint64 *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).i64 = *((MVMint64 *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_i32(INTERP i){ - GET_REG(i->cur_op, 0).i64 = *((MVMint32 *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).i64 = *((MVMint32 *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_i16(INTERP i){ - GET_REG(i->cur_op, 0).i64 = *((MVMint16 *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).i64 = *((MVMint16 *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_i8(INTERP i){ - GET_REG(i->cur_op, 0).i64 = *((MVMint8 *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).i64 = *((MVMint8 *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_n(INTERP i){ - GET_REG(i->cur_op, 0).n64 = *((MVMnum64 *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).n64 = *((MVMnum64 *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_get_s(INTERP i){ - GET_REG(i->cur_op, 0).s = ((MVMString *)((char *)GET_REG(i->cur_op, 2).o + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).s = ((MVMString *)((char *)GET_REG(i->cur_op, 2,i).o + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_o(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - MVMObject *value = GET_REG(i->cur_op, 4).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + MVMObject *value = GET_REG(i->cur_op, 4,i).o; MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMObject **)((char *)o + GET_UI16(i->cur_op, 2))), value); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_i64(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - *((MVMint64 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).i64; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + *((MVMint64 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_i32(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - *((MVMint32 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).i64; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + *((MVMint32 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_i16(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - *((MVMint16 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).i64; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + *((MVMint16 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_i8(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - *((MVMint8 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).i64; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + *((MVMint8 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_n(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - *((MVMnum64 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).n64; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + *((MVMnum64 *)((char *)o + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_bind_s(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - MVMString *value = GET_REG(i->cur_op, 4).s; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + MVMString *value = GET_REG(i->cur_op, 4,i).s; MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMObject **)((char *)o + GET_UI16(i->cur_op, 2))), value); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6oget_o(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; MVMObject *val = MVM_p6opaque_read_object(i->tc, o, GET_UI16(i->cur_op, 4)); - GET_REG(i->cur_op, 0).o = val ? val : i->tc->instance->VMNull; + GET_REG(i->cur_op, 0,i).o = val ? val : i->tc->instance->VMNull; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6ogetvt_o(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); MVMObject *val = *((MVMObject **)(data + GET_UI16(i->cur_op, 4))); if (!val) { val = (MVMObject *)i->tc->cur_frame->effective_spesh_slots[GET_UI16(i->cur_op, 6)]; MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMObject **)(data + GET_UI16(i->cur_op, 4))), val); } - GET_REG(i->cur_op, 0).o = val; + GET_REG(i->cur_op, 0,i).o = val; i->cur_op += 8; goto NEXT(i); } __code cbc_sp_p6ogetvc_o(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); MVMObject *val = *((MVMObject **)(data + GET_UI16(i->cur_op, 4))); if (!val) { /* Clone might allocate, so re-fei->tch things after it. */ val = MVM_repr_clone(i->tc, (MVMObject *)i->tc->cur_frame->effective_spesh_slots[GET_UI16(i->cur_op, 6)]); - o = GET_REG(i->cur_op, 2).o; + o = GET_REG(i->cur_op, 2,i).o; data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMObject **)(data + GET_UI16(i->cur_op, 4))), val); } - GET_REG(i->cur_op, 0).o = val; + GET_REG(i->cur_op, 0,i).o = val; i->cur_op += 8; goto NEXT(i); } __code cbc_sp_p6oget_i(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); - GET_REG(i->cur_op, 0).i64 = *((MVMint64 *)(data + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).i64 = *((MVMint64 *)(data + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6oget_n(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); - GET_REG(i->cur_op, 0).n64 = *((MVMnum64 *)(data + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).n64 = *((MVMnum64 *)(data + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6oget_s(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); - GET_REG(i->cur_op, 0).s = *((MVMString **)(data + GET_UI16(i->cur_op, 4))); + GET_REG(i->cur_op, 0,i).s = *((MVMString **)(data + GET_UI16(i->cur_op, 4))); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6obind_o(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; - MVMObject *value = GET_REG(i->cur_op, 4).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; + MVMObject *value = GET_REG(i->cur_op, 4,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMObject **)(data + GET_UI16(i->cur_op, 2))), value); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6obind_i(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); - *((MVMint64 *)(data + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).i64; + *((MVMint64 *)(data + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6obind_n(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); - *((MVMnum64 *)(data + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4).n64; + *((MVMnum64 *)(data + GET_UI16(i->cur_op, 2))) = GET_REG(i->cur_op, 4,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_p6obind_s(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; char *data = MVM_p6opaque_real_data(i->tc, OBJECT_BODY(o)); MVM_ASSIGN_REF(i->tc, &(o->header), *((MVMString **)(data + GET_UI16(i->cur_op, 2))), - GET_REG(i->cur_op, 4).s); + GET_REG(i->cur_op, 4,i).s); i->cur_op += 6; goto NEXT(i); } __code cbc_sp_deref_get_i64(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; MVMint64 **target = ((MVMint64 **)((char *)o + GET_UI16(i->cur_op, 4))); - GET_REG(i->cur_op, 0).i64 = **target; + GET_REG(i->cur_op, 0,i).i64 = **target; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_deref_get_n(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 2).o; + MVMObject *o = GET_REG(i->cur_op, 2,i).o; MVMnum64 **target = ((MVMnum64 **)((char *)o + GET_UI16(i->cur_op, 4))); - GET_REG(i->cur_op, 0).n64 = **target; + GET_REG(i->cur_op, 0,i).n64 = **target; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_deref_bind_i64(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; MVMint64 **target = ((MVMint64 **)((char *)o + GET_UI16(i->cur_op, 4))); - **target = GET_REG(i->cur_op, 2).i64; + **target = GET_REG(i->cur_op, 2,i).i64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_deref_bind_n(INTERP i){ - MVMObject *o = GET_REG(i->cur_op, 0).o; + MVMObject *o = GET_REG(i->cur_op, 0,i).o; MVMnum64 **target = ((MVMnum64 **)((char *)o + GET_UI16(i->cur_op, 4))); - **target = GET_REG(i->cur_op, 2).n64; + **target = GET_REG(i->cur_op, 2,i).n64; i->cur_op += 6; goto NEXT(i); } __code cbc_sp_getlexvia_o(INTERP i){ - MVMFrame *f = ((MVMCode *)GET_REG(i->cur_op, 6).o)->body.outer; + MVMFrame *f = ((MVMCode *)GET_REG(i->cur_op, 6,i).o)->body.outer; MVMuint16 idx = GET_UI16(i->cur_op, 2); MVMuint16 outers = GET_UI16(i->cur_op, 4) - 1; /* - 1 as already in outer */ MVMRegister found; @@ -6181,14 +6181,14 @@ outers--; } found = GET_LEX(i->cur_op, 2, f); - GET_REG(i->cur_op, 0).o = found.o == NULL + GET_REG(i->cur_op, 0,i).o = found.o == NULL ? MVM_frame_vivify_lexical(i->tc, f, idx) : found.o; i->cur_op += 8; goto NEXT(i); } __code cbc_sp_getlexvia_ins(INTERP i){ - MVMFrame *f = ((MVMCode *)GET_REG(i->cur_op, 6).o)->body.outer; + MVMFrame *f = ((MVMCode *)GET_REG(i->cur_op, 6,i).o)->body.outer; MVMuint16 idx = GET_UI16(i->cur_op, 2); MVMuint16 outers = GET_UI16(i->cur_op, 4) - 1; /* - 1 as already in outer */ while (outers) { @@ -6197,21 +6197,21 @@ f = f->outer; outers--; } - GET_REG(i->cur_op, 0) = GET_LEX(i->cur_op, 2, f); + GET_REG(i->cur_op, 0,i) = GET_LEX(i->cur_op, 2, f); i->cur_op += 8; goto NEXT(i); } __code cbc_sp_getstringfrom(INTERP i){ MVMCompUnit *dep = (MVMCompUnit *)i->tc->cur_frame->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; MVMuint32 idx = GET_UI32(i->cur_op, 4); - GET_REG(i->cur_op, 0).s = MVM_cu_string(i->tc, dep, idx); + GET_REG(i->cur_op, 0,i).s = MVM_cu_string(i->tc, dep, idx); i->cur_op += 8; goto NEXT(i); } __code cbc_sp_getwvalfrom(INTERP i){ MVMSerializationContext *dep = (MVMSerializationContext *)i->tc->cur_frame->effective_spesh_slots[GET_UI16(i->cur_op, 2)]; MVMuint64 idx = MVM_BC_get_I64(i->cur_op, 4); - GET_REG(i->cur_op, 0).o = MVM_sc_get_object(i->tc, dep, idx); + GET_REG(i->cur_op, 0,i).o = MVM_sc_get_object(i->tc, dep, idx); i->cur_op += 12; goto NEXT(i); } @@ -6229,44 +6229,44 @@ goto NEXT(i); } __code cbc_sp_boolify_iter(INTERP i){ - GET_REG(i->cur_op, 0).i64 = MVM_iter_istrue(i->tc, (MVMIter*)GET_REG(i->cur_op, 2).o); + GET_REG(i->cur_op, 0,i).i64 = MVM_iter_istrue(i->tc, (MVMIter*)GET_REG(i->cur_op, 2,i).o); i->cur_op += 4; goto NEXT(i); } __code cbc_sp_boolify_iter_arr(INTERP i){ - MVMIter *iter = (MVMIter *)GET_REG(i->cur_op, 2).o; + MVMIter *iter = (MVMIter *)GET_REG(i->cur_op, 2,i).o; - GET_REG(i->cur_op, 0).i64 = iter->body.array_state.index + 1 < iter->body.array_state.limit ? 1 : 0; + GET_REG(i->cur_op, 0,i).i64 = iter->body.array_state.index + 1 < iter->body.array_state.limit ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_boolify_iter_hash(INTERP i){ - MVMIter *iter = (MVMIter *)GET_REG(i->cur_op, 2).o; + MVMIter *iter = (MVMIter *)GET_REG(i->cur_op, 2,i).o; - GET_REG(i->cur_op, 0).i64 = iter->body.hash_state.next != NULL ? 1 : 0; + GET_REG(i->cur_op, 0,i).i64 = iter->body.hash_state.next != NULL ? 1 : 0; i->cur_op += 4; goto NEXT(i); } __code cbc_sp_cas_o(INTERP i){ - MVMRegister *result = &GET_REG(i->cur_op, 0); - MVMObject *target = GET_REG(i->cur_op, 2).o; - MVMObject *expected = GET_REG(i->cur_op, 4).o; - MVMObject *value = GET_REG(i->cur_op, 6).o; + MVMRegister *result = &GET_REG(i->cur_op, 0,i); + MVMObject *target = GET_REG(i->cur_op, 2,i).o; + MVMObject *expected = GET_REG(i->cur_op, 4,i).o; + MVMObject *value = GET_REG(i->cur_op, 6,i).o; i->cur_op += 8; target->st->container_spec->cas(i->tc, target, expected, value, result); goto NEXT(i); } __code cbc_sp_atomicload_o(INTERP i){ - MVMObject *target = GET_REG(i->cur_op, 2).o; - GET_REG(i->cur_op, 0).o = target->st->container_spec->atomic_load(i->tc, target); + MVMObject *target = GET_REG(i->cur_op, 2,i).o; + GET_REG(i->cur_op, 0,i).o = target->st->container_spec->atomic_load(i->tc, target); i->cur_op += 4; goto NEXT(i); } __code cbc_sp_atomicstore_o(INTERP i){ - MVMObject *target = GET_REG(i->cur_op, 0).o; - MVMObject *value = GET_REG(i->cur_op, 2).o; + MVMObject *target = GET_REG(i->cur_op, 0,i).o; + MVMObject *value = GET_REG(i->cur_op, 2,i).o; i->cur_op += 4; target->st->container_spec->atomic_store(i->tc, target, value); goto NEXT(i); @@ -6289,7 +6289,7 @@ goto NEXT(i); } __code cbc_prof_enternative(INTERP i){ - MVM_profile_log_enter_native(i->tc, GET_REG(i->cur_op, 0).o); + MVM_profile_log_enter_native(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } @@ -6298,12 +6298,12 @@ goto NEXT(i); } __code cbc_prof_allocated(INTERP i){ - MVM_profile_log_allocated(i->tc, GET_REG(i->cur_op, 0).o); + MVM_profile_log_allocated(i->tc, GET_REG(i->cur_op, 0,i).o); i->cur_op += 2; goto NEXT(i); } __code cbc_ctw_check(INTERP i){ - MVMObject *obj = GET_REG(i->cur_op, 0).o; + MVMObject *obj = GET_REG(i->cur_op, 0,i).o; MVMint16 blame = GET_I16(i->cur_op, 2); i->cur_op += 4; MVM_cross_thread_write_check(i->tc, obj, blame); @@ -6413,7 +6413,7 @@ goto NEXT(i); } __code cbc_coveragecontrol(INTERP i){ - MVMuint32 cc = (MVMuint32)GET_REG(i->cur_op, 0).i64; + MVMuint32 cc = (MVMuint32)GET_REG(i->cur_op, 0,i).i64; if (i->tc->instance->coverage_control && (cc == 0 || cc == 1)) i->tc->instance->coverage_control = cc + 1; i->cur_op += 2;