xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MIPS: math-emu: Use helpers to manipulate CAUSEF_BD flag.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2014-04-16 01:59:03 +02:00
parent 5a7ebbf893
commit e7e9cae5db
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/mips/math-emu/cp1emu.c
View File

@@ -933,17 +933,17 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
int pc_inc;
/* XXX NEC Vr54xx bug workaround */
if (xcp->cp0_cause & CAUSEF_BD) {
if (delay_slot(xcp)) {
if (dec_insn.micro_mips_mode) {
if (!mm_isBranchInstr(xcp, dec_insn, &contpc))
xcp->cp0_cause &= ~CAUSEF_BD;
clear_delay_slot(xcp);
} else {
if (!isBranchInstr(xcp, dec_insn, &contpc))
xcp->cp0_cause &= ~CAUSEF_BD;
clear_delay_slot(xcp);
}
}
if (xcp->cp0_cause & CAUSEF_BD) {
if (delay_slot(xcp)) {
/*
* The instruction to be emulated is in a branch delay slot
* which means that we have to emulate the branch instruction
@@ -1178,7 +1178,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
case bc_op:{
int likely = 0;
if (xcp->cp0_cause & CAUSEF_BD)
if (delay_slot(xcp))
return SIGILL;
#if __mips >= 4
@@ -1201,7 +1201,7 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
return SIGILL;
}
xcp->cp0_cause |= CAUSEF_BD;
set_delay_slot(xcp);
if (cond) {
/* branch taken: emulate dslot
* instruction
@@ -1321,7 +1321,7 @@ sigill:
/* we did it !! */
xcp->cp0_epc = contpc;
xcp->cp0_cause &= ~CAUSEF_BD;
clear_delay_slot(xcp);
return 0;
}