This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[rfa] Fix tui compilation
- From: Andreas Schwab <schwab at suse dot de>
- To: gdb-patches at sources dot redhat dot com
- Date: 10 Jun 2003 00:47:58 +0200
- Subject: [rfa] Fix tui compilation
This makes the tui compile again.
Andreas.
2003-06-10 Andreas Schwab <schwab@suse.de>
* Makefile.in (tuiDisassem.o): Update dependencies.
--- gdb/Makefile.in.~1.395.~ 2003-06-09 22:53:37.000000000 +0200
+++ gdb/Makefile.in 2003-06-10 00:14:42.000000000 +0200
@@ -2693,7 +2693,7 @@ tuiDataWin.o: $(srcdir)/tui/tuiDataWin.c
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)
2003-06-10 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".
--- gdb/tui/tui-hooks.c.~1.12.~ 2003-02-15 02:49:24.000000000 +0100
+++ gdb/tui/tui-hooks.c 2003-06-10 00:16:18.000000000 +0200
@@ -250,7 +250,7 @@ tui_selected_frame_level_changed_hook (i
{
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
--- gdb/tui/tuiDisassem.c.~1.20.~ 2003-05-04 20:42:21.000000000 +0200
+++ gdb/tui/tuiDisassem.c 2003-06-10 00:13:17.000000000 +0200
@@ -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 (TuiScrollDire
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;
--- gdb/tui/tuiSource.c.~1.14.~ 2002-11-30 20:57:42.000000000 +0100
+++ gdb/tui/tuiSource.c 2003-06-10 00:08:09.000000000 +0200
@@ -340,7 +340,7 @@ tuiVerticalSourceScroll (TuiScrollDirect
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;
--- gdb/tui/tuiSourceWin.c.~1.23.~ 2002-11-30 20:57:42.000000000 +0100
+++ gdb/tui/tuiSourceWin.c 2003-06-10 00:15:16.000000000 +0200
@@ -355,7 +355,7 @@ tuiHorizontalSourceScroll (TuiWinInfoPtr
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;
--- gdb/tui/tuiStack.c.~1.26.~ 2002-12-07 22:20:05.000000000 +0100
+++ gdb/tui/tuiStack.c 2003-06-10 00:09:34.000000000 +0200
@@ -233,7 +233,7 @@ tui_get_function_from_frame (struct fram
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)
--- gdb/tui/tuiWin.c.~1.27.~ 2002-12-10 15:09:24.000000000 +0100
+++ gdb/tui/tuiWin.c 2003-06-10 00:10:57.000000000 +0200
@@ -1406,7 +1406,7 @@ _makeVisibleWithNewHeight (TuiWinInfoPtr
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