OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* symtab.c (decode_line_1, decode_line_2): Do not adjust pc by

Browse Source 
FUNCTION_START_OFFSET if funfirstline is not set.
This commit is contained in:
Peter Schauer 1993-11-08 07:51:23 +00:00
parent 1d3e88472d
commit 2cacd1e3f6
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
Sun Nov 7 23:49:21 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
* symtab.c (decode_line_1, decode_line_2): Do not adjust pc by
FUNCTION_START_OFFSET if funfirstline is not set.
Fri Nov 5 17:19:30 1993 Kung Hsu (kung@cirdan.cygnus.com) Fri Nov 5 17:19:30 1993 Kung Hsu (kung@cirdan.cygnus.com)
* gdbtypes.h : add a field 'ignore_field_bits in cplus_specific, * gdbtypes.h : add a field 'ignore_field_bits in cplus_specific,

29
gdb/symtab.c
View File

@ -1830,9 +1830,12 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK) if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
{ {
/* Arg is the name of a function */ /* Arg is the name of a function */
pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) + FUNCTION_START_OFFSET; pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
if (funfirstline) if (funfirstline)
SKIP_PROLOGUE (pc); {
pc += FUNCTION_START_OFFSET;
SKIP_PROLOGUE (pc);
}
values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line)); values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line));
values.nelts = 1; values.nelts = 1;
values.sals[0] = find_pc_line (pc, 0); values.sals[0] = find_pc_line (pc, 0);
@ -2006,9 +2009,12 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
if (SYMBOL_CLASS (sym) == LOC_BLOCK) if (SYMBOL_CLASS (sym) == LOC_BLOCK)
{ {
/* Arg is the name of a function */ /* Arg is the name of a function */
pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) + FUNCTION_START_OFFSET; pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
if (funfirstline) if (funfirstline)
SKIP_PROLOGUE (pc); {
pc += FUNCTION_START_OFFSET;
SKIP_PROLOGUE (pc);
}
val = find_pc_line (pc, 0); val = find_pc_line (pc, 0);
#ifdef PROLOGUE_FIRSTLINE_OVERLAP #ifdef PROLOGUE_FIRSTLINE_OVERLAP
/* Convex: no need to suppress code on first line, if any */ /* Convex: no need to suppress code on first line, if any */
@ -2070,9 +2076,12 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
{ {
val.symtab = 0; val.symtab = 0;
val.line = 0; val.line = 0;
val.pc = SYMBOL_VALUE_ADDRESS (msymbol) + FUNCTION_START_OFFSET; val.pc = SYMBOL_VALUE_ADDRESS (msymbol);
if (funfirstline) if (funfirstline)
SKIP_PROLOGUE (val.pc); {
val.pc += FUNCTION_START_OFFSET;
SKIP_PROLOGUE (val.pc);
}
values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line)); values.sals = (struct symtab_and_line *)xmalloc (sizeof (struct symtab_and_line));
values.sals[0] = val; values.sals[0] = val;
values.nelts = 1; values.nelts = 1;
@ -2143,10 +2152,12 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
if (sym_arr[i] && SYMBOL_CLASS (sym_arr[i]) == LOC_BLOCK) if (sym_arr[i] && SYMBOL_CLASS (sym_arr[i]) == LOC_BLOCK)
{ {
/* Arg is the name of a function */ /* Arg is the name of a function */
pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym_arr[i])) pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym_arr[i]));
+ FUNCTION_START_OFFSET;
if (funfirstline) if (funfirstline)
SKIP_PROLOGUE (pc); {
pc += FUNCTION_START_OFFSET;
SKIP_PROLOGUE (pc);
}
values.sals[i] = find_pc_line (pc, 0); values.sals[i] = find_pc_line (pc, 0);
values.sals[i].pc = (values.sals[i].end && values.sals[i].pc != pc) ? values.sals[i].pc = (values.sals[i].end && values.sals[i].pc != pc) ?
values.sals[i].end : pc; values.sals[i].end : pc;