diff options
| author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:53 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:53 +0100 |
| commit | 98d9f24ed15c5ca33bff06647d87b85e22e586d2 (patch) | |
| tree | 4451a49d3b52e65ab9a4c8289de6e7e57590c0b2 /gdb/event-top.c | |
| parent | eaae60fd9421cd055c88584bf783942888b8c68e (diff) | |
| download | binutils-gdb-98d9f24ed15c5ca33bff06647d87b85e22e586d2.tar.gz | |
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/event-top.c')
| -rw-r--r-- | gdb/event-top.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/event-top.c b/gdb/event-top.c index c9e754875df..318da1d32e1 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -441,12 +441,11 @@ top_level_prompt (void) return xstrdup (prompt); } -/* The main UI. */ -static struct ui main_ui_; +/* See top.h. */ -struct ui *main_ui = &main_ui_; -struct ui *current_ui = &main_ui_; -struct ui *ui_list = &main_ui_; +struct ui *main_ui; +struct ui *current_ui; +struct ui *ui_list; /* See top.h. */ |