mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-26 21:20:30 +02:00
Code Activity

Add extra argument to jit_update to prevent recursion on branches

Browse source 
* lib/lightning.c: Avoid deep recursions when computing live
	register ranges.
This commit is contained in:
pcpa 2018-01-31 17:09:29 -05:00
parent 68dc475474
commit 59f32e85c3
2 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2018-01-31 Paulo Andrade <pcpa@gnu.org>
* lib/lightning.c: Avoid deep recursions when computing live
register ranges.
2018-01-31 Paulo Andrade <pcpa@gnu.org> 2018-01-31 Paulo Andrade <pcpa@gnu.org>
* lib/jit_mips-cpu.c: Correct frame size and varargs * lib/jit_mips-cpu.c: Correct frame size and varargs

24
lib/lightning.c
View file

@ -91,10 +91,10 @@ _jit_dataset(jit_state_t *_jit);
static void static void
_jit_setup(jit_state_t *_jit, jit_block_t *block); _jit_setup(jit_state_t *_jit, jit_block_t *block);
#define jit_update(node, live, mask) _jit_update(_jit, node, live, mask) #define jit_update(node, live, mask, r) _jit_update(_jit, node, live, mask, r)
static void static void
_jit_update(jit_state_t *_jit, jit_node_t *node, _jit_update(jit_state_t *_jit, jit_node_t *node,
jit_regset_t *live, jit_regset_t *mask); jit_regset_t *live, jit_regset_t *mask, jit_bool_t recurse);
#define thread_jumps() _thread_jumps(_jit) #define thread_jumps() _thread_jumps(_jit)
static void static void
@ -1574,7 +1574,7 @@ _jit_optimize(jit_state_t *_jit)
continue; continue;
if (block->label->code != jit_code_epilog) { if (block->label->code != jit_code_epilog) {
jit_regset_set(&_jitc->regmask, &block->regmask); jit_regset_set(&_jitc->regmask, &block->regmask);
jit_update(block->label->next, &block->reglive, &_jitc->regmask); jit_update(block->label->next, &block->reglive, &_jitc->regmask, 1);
} }
} }
/* do a second pass from start to properly handle some conditions /* do a second pass from start to properly handle some conditions
@ -1587,7 +1587,7 @@ _jit_optimize(jit_state_t *_jit)
continue; continue;
if (block->label->code != jit_code_epilog) { if (block->label->code != jit_code_epilog) {
jit_regset_set(&_jitc->regmask, &block->setmask); jit_regset_set(&_jitc->regmask, &block->setmask);
jit_update(block->label->next, &block->reglive, &_jitc->regmask); jit_update(block->label->next, &block->reglive, &_jitc->regmask, 1);
} }
} }
@ -1767,7 +1767,7 @@ _jit_reglive(jit_state_t *_jit, jit_node_t *node)
} }
if (jit_regset_set_p(&_jitc->regmask)) { if (jit_regset_set_p(&_jitc->regmask)) {
bmp_zero(); bmp_zero();
jit_update(node->next, &_jitc->reglive, &_jitc->regmask); jit_update(node->next, &_jitc->reglive, &_jitc->regmask, 1);
if (jit_regset_set_p(&_jitc->regmask)) { if (jit_regset_set_p(&_jitc->regmask)) {
/* any unresolved live state is considered as live */ /* any unresolved live state is considered as live */
jit_regset_ior(&_jitc->reglive, jit_regset_ior(&_jitc->reglive,
@ -2193,7 +2193,7 @@ _jit_setup(jit_state_t *_jit, jit_block_t *block)
*/ */
static void static void
_jit_update(jit_state_t *_jit, jit_node_t *node, _jit_update(jit_state_t *_jit, jit_node_t *node,
jit_regset_t *live, jit_regset_t *mask) jit_regset_t *live, jit_regset_t *mask, jit_bool_t recurse)
{ {
jit_int32_t spec; jit_int32_t spec;
jit_int32_t regno; jit_int32_t regno;
@ -2313,8 +2313,14 @@ _jit_update(jit_state_t *_jit, jit_node_t *node,
if (jit_regset_set_p(mask) == 0) if (jit_regset_set_p(mask) == 0)
return; return;
/* restore mask if branch is conditional */ /* restore mask if branch is conditional */
jit_regset_set(&zmask, mask); if (recurse) {
jit_update(block->label->next, live, &zmask); jit_regset_set(&zmask, mask);
jit_update(block->label->next, live, &zmask, 0);
}
else {
node = block->label->next;
goto restart;
}
jit_regset_xor(&ztmp, &zmask, mask); jit_regset_xor(&ztmp, &zmask, mask);
/* remove known live registers from mask */ /* remove known live registers from mask */
if (jit_regset_set_p(&ztmp)) { if (jit_regset_set_p(&ztmp)) {
@ -3124,7 +3130,7 @@ _spill_reglive_p(jit_state_t *_jit, jit_node_t *node, jit_int32_t regno)
if (!jit_regset_tstbit(&_jitc->reglive, regno)) { if (!jit_regset_tstbit(&_jitc->reglive, regno)) {
bmp_zero(); bmp_zero();
jit_regset_setbit(&_jitc->regmask, regno); jit_regset_setbit(&_jitc->regmask, regno);
jit_update(node->next, &_jitc->reglive, &_jitc->regmask); jit_update(node->next, &_jitc->reglive, &_jitc->regmask, 1);
if (!jit_regset_tstbit(&_jitc->reglive, regno) && if (!jit_regset_tstbit(&_jitc->reglive, regno) &&
register_change_p(node->next, node->link, regno) != jit_reg_change) register_change_p(node->next, node->link, regno) != jit_reg_change)
return (0); return (0);