espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-01 20:12:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make main_ui be heap allocated

Browse Source 
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.
This commit is contained in:
Pedro Alves
2016-06-21 01:11:53 +01:00
parent eaae60fd94
commit 98d9f24ed1
5 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gdb/main.c
View File

@ -443,7 +443,6 @@ DEF_VEC_O (cmdarg_s);
static int
captured_main (void *data)
{
struct ui *ui = current_ui;
struct captured_main_args *context = (struct captured_main_args *) data;
int argc = context->argc;
char **argv = context->argv;
@ -514,26 +513,15 @@ captured_main (void *data)
saved_command_line = (char *) xstrdup ("");
ui->instream = stdin;
ui->outstream = stdout;
ui->errstream = stderr;
ui->input_fd = fileno (stdin);
ui->prompt_state = PROMPT_NEEDED;
#ifdef __MINGW32__
/* Ensure stderr is unbuffered. A Cygwin pty or pipe is implemented
as a Windows pipe, and Windows buffers on pipes. */
setvbuf (stderr, NULL, _IONBF, BUFSIZ);
#endif
gdb_stdout = stdio_fileopen (stdout);
gdb_stderr = stderr_fileopen (stderr);
main_ui = new_ui (stdin, stdout, stderr);
current_ui = main_ui;
gdb_stdlog = gdb_stderr; /* for moment */
gdb_stdtarg = gdb_stderr; /* for moment */
gdb_stdin = stdio_fileopen (stdin);
gdb_stdtargerr = gdb_stderr; /* for moment */
gdb_stdtargin = gdb_stdin; /* for moment */
@ -1174,7 +1162,16 @@ captured_main (void *data)
int
gdb_main (struct captured_main_args *args)
{
catch_errors (captured_main, args, "", RETURN_MASK_ALL);
TRY
{
captured_main (args);
}
CATCH (ex, RETURN_MASK_ALL)
{
exception_print (gdb_stderr, ex);
}
END_CATCH
/* The only way to end up here is by an error (normal exit is
handled by quit_force()), hence always return an error status. */
return 1;