]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
objtool/LoongArch: Mark types based on break immediate code
authorTiezhu Yang <yangtiezhu@loongson.cn>
Thu, 18 Sep 2025 11:43:36 +0000 (19:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Sep 2025 09:13:45 +0000 (11:13 +0200)
commit baad7830ee9a56756b3857348452fe756cb0a702 upstream.

If the break immediate code is 0, it should mark the type as
INSN_TRAP. If the break immediate code is 1, it should mark the
type as INSN_BUG.

While at it, format the code style and add the code comment for nop.

Cc: stable@vger.kernel.org
Suggested-by: WANG Rui <wangrui@loongson.cn>
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/objtool/arch/loongarch/decode.c

index 69b66994f2a1557275212bf470b413af299f74f2..0b9195f985a6c56b8b4da84b75e1e60986baea2b 100644 (file)
@@ -313,10 +313,16 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec
        if (decode_insn_reg2i16_fomat(inst, insn))
                return 0;
 
-       if (inst.word == 0)
+       if (inst.word == 0) {
+               /* andi $zero, $zero, 0x0 */
                insn->type = INSN_NOP;
-       else if (inst.reg0i15_format.opcode == break_op) {
-               /* break */
+       } else if (inst.reg0i15_format.opcode == break_op &&
+                  inst.reg0i15_format.immediate == 0x0) {
+               /* break 0x0 */
+               insn->type = INSN_TRAP;
+       } else if (inst.reg0i15_format.opcode == break_op &&
+                  inst.reg0i15_format.immediate == 0x1) {
+               /* break 0x1 */
                insn->type = INSN_BUG;
        } else if (inst.reg2_format.opcode == ertn_op) {
                /* ertn */