gwj / at91sam9263 · Commits

Commit 271a916e8a4188b0ec94bafff18aa93de0047820

Authored by j_mayer
1 parent 3e4587d5

Fix invalid PowerPC 64 rldimi optimized case. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3638 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 5 deletions
target-ppc/translate.c
  View file @271a916
@@ -1606,17 +1606,15 @@ GEN_PPC64_R2(rldcr, 0x1E, 0x09); @@ -1606,17 +1606,15 @@ GEN_PPC64_R2(rldcr, 0x1E, 0x09);
1606 static always_inline void gen_rldimi (DisasContext *ctx, int mbn, int shn) 1606 static always_inline void gen_rldimi (DisasContext *ctx, int mbn, int shn)
1607 { 1607 {
1608 uint64_t mask; 1608 uint64_t mask;
1609 - uint32_t sh, mb; 1609 + uint32_t sh, mb, me;
1610 1610
1611 sh = SH(ctx->opcode) | (shn << 5); 1611 sh = SH(ctx->opcode) | (shn << 5);
1612 mb = MB(ctx->opcode) | (mbn << 5); 1612 mb = MB(ctx->opcode) | (mbn << 5);
  1613 + me = 63 - sh;
1613 if (likely(sh == 0)) { 1614 if (likely(sh == 0)) {
1614 if (likely(mb == 0)) { 1615 if (likely(mb == 0)) {
1615 gen_op_load_gpr_T0(rS(ctx->opcode)); 1616 gen_op_load_gpr_T0(rS(ctx->opcode));
1616 goto do_store; 1617 goto do_store;
1617 - } else if (likely(mb == 63)) {  
1618 - gen_op_load_gpr_T0(rA(ctx->opcode));  
1619 - goto do_store;  
1620 } 1618 }
1621 gen_op_load_gpr_T0(rS(ctx->opcode)); 1619 gen_op_load_gpr_T0(rS(ctx->opcode));
1622 gen_op_load_gpr_T1(rA(ctx->opcode)); 1620 gen_op_load_gpr_T1(rA(ctx->opcode));
@@ -1626,7 +1624,7 @@ static always_inline void gen_rldimi (DisasContext *ctx, int mbn, int shn) @@ -1626,7 +1624,7 @@ static always_inline void gen_rldimi (DisasContext *ctx, int mbn, int shn)
1626 gen_op_load_gpr_T1(rA(ctx->opcode)); 1624 gen_op_load_gpr_T1(rA(ctx->opcode));
1627 gen_op_rotli64_T0(sh); 1625 gen_op_rotli64_T0(sh);
1628 do_mask: 1626 do_mask:
1629 - mask = MASK(mb, 63 - sh); 1627 + mask = MASK(mb, me);
1630 gen_andi_T0_64(ctx, mask); 1628 gen_andi_T0_64(ctx, mask);
1631 gen_andi_T1_64(ctx, ~mask); 1629 gen_andi_T1_64(ctx, ~mask);
1632 gen_op_or(); 1630 gen_op_or();