UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jinyang He <hejinyang@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Jinyang He 2021-01-21 13:31:36 +08:00 committed by Thomas Bogendoerfer
parent fa85d6ac2c
commit 9308579fef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/kernel/process.c
View File

@ -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)
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;