ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix branch delay slot cornercases. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2615 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-04-05 23:21:37 +00:00
parent 5a63bcb2d2
commit c53f4a62e3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-mips/helper.c
View File

@ -387,7 +387,6 @@ void do_interrupt (CPUState *env)
come back to the jump. */ come back to the jump. */
env->CP0_EPC = env->PC - 4; env->CP0_EPC = env->PC - 4;
env->CP0_Cause |= (1 << CP0Ca_BD); env->CP0_Cause |= (1 << CP0Ca_BD);
env->hflags &= ~MIPS_HFLAG_BMASK;
} else { } else {
env->CP0_EPC = env->PC; env->CP0_EPC = env->PC;
env->CP0_Cause &= ~(1 << CP0Ca_BD); env->CP0_Cause &= ~(1 << CP0Ca_BD);
@ -395,6 +394,7 @@ void do_interrupt (CPUState *env)
env->CP0_Status |= (1 << CP0St_EXL); env->CP0_Status |= (1 << CP0St_EXL);
env->hflags &= ~MIPS_HFLAG_UM; env->hflags &= ~MIPS_HFLAG_UM;
} }
env->hflags &= ~MIPS_HFLAG_BMASK;
if (env->CP0_Status & (1 << CP0St_BEV)) { if (env->CP0_Status & (1 << CP0St_BEV)) {
env->PC = (int32_t)0xBFC00200; env->PC = (int32_t)0xBFC00200;
} else { } else {

7
target-mips/translate.c
View File

@ -1640,6 +1640,10 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,
likely: likely:
ctx->hflags |= MIPS_HFLAG_BL; ctx->hflags |= MIPS_HFLAG_BL;
break; break;
default:
MIPS_INVAL("conditional branch/jump");
generate_exception(ctx, EXCP_RI);
return;
} }
gen_op_set_bcond(); gen_op_set_bcond();
} }
@ -1650,7 +1654,6 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,
gen_op_set_T0(ctx->pc + 8); gen_op_set_T0(ctx->pc + 8);
gen_op_store_T0_gpr(blink); gen_op_store_T0_gpr(blink);
} }
return;
} }
/* special3 bitfield operations */ /* special3 bitfield operations */
@ -5053,7 +5056,7 @@ static void decode_opc (CPUState *env, DisasContext *ctx)
break; break;
} }
if (ctx->hflags & MIPS_HFLAG_BMASK) { if (ctx->hflags & MIPS_HFLAG_BMASK) {
int hflags = ctx->hflags; int hflags = ctx->hflags & MIPS_HFLAG_BMASK;
/* Branches completion */ /* Branches completion */
ctx->hflags &= ~MIPS_HFLAG_BMASK; ctx->hflags &= ~MIPS_HFLAG_BMASK;
ctx->bstate = BS_BRANCH; ctx->bstate = BS_BRANCH;