aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/Makefile.in2
-rw-r--r--gdb/tui/ChangeLog11
-rw-r--r--gdb/tui/tui-hooks.c2
-rw-r--r--gdb/tui/tuiDisassem.c3
-rw-r--r--gdb/tui/tuiSource.c2
-rw-r--r--gdb/tui/tuiSourceWin.c2
-rw-r--r--gdb/tui/tuiStack.c9
-rw-r--r--gdb/tui/tuiWin.c2
9 files changed, 27 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 250f42e..1556068 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-12 Andreas Schwab <schwab@suse.de>
+
+ * Makefile.in (tuiDisassem.o): Update dependencies.
+
2003-06-12 David Carlton <carlton@bactrian.org>
* symtab.h: Delete declaration of make_symbol_overload_list.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 2cf5b27..a7ebc6a 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2704,7 +2704,7 @@ tuiDataWin.o: $(srcdir)/tui/tuiDataWin.c $(config_h) $(defs_h) $(tui_h) \
tuiDisassem.o: $(srcdir)/tui/tuiDisassem.c $(config_h) $(defs_h) $(symtab_h) \
$(breakpoint_h) $(frame_h) $(value_h) $(tui_h) $(tuiData_h) \
$(tuiWin_h) $(tuiLayout_h) $(tuiSourceWin_h) $(tuiStack_h) \
- $(tui_file_h)
+ $(tui_file_h) $(disasm_h)
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/tui/tuiDisassem.c
tuiGeneralWin.o: $(srcdir)/tui/tuiGeneralWin.c $(config_h) $(defs_h) \
$(tui_h) $(tuiData_h) $(tuiGeneralWin_h) $(tuiWin_h)
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index f44f9aa..79a3353 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-12 Andreas Schwab <schwab@suse.de>
+
+ * tuiSource.c (tuiVerticalSourceScroll): Use get_frame_pc.
+ * tuiSourceWin.c (tuiHorizontalSourceScroll): Likewise.
+ * tuiStack.c (tui_get_function_from_frame): Likewise.
+ (tuiShowFrameInfo): Likewise.
+ * tuiWin.c (_makeVisibleWithNewHeight): Likewise.
+ * tui-hooks.c (tui_selected_frame_level_changed_hook): Likewise.
+ * tuiDisassem.c (tuiVerticalDisassemScroll): Likewise.
+ Include "disasm.h".
+
2003-05-08 Andrew Cagney <cagney@redhat.com>
* tuiRegs.c: Use MAX_REGISTER_SIZE instead of
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index db6c3f6..569ab07 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -250,7 +250,7 @@ tui_selected_frame_level_changed_hook (int level)
{
struct symtab *s;
- s = find_pc_symtab (fi->pc);
+ s = find_pc_symtab (get_frame_pc (fi));
/* elz: this if here fixes the problem with the pc not being displayed
in the tui asm layout, with no debug symbols. The value of s
would be 0 here, and select_source_symtab would abort the
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c
index 0ddf32c..a8668c4 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tuiDisassem.c
@@ -45,6 +45,7 @@
#include "frame.h"
#include "value.h"
#include "source.h"
+#include "disasm.h"
#include "tui.h"
#include "tuiData.h"
@@ -408,7 +409,7 @@ tuiVerticalDisassemScroll (TuiScrollDirection scrollDirection,
content = (TuiWinContent) disassemWin->generic.content;
if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (deprecated_selected_frame->pc);
+ s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
else
s = cursal.symtab;
diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tuiSource.c
index ceccd64..68e7d99 100644
--- a/gdb/tui/tuiSource.c
+++ b/gdb/tui/tuiSource.c
@@ -340,7 +340,7 @@ tuiVerticalSourceScroll (TuiScrollDirection scrollDirection,
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (deprecated_selected_frame->pc);
+ s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
else
s = cursal.symtab;
diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tuiSourceWin.c
index ae844ce..cd52333 100644
--- a/gdb/tui/tuiSourceWin.c
+++ b/gdb/tui/tuiSourceWin.c
@@ -355,7 +355,7 @@ tuiHorizontalSourceScroll (TuiWinInfoPtr winInfo,
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
if (cursal.symtab == (struct symtab *) NULL)
- s = find_pc_symtab (deprecated_selected_frame->pc);
+ s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
else
s = cursal.symtab;
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index 69a6b6c..dca0618 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -233,7 +233,7 @@ tui_get_function_from_frame (struct frame_info *fi)
struct ui_file *stream = tui_sfileopen (256);
char *p;
- print_address_symbolic (fi->pc, stream, demangle, "");
+ print_address_symbolic (get_frame_pc (fi), stream, demangle, "");
p = tui_file_get_strbuf (stream);
/* Use simple heuristics to isolate the function name. The symbol can
@@ -356,7 +356,7 @@ tuiShowFrameInfo (struct frame_info *fi)
tui_set_locator_info (sal.symtab == 0 ? "??" : sal.symtab->filename,
tui_get_function_from_frame (fi),
sal.line,
- fi->pc);
+ get_frame_pc (fi));
tuiShowLocatorContent ();
startLine = 0;
for (i = 0; i < (sourceWindows ())->count; i++)
@@ -374,10 +374,11 @@ tuiShowFrameInfo (struct frame_info *fi)
}
else
{
- if (find_pc_partial_function (fi->pc, (char **) NULL, &low, (CORE_ADDR) NULL) == 0)
+ if (find_pc_partial_function (get_frame_pc (fi), (char **) NULL,
+ &low, (CORE_ADDR) NULL) == 0)
error ("No function contains program counter for selected frame.\n");
else
- low = tuiGetLowDisassemblyAddress (low, fi->pc);
+ low = tuiGetLowDisassemblyAddress (low, get_frame_pc (fi));
}
if (winInfo == srcWin)
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index 9ad82f5..268562e 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -1406,7 +1406,7 @@ _makeVisibleWithNewHeight (TuiWinInfoPtr winInfo)
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
- s = find_pc_symtab (deprecated_selected_frame->pc);
+ s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
if (winInfo->generic.type == SRC_WIN)
line.lineNo = cursal.line;
else