Skip to content

Commit ea4a1ea

Browse files
committed
Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op"
This reverts commit 9308579. Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent fe6c98a commit ea4a1ea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/mips/kernel/process.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ static inline int is_jump_ins(union mips_instruction *ip)
326326
* microMIPS is kind of more fun...
327327
*/
328328
if (mm_insn_16bit(ip->word >> 16)) {
329-
if (ip->mm16_r5_format.opcode == mm_pool16c_op &&
330-
ip->mm16_r5_format.rt == mm_jr16_op)
329+
if ((ip->mm16_r5_format.opcode == mm_pool16c_op &&
330+
(ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op))
331331
return 1;
332332
return 0;
333333
}
@@ -339,7 +339,7 @@ static inline int is_jump_ins(union mips_instruction *ip)
339339
if (ip->r_format.opcode != mm_pool32a_op ||
340340
ip->r_format.func != mm_pool32axf_op)
341341
return 0;
342-
return ((ip->u_format.uimmediate >> 6) & GENMASK(9, 0)) == mm_jalr_op;
342+
return ((ip->u_format.uimmediate >> 6) & mm_jalr_op) == mm_jalr_op;
343343
#else
344344
if (ip->j_format.opcode == j_op)
345345
return 1;

0 commit comments

Comments
 (0)