1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compile.c: instruction ID predicate

Browse Source 
* compile.c (IS_INSN_ID): add instruction ID predicate macro.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-04-23 11:43:52 +00:00
parent 6871d400eb
commit 12ef609f5e
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
compile.c
View File

@ -314,6 +314,7 @@ r_value(VALUE value)
#define IS_INSN(link) ((link)->type == ISEQ_ELEMENT_INSN) #define IS_INSN(link) ((link)->type == ISEQ_ELEMENT_INSN)
#define IS_LABEL(link) ((link)->type == ISEQ_ELEMENT_LABEL) #define IS_LABEL(link) ((link)->type == ISEQ_ELEMENT_LABEL)
#define IS_ADJUST(link) ((link)->type == ISEQ_ELEMENT_ADJUST) #define IS_ADJUST(link) ((link)->type == ISEQ_ELEMENT_ADJUST)
#define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn))
/* error */ /* error */
typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...); typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...);
@ -2022,7 +2023,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
{ {
INSN *iobj = (INSN *)list; INSN *iobj = (INSN *)list;
again: again:
if (iobj->insn_id == BIN(jump)) { if (IS_INSN_ID(iobj, jump)) {
INSN *niobj, *diobj, *piobj; INSN *niobj, *diobj, *piobj;
/* /*
* useless jump elimination: * useless jump elimination:
@ -2047,13 +2048,13 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
unref_destination(iobj, 0); unref_destination(iobj, 0);
REMOVE_ELEM(&iobj->link); REMOVE_ELEM(&iobj->link);
} }
else if (iobj != diobj && diobj->insn_id == BIN(jump) && else if (iobj != diobj && IS_INSN_ID(diobj, jump) &&
OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) { OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
replace_destination(iobj, diobj); replace_destination(iobj, diobj);
remove_unreachable_chunk(iseq, iobj->link.next); remove_unreachable_chunk(iseq, iobj->link.next);
goto again; goto again;
} }
else if (diobj->insn_id == BIN(leave)) { else if (IS_INSN_ID(diobj, leave)) {
/* /*
* jump LABEL * jump LABEL
* ... * ...
@ -2089,10 +2090,10 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
* L2: * L2:
*/ */
else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 && else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
(piobj->insn_id == BIN(branchif) || (IS_INSN_ID(piobj, branchif) ||
piobj->insn_id == BIN(branchunless))) { IS_INSN_ID(piobj, branchunless))) {
if (niobj == (INSN *)get_destination_insn(piobj)) { if (niobj == (INSN *)get_destination_insn(piobj)) {
piobj->insn_id = (piobj->insn_id == BIN(branchif)) piobj->insn_id = (IS_INSN_ID(piobj, branchif))
? BIN(branchunless) : BIN(branchif); ? BIN(branchunless) : BIN(branchif);
replace_destination(piobj, iobj); replace_destination(piobj, iobj);
REMOVE_ELEM(&iobj->link); REMOVE_ELEM(&iobj->link);
@ -2103,13 +2104,13 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
} }
} }
if (iobj->insn_id == BIN(leave)) { if (IS_INSN_ID(iobj, leave)) {
remove_unreachable_chunk(iseq, iobj->link.next); remove_unreachable_chunk(iseq, iobj->link.next);
} }
if (iobj->insn_id == BIN(branchif) || if (IS_INSN_ID(iobj, branchif) ||
iobj->insn_id == BIN(branchnil) || IS_INSN_ID(iobj, branchnil) ||
iobj->insn_id == BIN(branchunless)) { IS_INSN_ID(iobj, branchunless)) {
/* /*
* if L1 * if L1
* ... * ...
@ -2124,15 +2125,15 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
if (pobj) { if (pobj) {
if (!IS_INSN(&pobj->link)) if (!IS_INSN(&pobj->link))
pobj = 0; pobj = 0;
else if (pobj->insn_id == BIN(dup)) else if (IS_INSN_ID(pobj, dup))
prev_dup = 1; prev_dup = 1;
} }
for (;;) { for (;;) {
if (nobj->insn_id == BIN(jump)) { if (IS_INSN_ID(nobj, jump)) {
replace_destination(iobj, nobj); replace_destination(iobj, nobj);
} }
else if (prev_dup && nobj->insn_id == BIN(dup) && else if (prev_dup && IS_INSN_ID(nobj, dup) &&
!!(nobj = (INSN *)nobj->link.next) && !!(nobj = (INSN *)nobj->link.next) &&
/* basic blocks, with no labels in the middle */ /* basic blocks, with no labels in the middle */
nobj->insn_id == iobj->insn_id) { nobj->insn_id == iobj->insn_id) {
@ -2182,18 +2183,18 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
if (prev_dup && IS_INSN(pobj->link.prev)) { if (prev_dup && IS_INSN(pobj->link.prev)) {
pobj = (INSN *)pobj->link.prev; pobj = (INSN *)pobj->link.prev;
} }
if (pobj->insn_id == BIN(putobject)) { if (IS_INSN_ID(pobj, putobject)) {
cond = (iobj->insn_id == BIN(branchif) ? cond = (IS_INSN_ID(iobj, branchif) ?
OPERAND_AT(pobj, 0) != Qfalse : OPERAND_AT(pobj, 0) != Qfalse :
iobj->insn_id == BIN(branchunless) ? IS_INSN_ID(iobj, branchunless) ?
OPERAND_AT(pobj, 0) == Qfalse : OPERAND_AT(pobj, 0) == Qfalse :
FALSE); FALSE);
} }
else if (pobj->insn_id == BIN(putstring)) { else if (IS_INSN_ID(pobj, putstring)) {
cond = iobj->insn_id == BIN(branchif); cond = IS_INSN_ID(iobj, branchif);
} }
else if (pobj->insn_id == BIN(putnil)) { else if (IS_INSN_ID(pobj, putnil)) {
cond = iobj->insn_id != BIN(branchif); cond = !IS_INSN_ID(iobj, branchif);
} }
else break; else break;
REMOVE_ELEM(iobj->link.prev); REMOVE_ELEM(iobj->link.prev);
@ -2212,7 +2213,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
} }
} }
if (iobj->insn_id == BIN(pop)) { if (IS_INSN_ID(iobj, pop)) {
/* /*
* putself / putnil / putobject obj / putstring "..." * putself / putnil / putobject obj / putstring "..."
* pop * pop
@ -2233,10 +2234,10 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
} }
if (do_tailcallopt && if (do_tailcallopt &&
(iobj->insn_id == BIN(send) || (IS_INSN_ID(iobj, send) ||
iobj->insn_id == BIN(opt_aref_with) || IS_INSN_ID(iobj, opt_aref_with) ||
iobj->insn_id == BIN(opt_aset_with) || IS_INSN_ID(iobj, opt_aset_with) ||
iobj->insn_id == BIN(invokesuper))) { IS_INSN_ID(iobj, invokesuper))) {
/* /*
* send ... * send ...
* leave * leave
@ -2268,7 +2269,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
if (piobj) { if (piobj) {
struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0]; struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0];
if (piobj->insn_id == BIN(send) || piobj->insn_id == BIN(invokesuper)) { if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) {
if (piobj->operands[2] == 0) { /* no blockiseq */ if (piobj->operands[2] == 0) { /* no blockiseq */
ci->flag |= VM_CALL_TAILCALL; ci->flag |= VM_CALL_TAILCALL;
} }
@ -2303,13 +2304,13 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
static int static int
iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
{ {
if (iobj->insn_id == BIN(newarray) && iobj->link.next && if (IS_INSN_ID(iobj, newarray) && iobj->link.next &&
IS_INSN(iobj->link.next)) { IS_INSN(iobj->link.next)) {
/* /*
* [a, b, ...].max/min -> a, b, c, opt_newarray_max/min * [a, b, ...].max/min -> a, b, c, opt_newarray_max/min
*/ */
INSN *niobj = (INSN *)iobj->link.next; INSN *niobj = (INSN *)iobj->link.next;
if (niobj->insn_id == BIN(send)) { if (IS_INSN_ID(niobj, send)) {
struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0); struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0);
if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) { if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) {
switch (ci->mid) { switch (ci->mid) {
@ -2326,7 +2327,7 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
} }
} }
if (iobj->insn_id == BIN(send)) { if (IS_INSN_ID(iobj, send)) {
struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0); struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0);
const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 2); const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 2);
@ -3229,7 +3230,7 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
else if (!lhs_splat) { else if (!lhs_splat) {
INSN *last = (INSN*)ret->last; INSN *last = (INSN*)ret->last;
if (IS_INSN(&last->link) && if (IS_INSN(&last->link) &&
last->insn_id == BIN(newarray) && IS_INSN_ID(last, newarray) &&
last->operand_size == 1) { last->operand_size == 1) {
int rlen = FIX2INT(OPERAND_AT(last, 0)); int rlen = FIX2INT(OPERAND_AT(last, 0));
/* special case: assign to aset or attrset */ /* special case: assign to aset or attrset */