aboutsummaryrefslogtreecommitdiff
path: root/gdb/top.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-06-21 01:11:53 +0100
committerPedro Alves <palves@redhat.com>2016-06-21 01:11:53 +0100
commit98d9f24ed15c5ca33bff06647d87b85e22e586d2 (patch)
tree4451a49d3b52e65ab9a4c8289de6e7e57590c0b2 /gdb/top.c
parenteaae60fd9421cd055c88584bf783942888b8c68e (diff)
downloadfsf-binutils-gdb-98d9f24ed15c5ca33bff06647d87b85e22e586d2.zip
fsf-binutils-gdb-98d9f24ed15c5ca33bff06647d87b85e22e586d2.tar.gz
fsf-binutils-gdb-98d9f24ed15c5ca33bff06647d87b85e22e586d2.tar.bz2
Make main_ui be heap allocated
This is preparation for being able to create more than one UI object. The change to gdb_main to stop using catch_errors is necessary because catch_errors references current_uiout, which expands to current_ui->m_current_ui, which would crash because current_ui is not initialized yet at that point. It didn't trigger earlier in the series because before this patch, main_ui/current_ui always start out non-NULL. gdb/ChangeLog: 2016-06-21 Pedro Alves <palves@redhat.com> * event-top.c (main_ui_): Delete. (main_ui, current_ui, ui_list): No longer initialize here. * main.c (captured_main): UI initialization code factored out to new new_ui function. (gdb_main): Wrap captured_main with TRY/CATCH instead of catch_errors. * top.c (highest_ui_num): New global. (new_ui): New function. * top.h (struct ui) <num>: New field. (new_ui): New declaration.
Diffstat (limited to 'gdb/top.c')
-rw-r--r--gdb/top.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/gdb/top.c b/gdb/top.c
index e40835b..c5e237d 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -246,6 +246,46 @@ void (*deprecated_call_command_hook) (struct cmd_list_element * c,
void (*deprecated_context_hook) (int id);
+/* The highest UI number ever assigned. */
+static int highest_ui_num;
+
+/* See top.h. */
+
+struct ui *
+new_ui (FILE *instream, FILE *outstream, FILE *errstream)
+{
+ struct ui *ui;
+
+ ui = XCNEW (struct ui);
+
+ ui->num = ++highest_ui_num;
+ ui->instream = instream;
+ ui->outstream = outstream;
+ ui->errstream = errstream;
+
+ ui->input_fd = fileno (ui->instream);
+
+ ui->m_gdb_stdin = stdio_fileopen (ui->instream);
+ ui->m_gdb_stdout = stdio_fileopen (ui->outstream);
+ ui->m_gdb_stderr = stderr_fileopen (ui->errstream);
+ ui->m_gdb_stdlog = ui->m_gdb_stderr;
+
+ ui->prompt_state = PROMPT_NEEDED;
+
+ if (ui_list == NULL)
+ ui_list = ui;
+ else
+ {
+ struct ui *last;
+
+ for (last = ui_list; last->next != NULL; last = last->next)
+ ;
+ last->next = ui;
+ }
+
+ return ui;
+}
+
/* Handler for SIGHUP. */
#ifdef SIGHUP