espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-25 04:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply Jim Wilson's patch to track current frag for line number changes.

Browse Source
This commit is contained in:
Nick Clifton
1999-08-27 09:03:18 +00:00
parent 2366453a56
commit cb30237e0f
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gas/ChangeLog
View File

@ -1,3 +1,14 @@
1999-08-27 Jim Wilson <wilson@cygnus.com>
* dwarf2dbg.c (MAX_SPECIAL_ADDR_DELTA): Correct typo in comment.
(struct ls): Add frag field. Initialize it to zero.
(out_end_sequence): New local text_frag. Set it while in text section.
Replace address check with frag check. Set ls.frag to text_frag if
out_set_addr called.
(dwarf2_gen_line_info): Add explanatory comment. New local saved_frag.
Set it before switching sections. Replace address check with frag
check. Set ls.frag to saved_frag if out_set_addr called.
1999-08-26 David Mosberger <davidm@hpl.hp.com> 1999-08-26 David Mosberger <davidm@hpl.hp.com>
* dwarf2dbg.c (out_end_sequence): If address changed, directly * dwarf2dbg.c (out_end_sequence): If address changed, directly

34
gas/dwarf2dbg.c
View File

@ -78,7 +78,7 @@
is not made available by the GCC front-end. */ is not made available by the GCC front-end. */
#define DWARF2_LINE_DEFAULT_IS_STMT 1 #define DWARF2_LINE_DEFAULT_IS_STMT 1
/* Given a special op, return the line skip amount: */ /* Given a special op, return the line skip amount. */
#define SPECIAL_LINE(op) \ #define SPECIAL_LINE(op) \
(((op) - DWARF2_LINE_OPCODE_BASE)%DWARF2_LINE_RANGE + DWARF2_LINE_BASE) (((op) - DWARF2_LINE_OPCODE_BASE)%DWARF2_LINE_RANGE + DWARF2_LINE_BASE)
@ -86,11 +86,11 @@
DWARF2_LINE_MIN_INSN_LENGTH. */ DWARF2_LINE_MIN_INSN_LENGTH. */
#define SPECIAL_ADDR(op) (((op) - DWARF2_LINE_OPCODE_BASE)/DWARF2_LINE_RANGE) #define SPECIAL_ADDR(op) (((op) - DWARF2_LINE_OPCODE_BASE)/DWARF2_LINE_RANGE)
/* The maximum address skip amont that can be encoded with a special op: */ /* The maximum address skip amount that can be encoded with a special op. */
#define MAX_SPECIAL_ADDR_DELTA SPECIAL_ADDR(255) #define MAX_SPECIAL_ADDR_DELTA SPECIAL_ADDR(255)
#define INITIAL_STATE \ #define INITIAL_STATE \
/* initialize as per DWARF2.0 standard: */ \ /* Initialize as per DWARF2.0 standard. */ \
0, /* address */ \ 0, /* address */ \
1, /* file */ \ 1, /* file */ \
1, /* line */ \ 1, /* line */ \
@ -118,6 +118,7 @@ static struct
unsigned int unsigned int
any_dwarf2_directives : 1; /* did we emit any DWARF2 line debug directives? */ any_dwarf2_directives : 1; /* did we emit any DWARF2 line debug directives? */
fragS * frag; /* frag that "addr" is relative to */
segT text_seg; /* text segment "addr" is relative to */ segT text_seg; /* text segment "addr" is relative to */
subsegT text_subseg; subsegT text_subseg;
segT line_seg; /* ".debug_line" segment */ segT line_seg; /* ".debug_line" segment */
@ -149,6 +150,7 @@ ls =
0, 0,
0, 0,
0, 0,
0,
NULL, NULL,
{ NULL, 0, 0, 0, 0 }, { NULL, 0, 0, 0, 0 },
0, 0,
@ -324,6 +326,7 @@ static void
out_end_sequence () out_end_sequence ()
{ {
addressT addr, delta; addressT addr, delta;
fragS *text_frag;
if (ls.text_seg) if (ls.text_seg)
{ {
@ -333,11 +336,13 @@ out_end_sequence ()
#else #else
addr = frag_now_fix (); addr = frag_now_fix ();
#endif #endif
text_frag = frag_now;
subseg_set (ls.line_seg, DL_BODY); subseg_set (ls.line_seg, DL_BODY);
if (addr < ls.sm.addr) if (text_frag != ls.frag)
{ {
out_set_addr (addr); out_set_addr (addr);
ls.sm.addr = addr; ls.sm.addr = addr;
ls.frag = text_frag;
} }
else else
{ {
@ -407,6 +412,9 @@ get_filenum (filenum, file)
return ++ls.num_filenames; return ++ls.num_filenames;
} }
/* Emit an entry in the line number table if the address or line has changed.
ADDR is relative to the current frag in the text section. */
void void
dwarf2_gen_line_info (addr, l) dwarf2_gen_line_info (addr, l)
addressT addr; addressT addr;
@ -416,6 +424,7 @@ dwarf2_gen_line_info (addr, l)
unsigned int any_output = 0; unsigned int any_output = 0;
subsegT saved_subseg; subsegT saved_subseg;
segT saved_seg; segT saved_seg;
fragS *saved_frag;
if (flag_debug) if (flag_debug)
fprintf (stderr, "line: addr %lx file `%s' line %u col %u flags %x\n", fprintf (stderr, "line: addr %lx file `%s' line %u col %u flags %x\n",
@ -438,6 +447,7 @@ dwarf2_gen_line_info (addr, l)
them. */ them. */
saved_seg = now_seg; saved_seg = now_seg;
saved_subseg = now_subseg; saved_subseg = now_subseg;
saved_frag = frag_now;
if (!ls.line_seg) if (!ls.line_seg)
{ {
@ -473,6 +483,7 @@ dwarf2_gen_line_info (addr, l)
ls.text_subseg = saved_subseg; ls.text_subseg = saved_subseg;
out_set_addr (addr); out_set_addr (addr);
ls.sm.addr = addr; ls.sm.addr = addr;
ls.frag = saved_frag;
} }
if (ls.sm.filenum != filenum) if (ls.sm.filenum != filenum)
@ -506,18 +517,15 @@ dwarf2_gen_line_info (addr, l)
if (ls.sm.line != l->line) if (ls.sm.line != l->line)
{ {
any_output = 1; any_output = 1;
if (addr < ls.sm.addr) if (saved_frag != ls.frag)
{ {
/* This happens when a new frag got allocated (for whatever /* If a new frag got allocated (for whatever reason), then
reason). Deal with it by generating a reference symbol. deal with it by generating a reference symbol. Note: no
Note: no end_sequence needs to be generated because the end_sequence needs to be generated because the address did
address did not really decrease (only the reference point not really decrease (only the reference point changed). */
changed).
??? Perhaps we should directly check for a change of
frag_now instead? */
out_set_addr (addr); out_set_addr (addr);
ls.sm.addr = addr; ls.sm.addr = addr;
ls.frag = saved_frag;
} }
gen_addr_line (l->line - ls.sm.line, gen_addr_line (l->line - ls.sm.line,
(addr - ls.sm.addr) / DWARF2_LINE_MIN_INSN_LENGTH); (addr - ls.sm.addr) / DWARF2_LINE_MIN_INSN_LENGTH);