From c214a6fd4d4e7d6d8bfd1dc355442070a63ca61a Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Sun, 22 Sep 2002 20:29:52 +0000 Subject: [PATCH] * source.c (get_current_source_symtab_and_line): Initialize sal.pc and sal.end fields. (get_current_or_default_source_symtab_and_line): Ditto. * breakpoint.c (parse_breakpoint_sals): Use correct accessor function so we do not cause a new source symtab to be searched for (reverting an unintentional change from the 2002-09-20 patch). * scm-lang.c (scm_unpac): Ditto. --- gdb/ChangeLog | 10 ++++++++++ gdb/breakpoint.c | 3 +-- gdb/scm-lang.c | 3 +-- gdb/source.c | 4 ++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a570734..e1866d1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2002-09-22 Fernando Nasser + + * source.c (get_current_source_symtab_and_line): Initialize sal.pc and + sal.end fields. + (get_current_or_default_source_symtab_and_line): Ditto. + * breakpoint.c (parse_breakpoint_sals): Use correct accessor function + so we do not cause a new source symtab to be searched for (reverting an + unintentional change from the 2002-09-20 patch). + * scm-lang.c (scm_unpac): Ditto. + 2002-09-21 Andrew Cagney * complaints.c (symfile_explanations): Remove new-line from diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index caa8f1c..a77bff4 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4620,8 +4620,7 @@ parse_breakpoint_sals (char **address, should produce the results we want almost all of the time while leaving default_breakpoint_* alone. */ - struct symtab_and_line cursal = - get_current_or_default_source_symtab_and_line (); + struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (default_breakpoint_valid && (!cursal.symtab diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c index 318a51d..5b2f0c5 100644 --- a/gdb/scm-lang.c +++ b/gdb/scm-lang.c @@ -134,8 +134,7 @@ scm_unpack (struct type *type, char *valaddr, enum type_code context) static int in_eval_c (void) { - struct symtab_and_line cursal = - get_current_or_default_source_symtab_and_line (); + struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (cursal.symtab && cursal.symtab->filename) { diff --git a/gdb/source.c b/gdb/source.c index e5d99d3..d2e47fe 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -179,6 +179,8 @@ get_current_or_default_source_symtab_and_line (void) cursal.symtab = current_source_symtab; cursal.line = current_source_line; + cursal.pc = 0; + cursal.end = 0; return cursal; } @@ -197,6 +199,8 @@ set_current_source_symtab_and_line (struct symtab_and_line *sal) current_source_symtab = sal->symtab; current_source_line = sal->line; + cursal.pc = 0; + cursal.end = 0; return cursal; } -- 2.7.4