Skip to content

M
mruby
Unverified Commit 8bfa9997 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

codegen.c: unify `OP_ARYPUSH` and `OP_ARYPUSH_N`. 

- `OP_ARYPUSH` now takes operand for the number of pushing elements
- the code generator consume the stack no more than `64` for `mruby/c`
parent 7c99df84
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 40 deletions
doc/opcode.md
View file @ 8bfa9997
......@@ -97,8 +97,7 @@ sign) of operands.
| `OP_ARRAY` | `BB` | `R(a) = ary_new(R(a),R(a+1)..R(a+b))` |
| `OP_ARRAY2` | `BBB` | `R(a) = ary_new(R(b),R(b+1)..R(b+c))` |
| `OP_ARYCAT` | `B` | `ary_cat(R(a),R(a+1))` |
| `OP_ARYPUSH` | `B` | `ary_push(R(a),R(a+1))` |
| `OP_ARYPUSH_N` | `BB` | `ary_push(R(a),R(a+1)..R(a+b))` |
| `OP_ARYPUSH` | `BB` | `ary_push(R(a),R(a+1)..R(a+b))` |
| `OP_ARYDUP` | `B` | `R(a) = ary_dup(R(a))` |
| `OP_AREF` | `BBB` | `R(a) = R(b)[c]` |
| `OP_ASET` | `BBB` | `R(a)[c] = R(b)` |
......
include/mruby/ops.h
View file @ 8bfa9997
......@@ -85,8 +85,7 @@ OPCODE(GE, B) /* R(a) = R(a)>=R(a+1) */
OPCODE(ARRAY, BB) /* R(a) = ary_new(R(a),R(a+1)..R(a+b)) */
OPCODE(ARRAY2, BBB) /* R(a) = ary_new(R(b),R(b+1)..R(b+c)) */
OPCODE(ARYCAT, B) /* ary_cat(R(a),R(a+1)) */
OPCODE(ARYPUSH, B) /* ary_push(R(a),R(a+1)) */
OPCODE(ARYPUSH_N, BB) /* ary_push(R(a),R(a+1)..R(a+b)) */
OPCODE(ARYPUSH, BB) /* ary_push(R(a),R(a+1)..R(a+b)) */
OPCODE(ARYDUP, B) /* R(a) = ary_dup(R(a)) */
OPCODE(AREF, BBB) /* R(a) = R(b)[c] */
OPCODE(ASET, BBB) /* R(a)[c] = R(b) */
......
mrbgems/mruby-compiler/core/codegen.c
View file @ 8bfa9997
......@@ -1483,15 +1483,17 @@ attrsym(codegen_scope *s, mrb_sym a)
}
#define CALL_MAXARGS 127
#define GEN_LIT_ARY_MAX 255
#define GEN_LIT_ARY_MAX 64
static int
gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
{
int n = 0;
int first = 1;
int slimit = GEN_LIT_ARY_MAX;
if (limit == 0) limit = GEN_LIT_ARY_MAX;
if (cursp() >= slimit) slimit = INT16_MAX;
if (!val) {
while (t) {
......@@ -1505,7 +1507,7 @@ gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
while (t) {
int is_splat = nint(t->car->car) == NODE_SPLAT;
if (is_splat || n+extra >= limit-1) { /* flush stack */
if (is_splat || n+extra >= limit-1 || cursp() >= slimit) { /* flush stack */
pop_n(n);
if (first) {
if (n == 0) {
......@@ -1516,14 +1518,11 @@ gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
}
push();
first = 0;
limit = GEN_LIT_ARY_MAX;
}
else if (n > 0) {
if (n == 1) {
genop_1(s, OP_ARYPUSH, cursp());
}
else {
genop_2(s, OP_ARYPUSH_N, cursp(), n);
}
pop();
genop_2(s, OP_ARYPUSH, cursp(), n);
push();
}
n = 0;
......@@ -1543,12 +1542,7 @@ gen_values(codegen_scope *s, node *t, int val, int extra, int limit)
pop();
if (n > 0) {
pop_n(n);
if (n == 1) {
genop_1(s, OP_ARYPUSH, cursp());
}
else {
genop_2(s, OP_ARYPUSH_N, cursp(), n);
}
genop_2(s, OP_ARYPUSH, cursp(), n);
}
return -1; /* variable length */
}
......@@ -1570,7 +1564,7 @@ gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
}
tree = tree->cdr->cdr->car;
if (tree) {
n = gen_values(s, tree->car, VAL, sp?1:0, CALL_MAXARGS);
n = gen_values(s, tree->car, VAL, sp?1:0, 14);
if (n < 0) {
n = noop = sendv = 1;
push();
......@@ -1580,7 +1574,7 @@ gen_call(codegen_scope *s, node *tree, mrb_sym name, int sp, int val, int safe)
if (sendv) {
gen_move(s, cursp(), sp, 0);
pop();
genop_1(s, OP_ARYPUSH, cursp());
genop_2(s, OP_ARYPUSH, cursp(), 1);
push();
}
else {
......@@ -1825,7 +1819,7 @@ gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val)
pop_n(i);
if (gen) {
pop();
genop_2(s, OP_ARYPUSH_N, cursp(), i);
genop_2(s, OP_ARYPUSH, cursp(), i);
}
else {
genop_2(s, OP_ARRAY, cursp(), i);
......@@ -1844,7 +1838,7 @@ gen_literal_array(codegen_scope *s, node *tree, mrb_bool sym, int val)
pop_n(i);
if (gen) {
pop();
genop_2(s, OP_ARYPUSH_N, cursp(), i);
genop_2(s, OP_ARYPUSH, cursp(), i);
}
else {
genop_2(s, OP_ARRAY, cursp(), i);
......@@ -2404,7 +2398,9 @@ codegen(codegen_scope *s, node *tree, int val)
{
int len = 0;
mrb_bool update = FALSE;
int slimit = GEN_LIT_ARY_MAX;
if (cursp() >= GEN_LIT_ARY_MAX) slimit = INT16_MAX;
while (tree) {
if (nint(tree->car->car->car) == NODE_KW_REST_ARGS) {
if (len > 0) {
......@@ -2433,7 +2429,7 @@ codegen(codegen_scope *s, node *tree, int val)
len++;
}
tree = tree->cdr;
if (val && cursp() > 127) {
if (val && cursp() >= slimit) {
pop_n(len*2);
if (!update) {
genop_2(s, OP_HASH, cursp(), len);
......@@ -2593,7 +2589,7 @@ codegen(codegen_scope *s, node *tree, int val)
idx = new_sym(s, nsym(n->cdr->car));
base = cursp()-1;
if (n->cdr->cdr->car) {
nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 1, CALL_MAXARGS);
nargs = gen_values(s, n->cdr->cdr->car->car, VAL, 1, 14);
if (nargs >= 0) {
callargs = nargs;
}
......@@ -2638,7 +2634,7 @@ codegen(codegen_scope *s, node *tree, int val)
if (nint(tree->car->car) == NODE_CALL) {
if (callargs == CALL_MAXARGS) {
pop();
genop_1(s, OP_ARYPUSH, cursp());
genop_2(s, OP_ARYPUSH, cursp(), 1);
}
else {
pop_n(callargs);
......@@ -2695,7 +2691,7 @@ codegen(codegen_scope *s, node *tree, int val)
}
if (callargs == CALL_MAXARGS) {
pop();
genop_1(s, OP_ARYPUSH, cursp());
genop_2(s, OP_ARYPUSH, cursp(), 1);
}
else {
pop_n(callargs);
......@@ -2726,7 +2722,7 @@ codegen(codegen_scope *s, node *tree, int val)
if (tree) {
node *args = tree->car;
if (args) {
n = gen_values(s, args, VAL, 0, CALL_MAXARGS);
n = gen_values(s, args, VAL, 0, 14);
if (n < 0) {
n = noop = sendv = 1;
push();
......@@ -2807,7 +2803,7 @@ codegen(codegen_scope *s, node *tree, int val)
if (ainfo < 0) codegen_error(s, "invalid yield (SyntaxError)");
push();
if (tree) {
n = gen_values(s, tree, VAL, 0, CALL_MAXARGS);
n = gen_values(s, tree, VAL, 0, 14);
if (n < 0) {
n = sendv = 1;
push();
......
src/codedump.c
View file @ 8bfa9997
......@@ -431,12 +431,8 @@ codedump(mrb_state *mrb, const mrb_irep *irep)
printf("OP_ARYCAT\tR%d\tR%d\t", a, a+1);
print_lv_a(mrb, irep, a);
break;
CASE(OP_ARYPUSH, B):
printf("OP_ARYPUSH\tR%d\t", a);
print_lv_a(mrb, irep, a);
break;
CASE(OP_ARYPUSH_N, BB):
printf("OP_ARYPUSH_N\tR%d\t%d\t", a, b);
CASE(OP_ARYPUSH, BB):
printf("OP_ARYPUSH\tR%d\t%d\t", a, b);
print_lv_a(mrb, irep, a);
break;
CASE(OP_ARYDUP, B):
......
src/vm.c
View file @ 8bfa9997
......@@ -2546,12 +2546,7 @@ RETRY_TRY_BLOCK:
NEXT;
}
CASE(OP_ARYPUSH, B) {
mrb_ary_push(mrb, regs[a], regs[a+1]);
NEXT;
}
CASE(OP_ARYPUSH_N, BB) {
CASE(OP_ARYPUSH, BB) {
for (mrb_int i=0; i<b; i++) {
mrb_ary_push(mrb, regs[a], regs[a+i+1]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment