Commit ea4a1ea4 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer

Revert "MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op"

This reverts commit 9308579f.
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent fe6c98a1
...@@ -326,8 +326,8 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -326,8 +326,8 @@ static inline int is_jump_ins(union mips_instruction *ip)
* microMIPS is kind of more fun... * microMIPS is kind of more fun...
*/ */
if (mm_insn_16bit(ip->word >> 16)) { if (mm_insn_16bit(ip->word >> 16)) {
if (ip->mm16_r5_format.opcode == mm_pool16c_op && if ((ip->mm16_r5_format.opcode == mm_pool16c_op &&
ip->mm16_r5_format.rt == mm_jr16_op) (ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op))
return 1; return 1;
return 0; return 0;
} }
...@@ -339,7 +339,7 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -339,7 +339,7 @@ static inline int is_jump_ins(union mips_instruction *ip)
if (ip->r_format.opcode != mm_pool32a_op || if (ip->r_format.opcode != mm_pool32a_op ||
ip->r_format.func != mm_pool32axf_op) ip->r_format.func != mm_pool32axf_op)
return 0; return 0;
return ((ip->u_format.uimmediate >> 6) & GENMASK(9, 0)) == mm_jalr_op; return ((ip->u_format.uimmediate >> 6) & mm_jalr_op) == mm_jalr_op;
#else #else
if (ip->j_format.opcode == j_op) if (ip->j_format.opcode == j_op)
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment