LoongArch: Discard extra spaces in objdump output
Checks
| Context |
Check |
Description |
| linaro-tcwg-bot/tcwg_binutils_build--master-arm |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_binutils_check--master-arm |
success
|
Testing passed
|
Commit Message
Due to the formatted output of objdump, some instructions
that do not require output operands (such as nop/ret) will
have extra spaces added after them.
Determine whether to output operands through the format
of opcodes. When opc->format is an empty string, no extra
spaces are output.
---
gas/testsuite/gas/loongarch/64_pcrel.d | 2 +-
.../gas/loongarch/deprecated_reg_aliases.d | 2 +-
gas/testsuite/gas/loongarch/jmp_op.d | 4 ++--
gas/testsuite/gas/loongarch/nop.d | 2 +-
gas/testsuite/gas/loongarch/privilege_op.d | 14 +++++++-------
gas/testsuite/gas/loongarch/reloc.d | 2 +-
opcodes/loongarch-dis.c | 5 ++++-
7 files changed, 17 insertions(+), 14 deletions(-)
Comments
Hi,
On 1/5/24 10:00, Lulu Cai wrote:
> Due to the formatted output of objdump, some instructions
> that do not require output operands (such as nop/ret) will
> have extra spaces added after them.
>
> Determine whether to output operands through the format
> of opcodes. When opc->format is an empty string, no extra
> spaces are output.
> ---
> gas/testsuite/gas/loongarch/64_pcrel.d | 2 +-
> .../gas/loongarch/deprecated_reg_aliases.d | 2 +-
> gas/testsuite/gas/loongarch/jmp_op.d | 4 ++--
> gas/testsuite/gas/loongarch/nop.d | 2 +-
> gas/testsuite/gas/loongarch/privilege_op.d | 14 +++++++-------
> gas/testsuite/gas/loongarch/reloc.d | 2 +-
> opcodes/loongarch-dis.c | 5 ++++-
> 7 files changed, 17 insertions(+), 14 deletions(-)
>
> <snip>
>
> diff --git a/opcodes/loongarch-dis.c b/opcodes/loongarch-dis.c
> index 969ea28f96f..c1b284bcd8a 100644
> --- a/opcodes/loongarch-dis.c
> +++ b/opcodes/loongarch-dis.c
> @@ -267,7 +267,10 @@ disassemble_one (insn_t insn, struct disassemble_info *info)
> }
>
> info->insn_type = dis_nonbranch;
> - info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%-12s", opc->name);
> + if (strcmp (opc->format, "") == 0)
Why not simply check if (opc->format == NULL || opc->format[0] == '\0')?
> + info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%s", opc->name);
> + else
> + info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%-12s", opc->name);
>
> {
> char *fake_args = xmalloc (strlen (opc->format) + 1);
Otherwise, thanks for the patch!
@@ -7,5 +7,5 @@
Disassembly of section .text:
00000000.* <.text>:
-[ ]+0:[ ]+03400000[ ]+nop[ ]+
+[ ]+0:[ ]+03400000[ ]+nop
[ ]+0:[ ]+R_LARCH_64_PCREL[ ]+\*ABS\*
@@ -15,4 +15,4 @@ Disassembly of section .text:
[ ]+8:[ ]+16024685[ ]+lu32i\.d[ ]+\$a1, 4660
[ ]+c:[ ]+08200420[ ]+fmadd\.d[ ]+\$fa0, \$fa1, \$fa1, \$fa0
[ ]+10:[ ]+380c16a4[ ]+ldx\.d[ ]+\$a0, \$r21, \$a1
-[ ]+14:[ ]+4c000020[ ]+ret[ ]+
+[ ]+14:[ ]+4c000020[ ]+ret
@@ -7,7 +7,7 @@
Disassembly of section .text:
00000000.* <.L1>:
-[ ]+0:[ ]+03400000[ ]+nop[ ]+
+[ ]+0:[ ]+03400000[ ]+nop
[ ]+4:[ ]+63fffc04[ ]+bgtz[ ]+\$a0,[ ]+-4[ ]+#[ ]+0[ ]+<\.L1>
[ ]+4:[ ]+R_LARCH_B16[ ]+\.L1
[ ]+8:[ ]+67fff880[ ]+bgez[ ]+\$a0,[ ]+-8[ ]+#[ ]+0[ ]+<\.L1>
@@ -47,4 +47,4 @@ Disassembly of section .text:
[ ]+4c:[ ]+R_LARCH_B16[ ]+\.L1
[ ]+50:[ ]+6fffb0a4[ ]+bgeu[ ]+\$a1,[ ]+\$a0,[ ]+-80[ ]+#[ ]+0[ ]+<\.L1>
[ ]+50:[ ]+R_LARCH_B16[ ]+\.L1
-[ ]+54:[ ]+4c000020[ ]+ret[ ]+
+[ ]+54:[ ]+4c000020[ ]+ret
@@ -7,4 +7,4 @@
Disassembly of section .text:
0+000 <target>:
-[ ]+0:[ ]+03400000[ ]+nop[ ]+
+[ ]+0:[ ]+03400000[ ]+nop
@@ -31,13 +31,13 @@ Disassembly of section .text:
[ ]+54:[ ]+064814a4 [ ]+iocsrwr.h[ ]+[ ]+\$a0, \$a1
[ ]+58:[ ]+064818a4 [ ]+iocsrwr.w[ ]+[ ]+\$a0, \$a1
[ ]+5c:[ ]+06481ca4 [ ]+iocsrwr.d[ ]+[ ]+\$a0, \$a1
-[ ]+60:[ ]+06482000 [ ]+tlbclr[ ]+
-[ ]+64:[ ]+06482400 [ ]+tlbflush[ ]+
-[ ]+68:[ ]+06482800 [ ]+tlbsrch[ ]+
-[ ]+6c:[ ]+06482c00 [ ]+tlbrd[ ]+
-[ ]+70:[ ]+06483000 [ ]+tlbwr[ ]+
-[ ]+74:[ ]+06483400 [ ]+tlbfill[ ]+
-[ ]+78:[ ]+06483800 [ ]+ertn[ ]+
+[ ]+60:[ ]+06482000 [ ]+tlbclr
+[ ]+64:[ ]+06482400 [ ]+tlbflush
+[ ]+68:[ ]+06482800 [ ]+tlbsrch
+[ ]+6c:[ ]+06482c00 [ ]+tlbrd
+[ ]+70:[ ]+06483000 [ ]+tlbwr
+[ ]+74:[ ]+06483400 [ ]+tlbfill
+[ ]+78:[ ]+06483800 [ ]+ertn
[ ]+7c:[ ]+06488000 [ ]+idle[ ]+[ ]+0x0
[ ]+80:[ ]+0648ffff [ ]+idle[ ]+[ ]+0x7fff
[ ]+84:[ ]+064998a0 [ ]+invtlb[ ]+[ ]+0x0, \$a1, \$a2
@@ -8,7 +8,7 @@
Disassembly of section .text:
00000000.* <.text>:
-[ ]+0:[ ]+03400000[ ]+nop[ ]+
+[ ]+0:[ ]+03400000[ ]+nop
[ ]+4:[ ]+58000085[ ]+beq[ ]+\$a0,[ ]+\$a1,[ ]+0[ ]+#[ ]+0x4
[ ]+4:[ ]+R_LARCH_B16[ ]+.L1
[ ]+8:[ ]+5c000085[ ]+bne[ ]+\$a0,[ ]+\$a1,[ ]+0[ ]+#[ ]+0x8
@@ -267,7 +267,10 @@ disassemble_one (insn_t insn, struct disassemble_info *info)
}
info->insn_type = dis_nonbranch;
- info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%-12s", opc->name);
+ if (strcmp (opc->format, "") == 0)
+ info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%s", opc->name);
+ else
+ info->fprintf_styled_func (info->stream, dis_style_mnemonic, "%-12s", opc->name);
{
char *fake_args = xmalloc (strlen (opc->format) + 1);