X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-data.h;h=df1fe6cd954d0b0b1dbf8b03b5ad6a23e4352d3a;hb=6f1cb6eac2f28c6e1cb49c011f2b916afb90b4ff;hp=63a5b2594fd0802e50c44cdbf321d5f6a69bdee4;hpb=a9762ec78a53fbe9209fe1654db42df0cd328d50;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 63a5b2594f..df1fe6cd95 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -1,7 +1,6 @@ /* TUI data manipulation routines. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006, 2007 - Free Software Foundation, Inc. + Copyright (C) 1998-2015 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -32,6 +31,11 @@ struct tui_point int x, y; }; +struct tui_win_element; + +/* This describes the content of the window. */ +typedef struct tui_win_element **tui_win_content; + /* Generic window information. */ struct tui_gen_win_info { @@ -40,7 +44,7 @@ struct tui_gen_win_info int width; /* Window width. */ int height; /* Window height. */ struct tui_point origin; /* Origin of window. */ - void **content; /* Content of window. */ + tui_win_content content; /* Content of window. */ int content_size; /* Size of content (# of elements). */ int content_in_use; /* Can it be used, or is it already used? */ int viewport_height; /* Viewport height. */ @@ -56,10 +60,10 @@ struct tui_gen_win_info #define NO_REGS_STRING "[ Register Values Unavailable ]" #define NO_DATA_STRING "[ No Data Values Displayed ]" #define MAX_CONTENT_COUNT 100 -#define SRC_NAME "SRC" -#define CMD_NAME "CMD" -#define DATA_NAME "REGS" -#define DISASSEM_NAME "ASM" +#define SRC_NAME "src" +#define CMD_NAME "cmd" +#define DATA_NAME "regs" +#define DISASSEM_NAME "asm" #define TUI_NULL_STR "" #define DEFAULT_HISTORY_COUNT 25 #define BOX_WINDOW TRUE @@ -76,7 +80,7 @@ struct tui_gen_win_info /* Strings to display in the TUI status line. */ #define PROC_PREFIX "In: " -#define LINE_PREFIX "Line: " +#define LINE_PREFIX "L" #define PC_PREFIX "PC: " #define SINGLE_KEY "(SingleKey)" @@ -86,16 +90,7 @@ struct tui_gen_win_info numbers. */ #define MIN_PROC_WIDTH 12 #define MAX_TARGET_WIDTH 10 -#define MAX_PID_WIDTH 14 - -#define TUI_FLOAT_REGS_NAME "$FREGS" -#define TUI_FLOAT_REGS_NAME_LOWER "$fregs" -#define TUI_GENERAL_REGS_NAME "$GREGS" -#define TUI_GENERAL_REGS_NAME_LOWER "$gregs" -#define TUI_SPECIAL_REGS_NAME "$SREGS" -#define TUI_SPECIAL_REGS_NAME_LOWER "$sregs" -#define TUI_GENERAL_SPECIAL_REGS_NAME "$REGS" -#define TUI_GENERAL_SPECIAL_REGS_NAME_LOWER "$regs" +#define MAX_PID_WIDTH 19 /* Scroll direction enum. */ enum tui_scroll_direction @@ -135,21 +130,16 @@ enum tui_data_type TUI_STRUCT }; -/* Types of register displays. */ -enum tui_register_display_type +enum tui_line_or_address_kind { - TUI_UNDEFINED_REGS, - TUI_GENERAL_REGS, - TUI_SFLOAT_REGS, - TUI_DFLOAT_REGS, - TUI_SPECIAL_REGS, - TUI_GENERAL_AND_SPECIAL_REGS + LOA_LINE, + LOA_ADDRESS }; /* Structure describing source line or line address. */ struct tui_line_or_address { - enum { LOA_LINE, LOA_ADDRESS } loa; + enum tui_line_or_address_kind loa; union { int line_no; @@ -162,8 +152,6 @@ struct tui_layout_def { enum tui_win_type display_mode; int split; - enum tui_register_display_type regs_display_type; - enum tui_register_display_type float_regs_display_type; }; /* Elements in the Source/Disassembly Window. */ @@ -195,16 +183,22 @@ struct tui_command_element char *line; }; - -#define MAX_LOCATOR_ELEMENT_LEN 100 +#ifdef PATH_MAX +# define MAX_LOCATOR_ELEMENT_LEN PATH_MAX +#else +# define MAX_LOCATOR_ELEMENT_LEN 1024 +#endif /* Elements in the locator window content. */ struct tui_locator_element { - char file_name[MAX_LOCATOR_ELEMENT_LEN]; + /* Resolved absolute filename as returned by symtab_to_fullname. */ + char full_name[MAX_LOCATOR_ELEMENT_LEN]; char proc_name[MAX_LOCATOR_ELEMENT_LEN]; int line_no; CORE_ADDR addr; + /* Architecture associated with code at this location. */ + struct gdbarch *gdbarch; }; /* Flags to tell what kind of breakpoint is at current line. */ @@ -239,11 +233,6 @@ struct tui_win_element union tui_which_element which_element; }; - -/* This describes the content of the window. */ -typedef struct tui_win_element **tui_win_content; - - /* This struct defines the specific information about a data display window. */ struct tui_data_info @@ -252,7 +241,6 @@ struct tui_data_info int data_content_count; tui_win_content regs_content; /* Start of regs display content. */ int regs_content_count; - enum tui_register_display_type regs_display_type; int regs_column_count; int display_regs; /* Should regs be displayed at all? */ struct reggroup *current_group; @@ -266,14 +254,17 @@ struct tui_source_info struct tui_gen_win_info *execution_info; int horizontal_offset; /* Used for horizontal scroll. */ struct tui_line_or_address start_line_or_addr; - char *filename; + + /* It is the resolved form as returned by symtab_to_fullname. */ + char *fullname; + + /* Architecture associated with code at this location. */ + struct gdbarch *gdbarch; }; struct tui_command_info { - int cur_line; /* The current line position. */ - int curch; /* The current cursor position. */ int start_line; }; @@ -327,15 +318,13 @@ extern void tui_free_all_source_wins_content (void); extern void tui_del_window (struct tui_win_info *); extern void tui_del_data_windows (tui_win_content, int); extern struct tui_win_info *tui_partial_win_by_name (char *); -extern char *tui_win_name (struct tui_gen_win_info *); +extern const char *tui_win_name (const struct tui_gen_win_info *); extern enum tui_layout_type tui_current_layout (void); extern void tui_set_current_layout_to (enum tui_layout_type); extern int tui_term_height (void); extern void tui_set_term_height_to (int); extern int tui_term_width (void); extern void tui_set_term_width_to (int); -extern void tui_set_gen_win_origin (struct tui_gen_win_info *, - int, int); extern struct tui_gen_win_info *tui_locator_win_info_ptr (void); extern struct tui_gen_win_info *tui_source_exec_info_win_ptr (void); extern struct tui_gen_win_info *tui_disassem_exec_info_win_ptr (void);