| Message ID | 20231108204739.279972-1-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [for-8.2] target/sparc: Fix RETURN | expand |
On 8/11/23 21:47, Richard Henderson wrote: > Perform window restore before pc update. Required in order > to recognize any window underflow trap with the current pc. > > Fixes: 86b82fe021f4 ("target/sparc: Move JMPL, RETT, RETURN to decodetree") > Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/sparc/translate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/sparc/translate.c b/target/sparc/translate.c > index 6fc333a6b8..9387299559 100644 > --- a/target/sparc/translate.c > +++ b/target/sparc/translate.c > @@ -4096,12 +4096,12 @@ TRANS(RETT, 32, do_add_special, a, do_rett) > static bool do_return(DisasContext *dc, int rd, TCGv src) > { > gen_check_align(dc, src, 3); > + gen_helper_restore(tcg_env); > > gen_mov_pc_npc(dc); > tcg_gen_mov_tl(cpu_npc, src); > gen_address_mask(dc, cpu_npc); > > - gen_helper_restore(tcg_env); Ahah! I noticed that earlier in a late review, wondered why you moved that gen_helper_restore() call after updating $nPC, but my SPARC is now rusty so I was sure I was missing something. Too shy to ask :/ Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > dc->npc = DYNAMIC_PC_LOOKUP; > return true; > }
On 08/11/2023 20:47, Richard Henderson wrote: > Perform window restore before pc update. Required in order > to recognize any window underflow trap with the current pc. > > Fixes: 86b82fe021f4 ("target/sparc: Move JMPL, RETT, RETURN to decodetree") > Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/sparc/translate.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/sparc/translate.c b/target/sparc/translate.c > index 6fc333a6b8..9387299559 100644 > --- a/target/sparc/translate.c > +++ b/target/sparc/translate.c > @@ -4096,12 +4096,12 @@ TRANS(RETT, 32, do_add_special, a, do_rett) > static bool do_return(DisasContext *dc, int rd, TCGv src) > { > gen_check_align(dc, src, 3); > + gen_helper_restore(tcg_env); > > gen_mov_pc_npc(dc); > tcg_gen_mov_tl(cpu_npc, src); > gen_address_mask(dc, cpu_npc); > > - gen_helper_restore(tcg_env); > dc->npc = DYNAMIC_PC_LOOKUP; > return true; > } Thanks Richard! I've tried booting the FreeBSD ISO several times with this patch applied, and haven't seen a single failure so: Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 6fc333a6b8..9387299559 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -4096,12 +4096,12 @@ TRANS(RETT, 32, do_add_special, a, do_rett) static bool do_return(DisasContext *dc, int rd, TCGv src) { gen_check_align(dc, src, 3); + gen_helper_restore(tcg_env); gen_mov_pc_npc(dc); tcg_gen_mov_tl(cpu_npc, src); gen_address_mask(dc, cpu_npc); - gen_helper_restore(tcg_env); dc->npc = DYNAMIC_PC_LOOKUP; return true; }
Perform window restore before pc update. Required in order to recognize any window underflow trap with the current pc. Fixes: 86b82fe021f4 ("target/sparc: Move JMPL, RETT, RETURN to decodetree") Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/sparc/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)