Messages in this thread Patch in this message | | | From | Samuel Zeter <> | Subject | [PATCH 2/2] arch/x86/tools/objdump_reformat.awk: Allow for spaces | Date | Thu, 6 Jan 2022 13:36:05 +1100 |
| |
objdump and llvm-objdump have differing output formats. Specifically, objump will format its output as: address:<tab>hex, whereas llvm-objdump displays its output as address:<space>hex.
objdump_reformat.awk incorrectly handles this discrepancy due to the unexpected space and as a result insn_decoder_test fails, as its input is garbled.
This patch ensures that the instruction line being tokenized can support either a space and colon, or tab delimiter.
Signed-off-by: Samuel Zeter <samuelzeter@gmail.com> --- arch/x86/tools/objdump_reformat.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/tools/objdump_reformat.awk b/arch/x86/tools/objdump_reformat.awk index 276e572a6f60..a4120d907277 100644 --- a/arch/x86/tools/objdump_reformat.awk +++ b/arch/x86/tools/objdump_reformat.awk @@ -22,7 +22,7 @@ BEGIN { } /^ *[0-9a-f]+:/ { - if (split($0, field, "\t") < 3) { + if (split($0, field, /: |\t/) < 3) { # This is a continuation of the same insn. prev_hex = prev_hex field[2] } else { -- 2.32.0
| |