Commit 70d4818d authored by Paul Burton's avatar Paul Burton Committed by Greg Kroah-Hartman

MIPS: Handle microMIPS jumps in the same way as MIPS32/MIPS64 jumps

commit 096a0de4 upstream.

is_jump_ins() checks for plain jump ("j") instructions since commit
e7438c4b ("MIPS: Fix sibling call handling in get_frame_info") but
that commit didn't make the same change to the microMIPS code, leaving
it inconsistent with the MIPS32/MIPS64 code. Handle the microMIPS
encoding of the jump instruction too such that it behaves consistently.
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Fixes: e7438c4b ("MIPS: Fix sibling call handling in get_frame_info")
Cc: Tony Wu <tung7970@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14533/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f6914d7
...@@ -293,6 +293,8 @@ static inline int is_jump_ins(union mips_instruction *ip) ...@@ -293,6 +293,8 @@ static inline int is_jump_ins(union mips_instruction *ip)
return 0; return 0;
} }
if (ip->j_format.opcode == mm_j32_op)
return 1;
if (ip->j_format.opcode == mm_jal32_op) if (ip->j_format.opcode == mm_jal32_op)
return 1; return 1;
if (ip->r_format.opcode != mm_pool32a_op || if (ip->r_format.opcode != mm_pool32a_op ||
......
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