[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1610454557-25867-3-git-send-email-hejinyang@loongson.cn>
Date: Tue, 12 Jan 2021 20:29:15 +0800
From: Jinyang He <hejinyang@...ngson.cn>
To: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Cc: linux-mips@...r.kernel.org, linux-kernel@...r.kernel.org,
Paul Burton <paulburton@...nel.org>,
Jun-Ru Chang <jrjang@...ltek.com>
Subject: [PATCH 2/4] 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@...ngson.cn>
---
arch/mips/kernel/process.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 361bd28..94dfdf4 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -311,8 +311,8 @@ static inline int is_jump_ins(union mips_instruction *ip)
* microMIPS is kind of more fun...
*/
if (mm_insn_16bit(ip->word >> 16)) {
- if ((ip->mm16_r5_format.opcode == mm_pool16c_op &&
- (ip->mm16_r5_format.rt & mm_jr16_op) == mm_jr16_op))
+ if (ip->mm16_r5_format.opcode == mm_pool16c_op &&
+ ip->mm16_r5_format.rt == mm_jr16_op)
return 1;
return 0;
}
@@ -324,7 +324,7 @@ static inline int is_jump_ins(union mips_instruction *ip)
if (ip->r_format.opcode != mm_pool32a_op ||
ip->r_format.func != mm_pool32axf_op)
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
if (ip->j_format.opcode == j_op)
return 1;
--
2.1.0
Powered by blists - more mailing lists