conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't use xhash in codegen

This commit is contained in:
Yuichi Nishiwaki 2015-06-25 07:19:11 +09:00
parent 11ed51b236
commit d500dd5d76
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extlib/benz/codegen.c
View File

@ -1262,24 +1262,24 @@ create_activation(codegen_state *state)
pic_state *pic = state->pic; pic_state *pic = state->pic;
codegen_context *cxt = state->cxt; codegen_context *cxt = state->cxt;
size_t i, n; size_t i, n;
xhash regs;
size_t offset; size_t offset;
struct pic_reg *regs;
xh_init_ptr(&regs, sizeof(size_t)); regs = pic_make_reg(pic);
offset = 1; offset = 1;
for (i = 0; i < kv_size(cxt->args); ++i) { for (i = 0; i < kv_size(cxt->args); ++i) {
n = i + offset; n = i + offset;
xh_put_ptr(&regs, kv_A(cxt->args, i), &n); pic_reg_set(pic, regs, kv_A(cxt->args, i), pic_size_value(n));
} }
offset += i; offset += i;
for (i = 0; i < kv_size(cxt->locals); ++i) { for (i = 0; i < kv_size(cxt->locals); ++i) {
n = i + offset; n = i + offset;
xh_put_ptr(&regs, kv_A(cxt->locals, i), &n); pic_reg_set(pic, regs, kv_A(cxt->locals, i), pic_size_value(n));
} }
for (i = 0; i < kv_size(cxt->captures); ++i) { for (i = 0; i < kv_size(cxt->captures); ++i) {
n = xh_val(xh_get_ptr(&regs, kv_A(cxt->captures, i)), size_t); n = (size_t)pic_int(pic_reg_ref(pic, regs, kv_A(cxt->captures, i)));
if (n <= kv_size(cxt->args) || (cxt->varg && n == kv_size(cxt->args) + 1)) { if (n <= kv_size(cxt->args) || (cxt->varg && n == kv_size(cxt->args) + 1)) {
/* copy arguments to capture variable area */ /* copy arguments to capture variable area */
emit_i(state, OP_LREF, (int)n); emit_i(state, OP_LREF, (int)n);
@ -1288,8 +1288,6 @@ create_activation(codegen_state *state)
emit_n(state, OP_PUSHUNDEF); emit_n(state, OP_PUSHUNDEF);
} }
} }
xh_destroy(&regs);
} }
static void static void