diff options
| -rw-r--r-- | gas/ChangeLog | 10 | ||||
| -rw-r--r-- | gas/config/tc-ia64.c | 2 | ||||
| -rw-r--r-- | gas/dwarf2dbg.c | 22 | ||||
| -rw-r--r-- | gas/dwarf2dbg.h | 4 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/lns/lns-common-1-ia64.s | 16 | ||||
| -rw-r--r-- | gas/testsuite/gas/lns/lns.exp | 3 |
7 files changed, 55 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 6604e8e..835b56f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2007-11-19 Bob Wilson <bob.wilson@acm.org> + + * dwarf2dbg.c (dwarf2_consume_line_info): New. + (dwarf2_emit_insn): Use it here. + (dwarf2_directive_loc): Fix check for consecutive .loc directives + when debug_type is DEBUG_DWARF2. + * dwarf2dbg.h (dwarf2_consume_line_info): New prototype. + * config/tc-ia64.c (ia64_flush_insns): Call dwarf2_consume_line_info. + (md_assemble): Likewise. + 2007-11-17 Thiemo Seufer <ths@mips.com> * config/tc-mips.c (md_parse_option): Match mips_optimize to the -O diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c index 2e0f86c..263374b 100644 --- a/gas/config/tc-ia64.c +++ b/gas/config/tc-ia64.c @@ -1132,6 +1132,7 @@ ia64_flush_insns () dwarf2_where (&CURR_SLOT.debug_line); CURR_SLOT.debug_line.flags |= DWARF2_FLAG_BASIC_BLOCK; dwarf2_gen_line_info (frag_now_fix (), &CURR_SLOT.debug_line); + dwarf2_consume_line_info (); } CURR_SLOT.label_fixups = 0; @@ -10968,6 +10969,7 @@ md_assemble (str) CURR_SLOT.idesc = idesc; as_where (&CURR_SLOT.src_file, &CURR_SLOT.src_line); dwarf2_where (&CURR_SLOT.debug_line); + dwarf2_consume_line_info (); /* Add unwind entries, if there are any. */ if (unwind.current_entry) diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index 39e434c..97a60c7 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -373,11 +373,6 @@ dwarf2_emit_insn (int size) or the physical input file name (foo.s) and not the file name specified in the most recent .loc directive (eg foo.h). */ loc = current; - - /* Unless we generate DWARF2 debugging information for each - assembler line, we only emit one line symbol for one LOC. */ - if (debug_type != DEBUG_DWARF2) - loc_directive_seen = FALSE; } else if (debug_type != DEBUG_DWARF2) return; @@ -385,6 +380,21 @@ dwarf2_emit_insn (int size) dwarf2_where (&loc); dwarf2_gen_line_info (frag_now_fix () - size, &loc); + dwarf2_consume_line_info (); +} + +/* Called after the current line information has been either used with + dwarf2_gen_line_info or saved with a machine instruction for later use. + This resets the state of the line number information to reflect that + it has been used. */ + +void +dwarf2_consume_line_info (void) +{ + /* Unless we generate DWARF2 debugging information for each + assembler line, we only emit one line symbol for one LOC. */ + if (debug_type != DEBUG_DWARF2) + loc_directive_seen = FALSE; current.flags &= ~(DWARF2_FLAG_BASIC_BLOCK | DWARF2_FLAG_PROLOGUE_END @@ -572,7 +582,7 @@ dwarf2_directive_loc (int dummy ATTRIBUTE_UNUSED) /* If we see two .loc directives in a row, force the first one to be output now. */ - if (loc_directive_seen) + if (loc_directive_seen && debug_type != DEBUG_DWARF2) dwarf2_emit_insn (0); filenum = get_absolute_expression (); diff --git a/gas/dwarf2dbg.h b/gas/dwarf2dbg.h index be220f4..55836cc 100644 --- a/gas/dwarf2dbg.h +++ b/gas/dwarf2dbg.h @@ -72,6 +72,10 @@ extern void dwarf2_gen_line_info (addressT addr, struct dwarf2_line_info *l); /* Must be called for each generated instruction. */ extern void dwarf2_emit_insn (int); +/* Reset the state of the line number information to reflect that + it has been used. */ +extern void dwarf2_consume_line_info (void); + /* Should be called for each code label. */ extern void dwarf2_emit_label (symbolS *); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index a4ea406..e5d1b64 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-19 Bob Wilson <bob.wilson@acm.org> + + * gas/lns/lns.exp: Run lns-common-1 with alternate source for ia64. + * gas/lns/lns-common-1-ia64.s: New file. + 2007-11-14 H.J. Lu <hongjiu.lu@intel.com> * gas/ia64/dv-raw-err.s: Add tests for ar.ruc. diff --git a/gas/testsuite/gas/lns/lns-common-1-ia64.s b/gas/testsuite/gas/lns/lns-common-1-ia64.s new file mode 100644 index 0000000..ee6c08b --- /dev/null +++ b/gas/testsuite/gas/lns/lns-common-1-ia64.s @@ -0,0 +1,16 @@ + .file 1 "foo.c" + .loc 1 1 + .explicit + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 2 3 + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 3 prologue_end + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 4 0 epilogue_begin + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 5 isa 1 basic_block + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 6 is_stmt 0 + { .mii; nop 0; nop 0; nop 0 ;; } + .loc 1 7 is_stmt 1 + { .mii; nop 0; nop 0; nop 0 ;; } diff --git a/gas/testsuite/gas/lns/lns.exp b/gas/testsuite/gas/lns/lns.exp index a192361..b292f2e 100644 --- a/gas/testsuite/gas/lns/lns.exp +++ b/gas/testsuite/gas/lns/lns.exp @@ -13,7 +13,6 @@ run_dump_test "lns-duplicate" # information (d10v). if { ![istarget d10v-*-*] - && ![istarget ia64*-*-*] && ![istarget i370-*-*] && ![istarget i960-*-*] && ![istarget mcore-*-*] @@ -23,6 +22,8 @@ if { # Use alternate file for targets using DW_LNS_fixed_advance_pc opcodes. if { [istarget xtensa-*-*] } { run_dump_test "lns-common-1-alt" + } elseif { [istarget ia64*-*-*] } { + run_dump_test "lns-common-1" { { source "lns-common-1-ia64.s" } } } else { run_dump_test "lns-common-1" } |