From f9ca76e8c6a39b89c2e1fd325b915aa014521a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 12 Oct 2009 16:43:23 +0000 Subject: [PATCH] * Applied patch by "v" to enable the TUI mode in gdb, see ticket #4738. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33556 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/gdb/gdb/Jamfile | 27 +++++++++++++++++++++++++-- src/bin/gdb/gdb/config-x86/config.h | 2 +- src/bin/gdb/gdb/config-x86/init.c | 14 ++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/bin/gdb/gdb/Jamfile b/src/bin/gdb/gdb/Jamfile index 5821bfe43e..93d8826520 100644 --- a/src/bin/gdb/gdb/Jamfile +++ b/src/bin/gdb/gdb/Jamfile @@ -10,10 +10,11 @@ SubDirSysHdrs [ FDirName $(HAIKU_TOP) src bin gawk intl ] ; # Use gawk's libintl for the time being. # TODO: Put a current version of intl ot src/libs and build a static lib # all interested apps can link against. +UseLibraryHeaders ncurses ; UsePrivateHeaders debug ; SubDirCcFlags -DHAVE_CONFIG_H -DLOCALEDIR=\\\"/etc/locale\\\" - -DMI_OUT=1 ; + -DMI_OUT=1 -DTUI=1 ; # filter warnings we don't want here TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) @@ -22,6 +23,7 @@ TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS) SEARCH_SOURCE += [ FDirName $(SUBDIR) cli ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) mi ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) signals ] ; +SEARCH_SOURCE += [ FDirName $(SUBDIR) tui ] ; # architecture specific sources local gdbHaikuArchTargetSources ; @@ -215,6 +217,26 @@ local gdbHostSources = mi-symbol-cmds.c ; +local gdbTUISources = + tui-command.c + tui-data.c + tui-disasm.c + tui-file.c + tui-hooks.c + tui-interp.c + tui-io.c + tui-layout.c + tui-out.c + tui-regs.c + tui-source.c + tui-stack.c + tui-win.c + tui-windata.c + tui-wingeneral.c + tui-winsource.c + tui.c +; + local gdbHaikuTargetSources = haiku-tdep.c solib.c @@ -232,6 +254,7 @@ local gdbAllLibSources = $(gdbBaseSources) $(gdbGeneratedSources) $(gdbHostSources) + $(gdbTUISources) $(gdbHaikuTargetSources) $(gdbHaikuNativeSources) $(gdbHaikuArchTargetSources) @@ -257,7 +280,7 @@ BinCommand gdb : gdb.c : libreadline.a libintl.a # use gawk's libintl for the time being - libtermcap.a + libncurses.a libroot.so libdebug.so diff --git a/src/bin/gdb/gdb/config-x86/config.h b/src/bin/gdb/gdb/config-x86/config.h index 6e095f0e6f..d8bd9b0637 100644 --- a/src/bin/gdb/gdb/config-x86/config.h +++ b/src/bin/gdb/gdb/config-x86/config.h @@ -310,7 +310,7 @@ #define HAVE_MEMORY_H 1 /* Define if you have the header file. */ -/* #undef HAVE_NCURSES_H */ +#define HAVE_NCURSES_H 1 /* Define if you have the header file. */ /* #undef HAVE_NCURSES_NCURSES_H */ diff --git a/src/bin/gdb/gdb/config-x86/init.c b/src/bin/gdb/gdb/config-x86/init.c index 419ccd3d14..d5ede990cf 100644 --- a/src/bin/gdb/gdb/config-x86/init.c +++ b/src/bin/gdb/gdb/config-x86/init.c @@ -103,6 +103,13 @@ extern initialize_file_ftype _initialize_mi_cmds; extern initialize_file_ftype _initialize_mi_cmd_env; extern initialize_file_ftype _initialize_mi_interp; extern initialize_file_ftype _initialize_mi_main; +extern initialize_file_ftype _initialize_tui_hooks; +extern initialize_file_ftype _initialize_tui_interp; +extern initialize_file_ftype _initialize_tui_layout; +extern initialize_file_ftype _initialize_tui_out; +extern initialize_file_ftype _initialize_tui_regs; +extern initialize_file_ftype _initialize_tui_stack; +extern initialize_file_ftype _initialize_tui_win; void initialize_all_files (void) { @@ -207,4 +214,11 @@ initialize_all_files (void) _initialize_mi_cmd_env (); _initialize_mi_interp (); _initialize_mi_main (); + _initialize_tui_hooks (); + _initialize_tui_interp (); + _initialize_tui_layout (); + _initialize_tui_out (); + _initialize_tui_regs (); + _initialize_tui_stack (); + _initialize_tui_win (); }