target/ppc: Make divd[u] handler method decodetree compatible
PATCH v2 2/2 target/ppc: Make divd[u] handler method decodetree compatible
In reply to Ilya LeoshkevichThis is like commit 86e6202a57b1 ("target/ppc: Make divw[u] handler method decodetree compatible."), but for gen_op_arith_divd().
--- target/ppc/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/ppc/translate.c +1 -1
@@ -1823,7 +1823,7 @@ static inline void gen_op_arith_divd(DisasContext *ctx, TCGv ret,tcg_gen_or_tl (cpu_so, cpu_so, cpu_ov); } -if (unlikely (Rc (ctx->opcode) !=0 )) { +if (unlikely (compute_rc0)) {gen_set_Rc0 (ctx, ret); } }
Signature · 1 line
2.45.2
v2 cover target/ppc: Make divd[u] handler method decodetree compatible
v1: https://lore.kernel.org/qemu-devel/[email protected]/
v1 -> v2: Add R-bs and a targeted divd[u] patch.
Hi,
This series contains two fixes for the same issue: divd[u] touching uninitialized ctx->opcode.
Patch 1 is a catch-all solution for all issues in this class. IMHO it's worth having something like this until the legacy decoder is fully eliminated.
Patch 2 is a targeted fix for divd[u] only.
Best regards,
Ilya
Ilya Leoshkevich (2):
target/ppc: Set ctx->opcode for decode_insn32() target/ppc: Make divd[u] handler method decodetree compatible
target/ppc/translate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Signature · 1 line
2.45.2
PATCH v2 1/2 target/ppc: Set ctx->opcode for decode_insn32()
divdu (without a dot) sometimes updates cr0, even though it shouldn't. The reason is that gen_op_arith_divd() checks Rc(ctx->opcode), which is not initialized. This field is initialized only for instructions that go through decode_legacy(), and not decodetree.
There already was a similar issue fixed in commit 86e6202a57b1 ("target/ppc: Make divw[u] handler method decodetree compatible.").
It's not immediately clear what else may access the uninitialized ctx->opcode, so instead of playing whack-a-mole and changing the check to compute_rc0, simply initialize ctx->opcode.
--- target/ppc/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/ppc/translate.c +1 -2
@@ -6426,8 +6426,6 @@ static bool decode_legacy(PowerPCCPU *cpu, DisasContext *ctx, uint32_t insn)opc_handler_t **table, *handler;uint32_t inval; - ctx->opcode = insn; -LOG_DISAS ("translate opcode %08x (%02x %02x %02x %02x) (%s)\n" , insn,opc1 (insn),opc2 (insn),opc3 (insn),opc4 (insn), ctx->le_mode ?"little" :"big" );
@@ -6561,6 +6559,7 @@ static void ppc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) ctx->base.pc_next = pc +=4 ;if (!is_prefix_insn (ctx, insn)) { + ctx->opcode = insn; ok = (decode_insn32 (ctx, insn) ||decode_legacy (cpu, ctx, insn)); }else if ((pc &63 ) ==0 ) {
Signature · 1 line
2.45.2
Quoted 14 lines · Ilya Leoshkevich
This is like commit
86e6202a57b1("target/ppc: Make divw[u] handler method decodetree compatible."), but forgen_op_arith_divd().Suggested-by Richard Henderson <[email protected]>Signed-off-by Ilya Leoshkevich <[email protected]>--- target/ppc/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/ppc/translate.c +0
-0
target/ppc/translate.c static inline void gen_op_arith_divd(DisasContext *ctx, TCGv ret, · line 1829
Quoted 8 lines
target/ppc/translate.c +1
-1@@ -1823,7 +1823,7 @@ static inline void gen_op_arith_divd(DisasContext *ctx, TCGv ret,tcg_gen_or_tl (cpu_so, cpu_so, cpu_ov); } -if (unlikely (Rc (ctx->opcode) !=0 )) { +if (unlikely (compute_rc0)) {gen_set_Rc0 (ctx, ret); } }
r~
Quoted 8 lines · Ilya Leoshkevich
This is like commit
86e6202a57b1("target/ppc: Make divw[u] handler method decodetree compatible."), but forgen_op_arith_divd().Suggested-by Richard Henderson <[email protected]>Signed-off-by Ilya Leoshkevich <[email protected]>--- target/ppc/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PING: [PATCH v2 0/2] target/ppc: Make divd[u] handler method decodetree compatible
In reply to Ilya LeoshkevichQuoted 18 lines · Ilya Leoshkevich
v1:
https://lore.kernel.org/qemu-devel/[email protected]/
v1 -> v2: Add R-bs and a targeted divd[u] patch.Hi,
This series contains two fixes for the same issue: divd[u] touching uninitialized
ctx->opcode.Patch 1 is a catch-all solution for all issues in this class. IMHO it's worth having something like this until the legacy decoder is fully eliminated.
Patch 2 is a targeted fix for divd[u] only.
Best regards,
Ilya
Quoted 6 lines
Ilya Leoshkevich (2):
target/ppc: Setctx->opcodefordecode_insn32()target/ppc: Make divd[u] handler method decodetree compatibletarget/ppc/translate.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Ping.
Nicholas Piggin
Reviewed-byRe: PING: [PATCH v2 0/2] target/ppc: Make divd[u] handler method decodetree compatible
Quoted 19 lines · Ilya Leoshkevich
Quoted 18 lines · Ilya Leoshkevich
v1:
https://lore.kernel.org/qemu-devel/[email protected]/
v1 -> v2: Add R-bs and a targeted divd[u] patch.Hi,
This series contains two fixes for the same issue: divd[u] touching uninitialized
ctx->opcode.Patch 1 is a catch-all solution for all issues in this class. IMHO it's worth having something like this until the legacy decoder is fully eliminated.
Patch 2 is a targeted fix for divd[u] only.
Best regards,
Ilya
Quoted 8 lines
Quoted 6 lines
Ilya Leoshkevich (2):
target/ppc: Setctx->opcodefordecode_insn32()target/ppc: Make divd[u] handler method decodetree compatibletarget/ppc/translate.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)Ping.
Hey Ilya,
Sorry for the late reply, had some time off and taken me a while to get back to it.
Yeah this is a good fix, thank you. I have queued it.
Thanks,
Nick