Commit 9308579f authored by Jinyang He's avatar Jinyang He Committed by Thomas Bogendoerfer

MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op

mm16_r5_format.rt is 5 bits, so directly judge the value if equal or not.
mm_jalr_op requires 7th to 16th bits. These 10 which bits generated by
shifting u_format.uimmediate by 6 may be affected by sign extension.
Thus, take out the 10 bits for comparison.

Without this patch, errors may occur, such as these bits are all ones.
Signed-off-by: default avatarJinyang He <hejinyang@loongson.cn>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent fa85d6ac
...@@ -294,8 +294,8 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -294,8 +294,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) == mm_jr16_op)) ip->mm16_r5_format.rt == mm_jr16_op)
return 1; return 1;
return 0; return 0;
} }
...@@ -307,7 +307,7 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -307,7 +307,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) & mm_jalr_op) == mm_jalr_op; return ((ip->u_format.uimmediate >> 6) & GENMASK(9, 0)) == 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