projects
/
deliverable
/
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
[deliverable/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 8afa090f9536c00ba2e957fa2964ce941c76cb77..36775d20b0e740b7b02ac09f446afaf960e3d5a7 100644
(file)
--- a/
arch/mips/math-emu/cp1emu.c
+++ b/
arch/mips/math-emu/cp1emu.c
@@
-627,8
+627,8
@@
int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
dec_insn.pc_inc +
dec_insn.next_pc_inc;
return 1;
dec_insn.pc_inc +
dec_insn.next_pc_inc;
return 1;
- case
cbcond
0_op:
- case
cbcond1
_op:
+ case
pop1
0_op:
+ case
pop30
_op:
if (!cpu_has_mips_r6)
break;
if (insn.i_format.rt && !insn.i_format.rs)
if (!cpu_has_mips_r6)
break;
if (insn.i_format.rt && !insn.i_format.rs)
@@
-683,14
+683,14
@@
int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
dec_insn.next_pc_inc;
return 1;
dec_insn.next_pc_inc;
return 1;
- case
beqzcjic
_op:
+ case
pop66
_op:
if (!cpu_has_mips_r6)
break;
*contpc = regs->cp0_epc + dec_insn.pc_inc +
dec_insn.next_pc_inc;
return 1;
if (!cpu_has_mips_r6)
break;
*contpc = regs->cp0_epc + dec_insn.pc_inc +
dec_insn.next_pc_inc;
return 1;
- case
bnezcjialc
_op:
+ case
pop76
_op:
if (!cpu_has_mips_r6)
break;
if (!insn.i_format.rs)
if (!cpu_has_mips_r6)
break;
if (!insn.i_format.rs)
@@
-784,10
+784,10
@@
int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
*/
static inline int cop1_64bit(struct pt_regs *xcp)
{
*/
static inline int cop1_64bit(struct pt_regs *xcp)
{
- if (
config_enabled(CONFIG_64BIT) && !config_enabled
(CONFIG_MIPS32_O32))
+ if (
IS_ENABLED(CONFIG_64BIT) && !IS_ENABLED
(CONFIG_MIPS32_O32))
return 1;
return 1;
- else if (
config_enabled
(CONFIG_32BIT) &&
- !
config_enabled
(CONFIG_MIPS_O32_FP64_SUPPORT))
+ else if (
IS_ENABLED
(CONFIG_32BIT) &&
+ !
IS_ENABLED
(CONFIG_MIPS_O32_FP64_SUPPORT))
return 0;
return !test_thread_flag(TIF_32BIT_FPREGS);
return 0;
return !test_thread_flag(TIF_32BIT_FPREGS);
This page took
0.025626 seconds
and
5
git commands to generate.