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

Move code to tui-winsource.h 

This moves code related to the execution info window from tui-data.h
to tui-winsource.h.  It fits better here because the execution info is
conceptually part of the source and disassembly windows, and
tui-winsource.h is where this common class lives.

gdb/ChangeLog
2019-08-13  Tom Tromey  <tom@tromey.com>

	* tui/tui-data.h (enum tui_bp_flag, tui_bp_flags, struct tui_source_element)
	(TUI_BP_HIT_POS, TUI_BP_BREAK_POS, TUI_EXEC_POS)
	(TUI_EXECINFO_SIZE, tui_exec_info_content): Move ...
	* tui/tui-winsource.h (enum tui_bp_flag, tui_bp_flags, struct
	tui_source_element, TUI_BP_HIT_POS, TUI_BP_BREAK_POS)
	(TUI_EXEC_POS, TUI_EXECINFO_SIZE, tui_exec_info_content):
	... here.
This commit is contained in:
Tom Tromey 2019-07-05 17:32:19 -06:00
parent 7ba913dcdf
commit 7b56485db5
3 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2019-08-13 Tom Tromey <tom@tromey.com>
* tui/tui-data.h (enum tui_bp_flag, tui_bp_flags, struct tui_source_element)
(TUI_BP_HIT_POS, TUI_BP_BREAK_POS, TUI_EXEC_POS)
(TUI_EXECINFO_SIZE, tui_exec_info_content): Move ...
* tui/tui-winsource.h (enum tui_bp_flag, tui_bp_flags, struct
tui_source_element, TUI_BP_HIT_POS, TUI_BP_BREAK_POS)
(TUI_EXEC_POS, TUI_EXECINFO_SIZE, tui_exec_info_content):
... here.
2019-08-13 Tom Tromey <tom@tromey.com>
* tui/tui-winsource.h (struct tui_source_window_base)

41
gdb/tui/tui-data.h
View File

@ -151,53 +151,12 @@ struct tui_line_or_address
} u;
};
/* Flags to tell what kind of breakpoint is at current line. */
enum tui_bp_flag
{
TUI_BP_ENABLED = 0x01,
TUI_BP_DISABLED = 0x02,
TUI_BP_HIT = 0x04,
TUI_BP_CONDITIONAL = 0x08,
TUI_BP_HARDWARE = 0x10
};
DEF_ENUM_FLAGS_TYPE (enum tui_bp_flag, tui_bp_flags);
/* Elements in the Source/Disassembly Window. */
struct tui_source_element
{
tui_source_element ()
{
line_or_addr.loa = LOA_LINE;
line_or_addr.u.line_no = 0;
}
~tui_source_element ()
{
xfree (line);
}
char *line = nullptr;
struct tui_line_or_address line_or_addr;
bool is_exec_point = false;
tui_bp_flags break_mode = 0;
};
#ifdef PATH_MAX
# define MAX_LOCATOR_ELEMENT_LEN PATH_MAX
#else
# define MAX_LOCATOR_ELEMENT_LEN 1024
#endif
/* Position of breakpoint markers in the exec info string. */
#define TUI_BP_HIT_POS 0
#define TUI_BP_BREAK_POS 1
#define TUI_EXEC_POS 2
#define TUI_EXECINFO_SIZE 4
typedef char tui_exec_info_content[TUI_EXECINFO_SIZE];
/* Locator window class. */
struct tui_locator_window : public tui_gen_win_info

41
gdb/tui/tui-winsource.h
View File

@ -24,6 +24,26 @@
#include "tui/tui-data.h"
/* Flags to tell what kind of breakpoint is at current line. */
enum tui_bp_flag
{
TUI_BP_ENABLED = 0x01,
TUI_BP_DISABLED = 0x02,
TUI_BP_HIT = 0x04,
TUI_BP_CONDITIONAL = 0x08,
TUI_BP_HARDWARE = 0x10
};
DEF_ENUM_FLAGS_TYPE (enum tui_bp_flag, tui_bp_flags);
/* Position of breakpoint markers in the exec info string. */
#define TUI_BP_HIT_POS 0
#define TUI_BP_BREAK_POS 1
#define TUI_EXEC_POS 2
#define TUI_EXECINFO_SIZE 4
typedef char tui_exec_info_content[TUI_EXECINFO_SIZE];
/* Execution info window class. */
struct tui_exec_info_window : public tui_gen_win_info
@ -52,6 +72,27 @@ private:
tui_exec_info_content *m_content = nullptr;
};
/* Elements in the Source/Disassembly Window. */
struct tui_source_element
{
tui_source_element ()
{
line_or_addr.loa = LOA_LINE;
line_or_addr.u.line_no = 0;
}
~tui_source_element ()
{
xfree (line);
}
char *line = nullptr;
struct tui_line_or_address line_or_addr;
bool is_exec_point = false;
tui_bp_flags break_mode = 0;
};
/* The base class for all source-like windows, namely the source and
disassembly windows. */