From: Jinyang He <hejinyang@loongson.cn>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Burton <paulburton@kernel.org>,
Jun-Ru Chang <jrjang@realtek.com>
Subject: [PATCH v2 2/4] MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op
Date: Thu, 21 Jan 2021 13:31:36 +0800 [thread overview]
Message-ID: <1611207098-11381-3-git-send-email-hejinyang@loongson.cn> (raw)
In-Reply-To: <1611207098-11381-1-git-send-email-hejinyang@loongson.cn>
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>
---
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 d737234..74d7fd8 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -292,8 +292,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;
}
@@ -305,7 +305,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
next prev parent reply other threads:[~2021-01-21 5:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 5:31 [PATCH v2 0/4] MIPS: process: Some fixes and improvements about get_frame_info() Jinyang He
2021-01-21 5:31 ` [PATCH v2 1/4] MIPS: process: Remove unnecessary headers inclusion Jinyang He
2021-01-21 9:28 ` Huacai Chen
2021-01-21 5:31 ` Jinyang He [this message]
2021-02-07 21:31 ` [PATCH v2 2/4] MIPS: microMIPS: Fix the judgment of mm_jr16_op and mm_jalr_op Maciej W. Rozycki
2021-02-08 1:13 ` Jinyang He
2021-02-09 16:14 ` Thomas Bogendoerfer
2021-01-21 5:31 ` [PATCH v2 3/4] MIPS: Fix get_frame_info() handing of function size Jinyang He
2021-01-21 5:31 ` [PATCH v2 4/4] MIPS: Add is_jr_ra_ins() to end the loop early Jinyang He
2021-01-25 11:24 ` [PATCH v2 0/4] MIPS: process: Some fixes and improvements about get_frame_info() Thomas Bogendoerfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1611207098-11381-3-git-send-email-hejinyang@loongson.cn \
--to=hejinyang@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=jrjang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).