From 445bb9d46dddf7a927bc530fc28410f67181de6f Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 21 Apr 2017 08:44:05 -0300 Subject: [PATCH] LVU: output nonzero views in objdump and readelf dwarf2+ line number dumps --- binutils/dwarf.c | 89 ++++++++++++++----- binutils/testsuite/binutils-all/dw2-1.W | 2 +- binutils/testsuite/binutils-all/dw2-3.W | 2 +- binutils/testsuite/binutils-all/dw2-3gabi.W | 2 +- .../binutils-all/i386/compressed-1a.d | 2 +- .../binutils-all/libdw2-compressedgabi.out | 6 +- binutils/testsuite/binutils-all/objdump.W | 2 +- .../binutils-all/x86-64/compressed-1a.d | 4 +- gas/testsuite/gas/elf/dwarf2-1.d | 2 +- gas/testsuite/gas/elf/dwarf2-2.d | 2 +- gas/testsuite/gas/i386/dw2-compress-1.d | 2 +- gas/testsuite/gas/i386/dw2-compressed-1.d | 2 +- .../gas/i386/ilp32/lns/lns-duplicate.d | 2 +- gas/testsuite/gas/lns/lns-big-delta.d | 2 +- gas/testsuite/gas/lns/lns-duplicate.d | 2 +- gas/testsuite/gas/mips/loc-swap-2.d | 8 +- gas/testsuite/gas/mips/loc-swap.d | 6 +- gas/testsuite/gas/mips/micromips@loc-swap-2.d | 6 +- gas/testsuite/gas/mips/micromips@loc-swap.d | 4 +- gas/testsuite/gas/mips/mips16@loc-swap-2.d | 6 +- gas/testsuite/gas/mips/mips16@loc-swap.d | 6 +- gas/testsuite/gas/mips/mips16e@loc-swap.d | 6 +- 22 files changed, 105 insertions(+), 60 deletions(-) diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 0184a7ab2ec..72e10fa3ab2 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -389,6 +389,7 @@ read_uleb128 (unsigned char * data, typedef struct State_Machine_Registers { dwarf_vma address; + unsigned int view; unsigned int file; unsigned int line; unsigned int column; @@ -407,6 +408,7 @@ static void reset_state_machine (int is_stmt) { state_machine_regs.address = 0; + state_machine_regs.view = 0; state_machine_regs.op_index = 0; state_machine_regs.file = 1; state_machine_regs.line = 1; @@ -465,6 +467,7 @@ process_extended_line_op (unsigned char * data, SAFE_BYTE_GET (adr, data, len - bytes_read - 1, end); printf (_("set Address to 0x%s\n"), dwarf_vmatoa ("x", adr)); state_machine_regs.address = adr; + state_machine_regs.view = 0; state_machine_regs.op_index = 0; break; @@ -2837,6 +2840,7 @@ display_debug_lines_raw (struct dwarf_section *section, unsigned char *end) { unsigned char *start = section->start; + int verbose_view = 0; printf (_("Raw dump of debug contents of section %s:\n\n"), section->name); @@ -3014,30 +3018,45 @@ display_debug_lines_raw (struct dwarf_section *section, { uladv *= linfo.li_min_insn_length; state_machine_regs.address += uladv; + if (uladv) + state_machine_regs.view = 0; printf (_(" Special opcode %d: " - "advance Address by %s to 0x%s"), + "advance Address by %s to 0x%s%s"), op_code, dwarf_vmatoa ("u", uladv), - dwarf_vmatoa ("x", state_machine_regs.address)); + dwarf_vmatoa ("x", state_machine_regs.address), + verbose_view && uladv + ? _(" (reset view)") : ""); } else { - state_machine_regs.address - += ((state_machine_regs.op_index + uladv) + unsigned addrdelta + = ((state_machine_regs.op_index + uladv) / linfo.li_max_ops_per_insn) * linfo.li_min_insn_length; + state_machine_regs.address + += addrdelta; state_machine_regs.op_index = (state_machine_regs.op_index + uladv) % linfo.li_max_ops_per_insn; + if (addrdelta) + state_machine_regs.view = 0; printf (_(" Special opcode %d: " - "advance Address by %s to 0x%s[%d]"), + "advance Address by %s to 0x%s[%d]%s"), op_code, dwarf_vmatoa ("u", uladv), dwarf_vmatoa ("x", state_machine_regs.address), - state_machine_regs.op_index); + state_machine_regs.op_index, + verbose_view && addrdelta + ? _(" (reset view)") : ""); } adv = (op_code % linfo.li_line_range) + linfo.li_line_base; state_machine_regs.line += adv; - printf (_(" and Line by %s to %d\n"), + printf (_(" and Line by %s to %d"), dwarf_vmatoa ("d", adv), state_machine_regs.line); + if (verbose_view || state_machine_regs.view) + printf (_(" (view %u)\n"), state_machine_regs.view); + else + putchar ('\n'); + state_machine_regs.view++; } else switch (op_code) { @@ -3046,7 +3065,12 @@ display_debug_lines_raw (struct dwarf_section *section, break; case DW_LNS_copy: - printf (_(" Copy\n")); + printf (_(" Copy")); + if (verbose_view || state_machine_regs.view) + printf (_(" (view %u)\n"), state_machine_regs.view); + else + putchar ('\n'); + state_machine_regs.view++; break; case DW_LNS_advance_pc: @@ -3056,23 +3080,33 @@ display_debug_lines_raw (struct dwarf_section *section, { uladv *= linfo.li_min_insn_length; state_machine_regs.address += uladv; - printf (_(" Advance PC by %s to 0x%s\n"), + if (uladv) + state_machine_regs.view = 0; + printf (_(" Advance PC by %s to 0x%s%s\n"), dwarf_vmatoa ("u", uladv), - dwarf_vmatoa ("x", state_machine_regs.address)); + dwarf_vmatoa ("x", state_machine_regs.address), + verbose_view && uladv + ? _(" (reset view)") : ""); } else { - state_machine_regs.address - += ((state_machine_regs.op_index + uladv) - / linfo.li_max_ops_per_insn) + unsigned addrdelta + = ((state_machine_regs.op_index + uladv) + / linfo.li_max_ops_per_insn) * linfo.li_min_insn_length; + state_machine_regs.address + += addrdelta; state_machine_regs.op_index = (state_machine_regs.op_index + uladv) % linfo.li_max_ops_per_insn; - printf (_(" Advance PC by %s to 0x%s[%d]\n"), + if (addrdelta) + state_machine_regs.view = 0; + printf (_(" Advance PC by %s to 0x%s[%d]%s\n"), dwarf_vmatoa ("u", uladv), dwarf_vmatoa ("x", state_machine_regs.address), - state_machine_regs.op_index); + state_machine_regs.op_index, + verbose_view && addrdelta + ? _(" (reset view)") : ""); } break; @@ -3119,23 +3153,33 @@ display_debug_lines_raw (struct dwarf_section *section, { uladv *= linfo.li_min_insn_length; state_machine_regs.address += uladv; - printf (_(" Advance PC by constant %s to 0x%s\n"), + if (uladv) + state_machine_regs.view = 0; + printf (_(" Advance PC by constant %s to 0x%s%s\n"), dwarf_vmatoa ("u", uladv), - dwarf_vmatoa ("x", state_machine_regs.address)); + dwarf_vmatoa ("x", state_machine_regs.address), + verbose_view && uladv + ? _(" (reset view)") : ""); } else { - state_machine_regs.address - += ((state_machine_regs.op_index + uladv) - / linfo.li_max_ops_per_insn) + unsigned addrdelta + = ((state_machine_regs.op_index + uladv) + / linfo.li_max_ops_per_insn) * linfo.li_min_insn_length; + state_machine_regs.address + += addrdelta; state_machine_regs.op_index = (state_machine_regs.op_index + uladv) % linfo.li_max_ops_per_insn; - printf (_(" Advance PC by constant %s to 0x%s[%d]\n"), + if (addrdelta) + state_machine_regs.view = 0; + printf (_(" Advance PC by constant %s to 0x%s[%d]%s\n"), dwarf_vmatoa ("u", uladv), dwarf_vmatoa ("x", state_machine_regs.address), - state_machine_regs.op_index); + state_machine_regs.op_index, + verbose_view && addrdelta + ? _(" (reset view)") : ""); } break; @@ -3146,6 +3190,7 @@ display_debug_lines_raw (struct dwarf_section *section, printf (_(" Advance PC by fixed size amount %s to 0x%s\n"), dwarf_vmatoa ("u", uladv), dwarf_vmatoa ("x", state_machine_regs.address)); + /* Do NOT reset view. */ break; case DW_LNS_set_prologue_end: diff --git a/binutils/testsuite/binutils-all/dw2-1.W b/binutils/testsuite/binutils-all/dw2-1.W index d70581b2956..fb9c7989f37 100644 --- a/binutils/testsuite/binutils-all/dw2-1.W +++ b/binutils/testsuite/binutils-all/dw2-1.W @@ -69,7 +69,7 @@ Raw dump of debug contents of section .z?debug_line: \[0x.*\] Extended opcode 2: set Address to 0x4 \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to 0x8 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/binutils/testsuite/binutils-all/dw2-3.W b/binutils/testsuite/binutils-all/dw2-3.W index 08a7f356df4..af77f87aca8 100644 --- a/binutils/testsuite/binutils-all/dw2-3.W +++ b/binutils/testsuite/binutils-all/dw2-3.W @@ -149,7 +149,7 @@ Raw dump of debug contents of section .z?debug_line: \[0x0000002d\] Extended opcode 2: set Address to 0x0 \[0x00000034\] Advance Line by 3 to 4 \[0x00000036\] Copy - \[0x00000037\] Copy + \[0x00000037\] Copy \(view 1\) \[0x00000038\] Extended opcode 2: set Address to 0x4 \[0x0000003f\] Extended opcode 1: End of Sequence diff --git a/binutils/testsuite/binutils-all/dw2-3gabi.W b/binutils/testsuite/binutils-all/dw2-3gabi.W index 0d0fe6afbbe..4a7926021b1 100644 --- a/binutils/testsuite/binutils-all/dw2-3gabi.W +++ b/binutils/testsuite/binutils-all/dw2-3gabi.W @@ -149,7 +149,7 @@ Raw dump of debug contents of section .debug_line: \[0x0000002d\] Extended opcode 2: set Address to 0x0 \[0x00000034\] Advance Line by 3 to 4 \[0x00000036\] Copy - \[0x00000037\] Copy + \[0x00000037\] Copy \(view 1\) \[0x00000038\] Extended opcode 2: set Address to 0x4 \[0x0000003f\] Extended opcode 1: End of Sequence diff --git a/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d index 5f02defbfcc..a45c6b88a4a 100644 --- a/binutils/testsuite/binutils-all/i386/compressed-1a.d +++ b/binutils/testsuite/binutils-all/i386/compressed-1a.d @@ -96,7 +96,7 @@ Raw dump of debug contents of section .[z]?debug_line: \[0x.*\] Extended opcode 2: set Address to 0x0 \[0x.*\] Advance Line by 10 to 11 \[0x.*\] Copy - \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 + \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 \(view 1\) \[0x.*\] Advance Line by -7 to 5 \[0x.*\] Special opcode 229: advance Address by 16 to 0x10 and Line by 0 to 5 \[0x.*\] Special opcode 49: advance Address by 3 to 0x13 and Line by 2 to 7 diff --git a/binutils/testsuite/binutils-all/libdw2-compressedgabi.out b/binutils/testsuite/binutils-all/libdw2-compressedgabi.out index 3baa42ab4ce..ab456d5a388 100644 --- a/binutils/testsuite/binutils-all/libdw2-compressedgabi.out +++ b/binutils/testsuite/binutils-all/libdw2-compressedgabi.out @@ -70,7 +70,7 @@ Raw dump of debug contents of section .debug_line: \[0x.*\] Extended opcode 2: set Address to 0x4 \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to 0x8 \[0x.*\] Extended opcode 1: End of Sequence @@ -172,7 +172,7 @@ Raw dump of debug contents of section .debug_line: \[0x0000002d\] Extended opcode 2: set Address to 0x0 \[0x00000034\] Advance Line by 3 to 4 \[0x00000036\] Copy - \[0x00000037\] Copy + \[0x00000037\] Copy \(view 1\) \[0x00000038\] Extended opcode 2: set Address to 0x4 \[0x0000003f\] Extended opcode 1: End of Sequence @@ -355,7 +355,7 @@ Raw dump of debug contents of section .debug_line: \[0x0000002d\] Extended opcode 2: set Address to 0x0 \[0x00000034\] Advance Line by 3 to 4 \[0x00000036\] Copy - \[0x00000037\] Copy + \[0x00000037\] Copy \(view 1\) \[0x00000038\] Extended opcode 2: set Address to 0x4 \[0x0000003f\] Extended opcode 1: End of Sequence diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W index a5379d0c561..5f977eefb13 100644 --- a/binutils/testsuite/binutils-all/objdump.W +++ b/binutils/testsuite/binutils-all/objdump.W @@ -69,7 +69,7 @@ Raw dump of debug contents of section .z?debug_line: \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Extended opcode 1: End of Sequence diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d index 574b719b79a..75b8ce597f5 100644 --- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d +++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d @@ -96,10 +96,10 @@ Raw dump of debug contents of section .[z]?debug_line: \[0x.*\] Extended opcode 2: set Address to 0x0 \[0x.*\] Advance Line by 10 to 11 \[0x.*\] Copy - \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 + \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 12 \(view 1\) \[0x.*\] Advance Line by -7 to 5 \[0x.*\] Special opcode 229: advance Address by 16 to 0x10 and Line by 0 to 5 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x10 and Line by 1 to 6 + \[0x.*\] Special opcode 6: advance Address by 0 to 0x10 and Line by 1 to 6 \(view 1\) \[0x.*\] Advance PC by 5 to 0x15 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/elf/dwarf2-1.d b/gas/testsuite/gas/elf/dwarf2-1.d index bae2f630ea7..d8b79effc78 100644 --- a/gas/testsuite/gas/elf/dwarf2-1.d +++ b/gas/testsuite/gas/elf/dwarf2-1.d @@ -71,7 +71,7 @@ Raw dump of debug contents of section .[z]?debug_line: \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/elf/dwarf2-2.d b/gas/testsuite/gas/elf/dwarf2-2.d index b42a2ec5e64..8cc1c3bb039 100644 --- a/gas/testsuite/gas/elf/dwarf2-2.d +++ b/gas/testsuite/gas/elf/dwarf2-2.d @@ -71,7 +71,7 @@ Raw dump of debug contents of section .[z]?debug_line: \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d index ceebb3f108a..bfd4837422d 100644 --- a/gas/testsuite/gas/i386/dw2-compress-1.d +++ b/gas/testsuite/gas/i386/dw2-compress-1.d @@ -97,7 +97,7 @@ Raw dump of debug contents of section .z?debug_line: \[0x.*\] Extended opcode 2: set Address to 0x0 \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to 0x4 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/i386/dw2-compressed-1.d b/gas/testsuite/gas/i386/dw2-compressed-1.d index f4c110d52f0..0a2a092e0df 100644 --- a/gas/testsuite/gas/i386/dw2-compressed-1.d +++ b/gas/testsuite/gas/i386/dw2-compressed-1.d @@ -98,7 +98,7 @@ Raw dump of debug contents of section .debug_line: \[0x.*\] Extended opcode 2: set Address to 0x0 \[0x.*\] Advance Line by 3 to 4 \[0x.*\] Copy - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Extended opcode 2: set Address to 0x4 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d b/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d index c4e5c6f4881..fc0f861eb74 100644 --- a/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d +++ b/gas/testsuite/gas/i386/ilp32/lns/lns-duplicate.d @@ -7,5 +7,5 @@ Raw dump of debug contents of section \.z?debug_line: \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Copy \[0x.*\] Set basic block - \[0x.*\] .* by 1 to 2 + \[0x.*\] .* by 1 to 2 \(view 1\) #pass diff --git a/gas/testsuite/gas/lns/lns-big-delta.d b/gas/testsuite/gas/lns/lns-big-delta.d index d86f434fdd4..65e0ce174fe 100644 --- a/gas/testsuite/gas/lns/lns-big-delta.d +++ b/gas/testsuite/gas/lns/lns-big-delta.d @@ -8,7 +8,7 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Copy \[0x.*\] Advance Line by 1 to 2 \[0x.*\] Advance PC by fixed size amount 0 to 0x0 - \[0x.*\] Copy + \[0x.*\] Copy \(view 1\) \[0x.*\] Advance Line by 1 to 3 \[0x.*\] Extended opcode 2: set Address to 0x.* \[0x.*\] Copy diff --git a/gas/testsuite/gas/lns/lns-duplicate.d b/gas/testsuite/gas/lns/lns-duplicate.d index 9fe28ab5a77..4bf44e07e34 100644 --- a/gas/testsuite/gas/lns/lns-duplicate.d +++ b/gas/testsuite/gas/lns/lns-duplicate.d @@ -6,5 +6,5 @@ Raw dump of debug contents of section \.z?debug_line: \[0x.*\] Extended opcode 2: set Address to .* \[0x.*\] Copy \[0x.*\] Set basic block - \[0x.*\] .* by 1 to 2 + \[0x.*\] .* by 1 to 2 \(view 1\) #pass diff --git a/gas/testsuite/gas/mips/loc-swap-2.d b/gas/testsuite/gas/mips/loc-swap-2.d index ed280a8dfea..df64ccd15c2 100644 --- a/gas/testsuite/gas/mips/loc-swap-2.d +++ b/gas/testsuite/gas/mips/loc-swap-2.d @@ -38,12 +38,12 @@ Raw dump of debug contents of section .debug_line: Line Number Statements: \[0x.*\] Extended opcode 2: set Address to 0x0 - \[0x.*\] Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 9 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 10 + \[0x.*\] Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7 \(view 1\) + \[0x.*\] Special opcode 7: advance Address by 0 to 0x0 and Line by 2 to 9 \(view 2\) + \[0x.*\] Special opcode 6: advance Address by 0 to 0x0 and Line by 1 to 10 \(view 3\) \[0x.*\] Special opcode 120: advance Address by 8 to 0x8 and Line by 3 to 13 \[0x.*\] Special opcode 62: advance Address by 4 to 0xc and Line by 1 to 14 - \[0x.*\] Special opcode 6: advance Address by 0 to 0xc and Line by 1 to 15 + \[0x.*\] Special opcode 6: advance Address by 0 to 0xc and Line by 1 to 15 \(view 1\) \[0x.*\] Special opcode 119: advance Address by 8 to 0x14 and Line by 2 to 17 \[0x.*\] Advance PC by 4 to 0x18 \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/mips/loc-swap.d b/gas/testsuite/gas/mips/loc-swap.d index 4e11106a186..94fe7cd0987 100644 --- a/gas/testsuite/gas/mips/loc-swap.d +++ b/gas/testsuite/gas/mips/loc-swap.d @@ -44,9 +44,9 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 11: advance Address by 0 to 0x0 and Line by 6 to 7 \[0x.*\] Special opcode 63: advance Address by 4 to 0x4 and Line by 2 to 9 \[0x.*\] Special opcode 120: advance Address by 8 to 0xc and Line by 3 to 12 - \[0x.*\] Special opcode 7: advance Address by 0 to 0xc and Line by 2 to 14 + \[0x.*\] Special opcode 7: advance Address by 0 to 0xc and Line by 2 to 14 \(view 1\) \[0x.*\] Special opcode 120: advance Address by 8 to 0x14 and Line by 3 to 17 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x14 and Line by 2 to 19 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x14 and Line by 2 to 19 \(view 1\) \[0x.*\] Special opcode 120: advance Address by 8 to 0x1c and Line by 3 to 22 \[0x.*\] Special opcode 63: advance Address by 4 to 0x20 and Line by 2 to 24 \[0x.*\] Special opcode 120: advance Address by 8 to 0x28 and Line by 3 to 27 @@ -54,7 +54,7 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 120: advance Address by 8 to 0x34 and Line by 3 to 32 \[0x.*\] Special opcode 63: advance Address by 4 to 0x38 and Line by 2 to 34 \[0x.*\] Special opcode 120: advance Address by 8 to 0x40 and Line by 3 to 37 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x40 and Line by 2 to 39 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x40 and Line by 2 to 39 \(view 1\) \[0x.*\] Special opcode 120: advance Address by 8 to 0x48 and Line by 3 to 42 \[0x.*\] Special opcode 63: advance Address by 4 to 0x4c and Line by 2 to 44 \[0x.*\] Advance PC by 36 to 0x70 diff --git a/gas/testsuite/gas/mips/micromips@loc-swap-2.d b/gas/testsuite/gas/mips/micromips@loc-swap-2.d index e148f25d9b7..9504be7c30c 100644 --- a/gas/testsuite/gas/mips/micromips@loc-swap-2.d +++ b/gas/testsuite/gas/mips/micromips@loc-swap-2.d @@ -39,11 +39,11 @@ Raw dump of debug contents of section .debug_line: Line Number Statements: \[0x.*\] Extended opcode 2: set Address to 0x1 \[0x.*\] Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9 \(view 1\) + \[0x.*\] Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10 \(view 2\) \[0x.*\] Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13 \[0x.*\] Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15 + \[0x.*\] Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15 \(view 1\) \[0x.*\] Special opcode 63: advance Address by 4 to 0xb and Line by 2 to 17 \[0x.*\] Advance PC by 1 to 0xc \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/mips/micromips@loc-swap.d b/gas/testsuite/gas/mips/micromips@loc-swap.d index 23aedae972d..1427feea1be 100644 --- a/gas/testsuite/gas/mips/micromips@loc-swap.d +++ b/gas/testsuite/gas/mips/micromips@loc-swap.d @@ -45,9 +45,9 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7 \[0x.*\] Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9 \[0x.*\] Special opcode 36: advance Address by 2 to 0x5 and Line by 3 to 12 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x5 and Line by 2 to 14 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x5 and Line by 2 to 14 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0x9 and Line by 3 to 17 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x9 and Line by 2 to 19 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x9 and Line by 2 to 19 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0xd and Line by 3 to 22 \[0x.*\] Special opcode 35: advance Address by 2 to 0xf and Line by 2 to 24 \[0x.*\] Special opcode 36: advance Address by 2 to 0x11 and Line by 3 to 27 diff --git a/gas/testsuite/gas/mips/mips16@loc-swap-2.d b/gas/testsuite/gas/mips/mips16@loc-swap-2.d index 95b9e9c10b7..a4cc0005ad3 100644 --- a/gas/testsuite/gas/mips/mips16@loc-swap-2.d +++ b/gas/testsuite/gas/mips/mips16@loc-swap-2.d @@ -39,11 +39,11 @@ Raw dump of debug contents of section .debug_line: Line Number Statements: \[0x.*\] Extended opcode 2: set Address to 0x1 \[0x.*\] Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x1 and Line by 2 to 9 \(view 1\) + \[0x.*\] Special opcode 6: advance Address by 0 to 0x1 and Line by 1 to 10 \(view 2\) \[0x.*\] Special opcode 64: advance Address by 4 to 0x5 and Line by 3 to 13 \[0x.*\] Special opcode 34: advance Address by 2 to 0x7 and Line by 1 to 14 - \[0x.*\] Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15 + \[0x.*\] Special opcode 6: advance Address by 0 to 0x7 and Line by 1 to 15 \(view 1\) \[0x.*\] Special opcode 35: advance Address by 2 to 0x9 and Line by 2 to 17 \[0x.*\] Advance PC by 1 to 0xa \[0x.*\] Extended opcode 1: End of Sequence diff --git a/gas/testsuite/gas/mips/mips16@loc-swap.d b/gas/testsuite/gas/mips/mips16@loc-swap.d index 4d0c781f57c..9b023461d71 100644 --- a/gas/testsuite/gas/mips/mips16@loc-swap.d +++ b/gas/testsuite/gas/mips/mips16@loc-swap.d @@ -44,9 +44,9 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7 \[0x.*\] Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9 \[0x.*\] Special opcode 64: advance Address by 4 to 0x7 and Line by 3 to 12 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x7 and Line by 2 to 14 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0xb and Line by 3 to 17 - \[0x.*\] Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19 + \[0x.*\] Special opcode 7: advance Address by 0 to 0xb and Line by 2 to 19 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0xf and Line by 3 to 22 \[0x.*\] Special opcode 35: advance Address by 2 to 0x11 and Line by 2 to 24 \[0x.*\] Special opcode 64: advance Address by 4 to 0x15 and Line by 3 to 27 @@ -54,7 +54,7 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 64: advance Address by 4 to 0x1b and Line by 3 to 32 \[0x.*\] Special opcode 35: advance Address by 2 to 0x1d and Line by 2 to 34 \[0x.*\] Special opcode 64: advance Address by 4 to 0x21 and Line by 3 to 37 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x21 and Line by 2 to 39 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x21 and Line by 2 to 39 \(view 1\) \[0x.*\] Special opcode 92: advance Address by 6 to 0x27 and Line by 3 to 42 \[0x.*\] Special opcode 35: advance Address by 2 to 0x29 and Line by 2 to 44 \[0x.*\] Advance PC by 23 to 0x40 diff --git a/gas/testsuite/gas/mips/mips16e@loc-swap.d b/gas/testsuite/gas/mips/mips16e@loc-swap.d index 412e45bb7c3..7356e3f90fc 100644 --- a/gas/testsuite/gas/mips/mips16e@loc-swap.d +++ b/gas/testsuite/gas/mips/mips16e@loc-swap.d @@ -44,9 +44,9 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 11: advance Address by 0 to 0x1 and Line by 6 to 7 \[0x.*\] Special opcode 35: advance Address by 2 to 0x3 and Line by 2 to 9 \[0x.*\] Special opcode 36: advance Address by 2 to 0x5 and Line by 3 to 12 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x5 and Line by 2 to 14 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x5 and Line by 2 to 14 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0x9 and Line by 3 to 17 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x9 and Line by 2 to 19 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x9 and Line by 2 to 19 \(view 1\) \[0x.*\] Special opcode 64: advance Address by 4 to 0xd and Line by 3 to 22 \[0x.*\] Special opcode 35: advance Address by 2 to 0xf and Line by 2 to 24 \[0x.*\] Special opcode 36: advance Address by 2 to 0x11 and Line by 3 to 27 @@ -54,7 +54,7 @@ Raw dump of debug contents of section \.debug_line: \[0x.*\] Special opcode 36: advance Address by 2 to 0x15 and Line by 3 to 32 \[0x.*\] Special opcode 35: advance Address by 2 to 0x17 and Line by 2 to 34 \[0x.*\] Special opcode 36: advance Address by 2 to 0x19 and Line by 3 to 37 - \[0x.*\] Special opcode 7: advance Address by 0 to 0x19 and Line by 2 to 39 + \[0x.*\] Special opcode 7: advance Address by 0 to 0x19 and Line by 2 to 39 \(view 1\) \[0x.*\] Special opcode 92: advance Address by 6 to 0x1f and Line by 3 to 42 \[0x.*\] Special opcode 35: advance Address by 2 to 0x21 and Line by 2 to 44 \[0x.*\] Advance PC by 31 to 0x40 -- 2.47.2