1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-18 18:40:22 +02:00

Correct logic error with jit_live in jit_retr

* lib/jit_aarch64.c, lib/jit_alpha.c, lib/jit_arm.c,
	lib/jit_mips.c, lib/jit_ppc.c, lib/jit_sparc.c, lib/jit_x86.c:
	Correct wrong logic in usage of jit_live in jit_retr. The
	problem is that if a temporary is required during epilog,
	the return register might be allocated, so, jit_live must always
	be used.
This commit is contained in:
Paulo Andrade 2018-02-22 13:05:04 -03:00
parent 59f32e85c3
commit 2cf092efe4
8 changed files with 17 additions and 15 deletions

View file

@ -1,3 +1,12 @@
2018-02-22 Paulo Andrade <pcpa@gnu.org>
* lib/jit_aarch64.c, lib/jit_alpha.c, lib/jit_arm.c,
lib/jit_mips.c, lib/jit_ppc.c, lib/jit_sparc.c, lib/jit_x86.c:
Correct wrong logic in usage of jit_live in jit_retr. The
problem is that if a temporary is required during epilog,
the return register might be allocated, so, jit_live must always
be used.
2018-01-31 Paulo Andrade <pcpa@gnu.org> 2018-01-31 Paulo Andrade <pcpa@gnu.org>
* lib/lightning.c: Avoid deep recursions when computing live * lib/lightning.c: Avoid deep recursions when computing live

View file

@ -263,8 +263,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }

View file

@ -251,8 +251,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }
@ -329,7 +328,7 @@ _jit_arg_register_p(jit_state_t *_jit, jit_node_t *u)
void void
_jit_ellipsis(jit_state_t *_jit) _jit_ellipsis(jit_state_t *_jit)
{ {
jit_inc_synth(jit_code_ellipsis); jit_inc_synth(ellipsis);
if (_jitc->prepare) { if (_jitc->prepare) {
jit_link_prepare(); jit_link_prepare();
assert(!(_jitc->function->call.call & jit_call_varargs)); assert(!(_jitc->function->call.call & jit_call_varargs));

View file

@ -331,8 +331,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }

View file

@ -264,8 +264,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }

View file

@ -246,8 +246,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }

View file

@ -205,8 +205,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(retr, u); jit_inc_synth_w(retr, u);
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }

View file

@ -507,8 +507,7 @@ _jit_retr(jit_state_t *_jit, jit_int32_t u)
if (JIT_RET != u) if (JIT_RET != u)
jit_movr(JIT_RET, u); jit_movr(JIT_RET, u);
/* explicitly tell it is live */ /* explicitly tell it is live */
else jit_live(JIT_RET);
jit_live(JIT_RET);
jit_ret(); jit_ret();
jit_dec_synth(); jit_dec_synth();
} }