gwj / at91sam9263 · Commits

Commit fbe73008f23e8d582bdface53c5015ccc7fed62f

Authored by Baojun Wang
Committed by Aurelien Jarno
1 parent 22555301

ppc tcg: fix wrong bit/mask of wrteei 

Signed-off-by: Baojun Wang <wangbj@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
target-ppc/translate.c
  View file @fbe7300
@@ -5935,7 +5935,7 @@ static void gen_wrteei(DisasContext *ctx) @@ -5935,7 +5935,7 @@ static void gen_wrteei(DisasContext *ctx)
5935 gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); 5935 gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC);
5936 return; 5936 return;
5937 } 5937 }
5938 - if (ctx->opcode & 0x00010000) { 5938 + if (ctx->opcode & 0x00008000) {
5939 tcg_gen_ori_tl(cpu_msr, cpu_msr, (1 << MSR_EE)); 5939 tcg_gen_ori_tl(cpu_msr, cpu_msr, (1 << MSR_EE));
5940 /* Stop translation to have a chance to raise an exception */ 5940 /* Stop translation to have a chance to raise an exception */
5941 gen_stop_exception(ctx); 5941 gen_stop_exception(ctx);
@@ -8158,7 +8158,7 @@ GEN_HANDLER2(tlbre_440, &quot;tlbre&quot;, 0x1F, 0x12, 0x1D, 0x00000001, PPC_BOOKE), @@ -8158,7 +8158,7 @@ GEN_HANDLER2(tlbre_440, &quot;tlbre&quot;, 0x1F, 0x12, 0x1D, 0x00000001, PPC_BOOKE),
8158 GEN_HANDLER2(tlbsx_440, "tlbsx", 0x1F, 0x12, 0x1C, 0x00000000, PPC_BOOKE), 8158 GEN_HANDLER2(tlbsx_440, "tlbsx", 0x1F, 0x12, 0x1C, 0x00000000, PPC_BOOKE),
8159 GEN_HANDLER2(tlbwe_440, "tlbwe", 0x1F, 0x12, 0x1E, 0x00000001, PPC_BOOKE), 8159 GEN_HANDLER2(tlbwe_440, "tlbwe", 0x1F, 0x12, 0x1E, 0x00000001, PPC_BOOKE),
8160 GEN_HANDLER(wrtee, 0x1F, 0x03, 0x04, 0x000FFC01, PPC_WRTEE), 8160 GEN_HANDLER(wrtee, 0x1F, 0x03, 0x04, 0x000FFC01, PPC_WRTEE),
8161 -GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000EFC01, PPC_WRTEE), 8161 +GEN_HANDLER(wrteei, 0x1F, 0x03, 0x05, 0x000E7C01, PPC_WRTEE),
8162 GEN_HANDLER(dlmzb, 0x1F, 0x0E, 0x02, 0x00000000, PPC_440_SPEC), 8162 GEN_HANDLER(dlmzb, 0x1F, 0x0E, 0x02, 0x00000000, PPC_440_SPEC),
8163 GEN_HANDLER(mbar, 0x1F, 0x16, 0x1a, 0x001FF801, PPC_BOOKE), 8163 GEN_HANDLER(mbar, 0x1F, 0x16, 0x1a, 0x001FF801, PPC_BOOKE),
8164 GEN_HANDLER(msync, 0x1F, 0x16, 0x12, 0x03FFF801, PPC_BOOKE), 8164 GEN_HANDLER(msync, 0x1F, 0x16, 0x12, 0x03FFF801, PPC_BOOKE),