projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[cascardo/linux.git]
/
arch
/
mips
/
math-emu
/
cp1emu.c
diff --git
a/arch/mips/math-emu/cp1emu.c
b/arch/mips/math-emu/cp1emu.c
index
92d15e6
..
36775d2
100644
(file)
--- a/
arch/mips/math-emu/cp1emu.c
+++ b/
arch/mips/math-emu/cp1emu.c
@@
-434,8
+434,8
@@
static int microMIPS32_to_MIPS32(union mips_instruction *insn_ptr)
* a single subroutine should be used across both
* modules.
*/
* a single subroutine should be used across both
* modules.
*/
-
static
int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
-
unsigned long *contpc)
+int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
+ unsigned long *contpc)
{
union mips_instruction insn = (union mips_instruction)dec_insn.insn;
unsigned int fcr31;
{
union mips_instruction insn = (union mips_instruction)dec_insn.insn;
unsigned int fcr31;
@@
-1268,7
+1268,7
@@
branch_common:
* instruction in the dslot.
*/
sig = mips_dsemul(xcp, ir,
* instruction in the dslot.
*/
sig = mips_dsemul(xcp, ir,
- contpc);
+
bcpc,
contpc);
if (sig < 0)
break;
if (sig)
if (sig < 0)
break;
if (sig)
@@
-1323,7
+1323,7
@@
branch_common:
* Single step the non-cp1
* instruction in the dslot
*/
* Single step the non-cp1
* instruction in the dslot
*/
- sig = mips_dsemul(xcp, ir, contpc);
+ sig = mips_dsemul(xcp, ir,
bcpc,
contpc);
if (sig < 0)
break;
if (sig)
if (sig < 0)
break;
if (sig)