ppc patch queue 2013-05-08
Hi Blue / Aurelien,
This is my current patch queue for ppc with fixes that need to go into 1.5.
Please pull.
Alex
The following changes since commit c0f5f9ce86ddca0a7d7ca60012059a5a18aa9c07:
Petar Jovanovic (1):
target-mips: fix incorrect behaviour for INSV
are available in the git repository at:
git://github.com/agraf/qemu.git ppc-for-upstream
Alexander Graf (2):
PPC: Fix rldcl
PPC: Depend behavior of cmp instructions only on instruction encoding
target-ppc/translate.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-)
PATCH 1/2 PPC: Fix rldcl
The implementation for rldcl tried to always fetch its parameters from the opcode, even though the opcode was already passed in in decoded and different forms.
Use the parameters instead, fixing rldcl.
--- target-ppc/translate.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
target-ppc/translate.c +0 -2
@@ -1733,8 +1733,6 @@ static inline void gen_rldnm(DisasContext *ctx, uint32_t mb, uint32_t me) {TCGv t0; - mb =MB (ctx->opcode); - me =ME (ctx->opcode); t0 =tcg_temp_new ();tcg_gen_andi_tl (t0, cpu_gpr[rB (ctx->opcode)],0x3f );tcg_gen_rotl_tl (t0, cpu_gpr[rS (ctx->opcode)], t0);
Signature · 1 line
1.6.0.2
PATCH 2/2 PPC: Depend behavior of cmp instructions only on instruction encoding
In reply to Alexander GrafWhen running an L=1 cmp instruction on a 64bit PPC CPU with SF off, it still behaves identical to what it does when SF is on. Remove the implicit difference in the code.
Also, on most 32bit CPUs we should always treat the compare as 32bit compare, as the CPU will ignore the L bit. This is not true for e500mc, but that's up for a different patch.
--- target-ppc/translate.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
target-ppc/translate.c +16 -16
@@ -675,48 +675,48 @@ static inline void gen_set_Rc0(DisasContext *ctx, TCGv reg)/* cmp */ static void gen_cmp (DisasContext *ctx) { -if (NARROW_MODE (ctx) || !(ctx->opcode &0x00200000 )) { -gen_op_cmp32 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)], -1 ,crfD (ctx->opcode)); - }else { +if ((ctx->opcode &0x00200000 ) && (ctx->insns_flags &PPC_64B )) {gen_op_cmp (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)],1 ,crfD (ctx->opcode)); + }else { +gen_op_cmp32 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)], +1 ,crfD (ctx->opcode)); } }/* cmpi */ static void gen_cmpi (DisasContext *ctx) { -if (NARROW_MODE (ctx) || !(ctx->opcode &0x00200000 )) { -gen_op_cmpi32 (cpu_gpr[rA (ctx->opcode)],SIMM (ctx->opcode), -1 ,crfD (ctx->opcode)); - }else { +if ((ctx->opcode &0x00200000 ) && (ctx->insns_flags &PPC_64B )) {gen_op_cmpi (cpu_gpr[rA (ctx->opcode)],SIMM (ctx->opcode),1 ,crfD (ctx->opcode)); + }else { +gen_op_cmpi32 (cpu_gpr[rA (ctx->opcode)],SIMM (ctx->opcode), +1 ,crfD (ctx->opcode)); } }/* cmpl */ static void gen_cmpl (DisasContext *ctx) { -if (NARROW_MODE (ctx) || !(ctx->opcode &0x00200000 )) { -gen_op_cmp32 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)], -0 ,crfD (ctx->opcode)); - }else { +if ((ctx->opcode &0x00200000 ) && (ctx->insns_flags &PPC_64B )) {gen_op_cmp (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)],0 ,crfD (ctx->opcode)); + }else { +gen_op_cmp32 (cpu_gpr[rA (ctx->opcode)], cpu_gpr[rB (ctx->opcode)], +0 ,crfD (ctx->opcode)); } }/* cmpli */ static void gen_cmpli (DisasContext *ctx) { -if (NARROW_MODE (ctx) || !(ctx->opcode &0x00200000 )) { -gen_op_cmpi32 (cpu_gpr[rA (ctx->opcode)],UIMM (ctx->opcode), -0 ,crfD (ctx->opcode)); - }else { +if ((ctx->opcode &0x00200000 ) && (ctx->insns_flags &PPC_64B )) {gen_op_cmpi (cpu_gpr[rA (ctx->opcode)],UIMM (ctx->opcode),0 ,crfD (ctx->opcode)); + }else { +gen_op_cmpi32 (cpu_gpr[rA (ctx->opcode)],UIMM (ctx->opcode), +0 ,crfD (ctx->opcode)); } }
Signature · 1 line
1.6.0.2
Quoted 15 lines · Alexander Graf
Hi Blue / Aurelien,
This is my current patch queue for ppc with fixes that need to go into 1.5.
Please pull.
Alex
The following changes since commit
c0f5f9ce86ddca0a7d7ca60012059a5a18aa9c07:
Petar Jovanovic (1):
target-mips: fix incorrect behaviour for INSVare available in the git repository at:
Quoted 9 lines
git://github.com/agraf/qemu.gitppc-for-upstreamAlexander Graf (2):
PPC: Fix rldcl
PPC: Depend behavior of cmp instructions only on instruction encodingtarget-ppc/translate.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-)
Thanks, pulled.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net