From 9d7194addc90636e4242477bc86c9d28d5da670e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Astor?= Date: Sat, 30 Nov 2019 22:27:25 +0100 Subject: [PATCH] :art: Improve ranges --- src/emit/emit.c | 3 --- src/lib/prim.c | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/emit/emit.c b/src/emit/emit.c index be0a7460..22806b94 100644 --- a/src/emit/emit.c +++ b/src/emit/emit.c @@ -417,9 +417,6 @@ ANN static m_bool emit_prim_range(const Emitter emit, Range **data) { const Symbol sym = insert_symbol("@range"); struct Op_Import opi = { .op=sym, .rhs=e->type, .pos=e->pos, .data=(uintptr_t)prim_exp(data) }; CHECK_OB(op_emit(emit, &opi)) - const Instr instr = emit_add_instr(emit, ArrayInit); - instr->m_val = (m_uint)prim_exp(data)->type; - instr->m_val2 = prim_exp(data)->type->size; emit_add_instr(emit, GcAdd); return GW_OK; } diff --git a/src/lib/prim.c b/src/lib/prim.c index e1e715f7..326e124c 100644 --- a/src/lib/prim.c +++ b/src/lib/prim.c @@ -25,7 +25,7 @@ GWION_IMPORT(int_op) { GWI_BB(gwi_oper_end(gwi, "/", int_div)) GWI_BB(gwi_oper_end(gwi, "%", int_modulo)) GWI_BB(gwi_oper_end(gwi, "@access", NULL)) - return gwi_oper_end(gwi, "@repeat", NULL); + return gwi_oper_end(gwi, "@repeat", NULL); } static GWION_IMPORT(int_logical) { @@ -65,12 +65,11 @@ static INSTR(IntRange) { const m_int end = *(m_int*)REG(SZ_INT); const m_int op = start < end ? 1 : -1; const m_uint sz = op > 0 ? end - start : start - end; - if((sz - (shred->reg - (m_bit*)(shred + sizeof(struct VM_Shred_)))) > SIZEOF_REG) - Except(shred, _("Range too big")) + const M_Object array = new_array(shred->info->vm->gwion->mp, (Type)instr->m_val, sz); for(m_int i = start, j = 0; i != end; i += op, ++j) - *(m_uint*)REG(j * SZ_INT) = i; - *(m_uint*)REG(sz * SZ_INT) = sz; - PUSH_REG(shred, sz * SZ_INT); + m_vector_set(ARRAY(array), j, &i); + *(M_Object*)REG(0) = array; + PUSH_REG(shred, SZ_INT); } static OP_CHECK(opck_int_range) { @@ -80,6 +79,13 @@ static OP_CHECK(opck_int_range) { return array_type(env, e->type, 1); } +static OP_EMIT(opem_int_range) { + const Exp exp = (Exp)data; + const Instr instr = emit_add_instr(emit, IntRange); + instr->m_val = (m_uint)exp->type; + return instr; +} + static GWION_IMPORT(int_unary) { GWI_BB(gwi_oper_ini(gwi, NULL, "int", "int")) GWI_BB(gwi_oper_add(gwi, opck_unary_meta)) @@ -89,7 +95,8 @@ static GWION_IMPORT(int_unary) { GWI_BB(gwi_oper_end(gwi, "~", int_cmp)) GWI_BB(gwi_oper_ini(gwi, NULL, "int", NULL)) GWI_BB(gwi_oper_add(gwi, opck_int_range)) - GWI_BB(gwi_oper_end(gwi, "@range", IntRange)) + GWI_BB(gwi_oper_emi(gwi, opem_int_range)) + GWI_BB(gwi_oper_end(gwi, "@range", NULL)) GWI_BB(gwi_oper_ini(gwi, "int", NULL, "int")) CHECK_OP("++", post, post_inc) GWI_BB(gwi_oper_add(gwi, opck_post)) -- 2.43.0