From 1af12a7dddcceabbdf734a64d08b9070278543d8 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 29 Aug 2013 16:59:48 +0000 Subject: [PATCH] Remove use of deprecated_command_loop_hook from mi code. https://sourceware.org/ml/gdb-patches/2013-08/msg00605.html gdb/ChangeLog * mi/mi-interp.c (mi_command_loop): Change signature to match interp_command_loop_ftype. (mi1_command_loop): Remove. (mi2_command_loop): Remove. (mi3_command_loop): Remove. (mi_interpreter_resume): Remove setting of deprecated_command_loop_hook. (_initialize_mi_interp): Set mi_command_loop as the command loop callback. --- gdb/ChangeLog | 12 ++++++++++++ gdb/mi/mi-interp.c | 39 ++++----------------------------------- 2 files changed, 16 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f304cec619f..7c2647e3176 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2013-08-29 Andrew Burgess + + * mi/mi-interp.c (mi_command_loop): Change signature to match + interp_command_loop_ftype. + (mi1_command_loop): Remove. + (mi2_command_loop): Remove. + (mi3_command_loop): Remove. + (mi_interpreter_resume): Remove setting of + deprecated_command_loop_hook. + (_initialize_mi_interp): Set mi_command_loop as the command loop + callback. + 2013-08-29 Sanimir Agovic * valops.c (do_search_struct_field): Pass v2 instead of base_type to diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index e370a57f6a9..038132f32a9 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -43,7 +43,7 @@ static void mi_execute_command_wrapper (const char *cmd); static void mi_execute_command_input_handler (char *cmd); -static void mi_command_loop (int mi_version); +static void mi_command_loop (void *data); /* These are hooks that we put in place while doing interpreter_exec so we can report interesting things that happened "behind the MI's @@ -52,10 +52,6 @@ static void mi_command_loop (int mi_version); static int mi_interp_query_hook (const char *ctlstr, va_list ap) ATTRIBUTE_PRINTF (1, 0); -static void mi3_command_loop (void); -static void mi2_command_loop (void); -static void mi1_command_loop (void); - static void mi_insert_notify_hooks (void); static void mi_remove_notify_hooks (void); static void mi_on_normal_stop (struct bpstats *bs, int print_frame); @@ -193,16 +189,6 @@ mi_interpreter_resume (void *data) deprecated_show_load_progress = mi_load_progress; - /* If we're _the_ interpreter, take control. */ - if (current_interp_named_p (INTERP_MI1)) - deprecated_command_loop_hook = mi1_command_loop; - else if (current_interp_named_p (INTERP_MI2)) - deprecated_command_loop_hook = mi2_command_loop; - else if (current_interp_named_p (INTERP_MI3)) - deprecated_command_loop_hook = mi3_command_loop; - else - deprecated_command_loop_hook = mi2_command_loop; - return 1; } @@ -322,25 +308,7 @@ mi_execute_command_input_handler (char *cmd) } static void -mi1_command_loop (void) -{ - mi_command_loop (1); -} - -static void -mi2_command_loop (void) -{ - mi_command_loop (2); -} - -static void -mi3_command_loop (void) -{ - mi_command_loop (3); -} - -static void -mi_command_loop (int mi_version) +mi_command_loop (void *data) { /* Turn off 8 bit strings in quoted output. Any character with the high bit set is printed using C's octal format. */ @@ -996,7 +964,8 @@ _initialize_mi_interp (void) mi_interpreter_exec, /* exec_proc */ mi_interpreter_prompt_p, /* prompt_proc_p */ mi_ui_out, /* ui_out_proc */ - mi_set_logging /* set_logging_proc */ + mi_set_logging, /* set_logging_proc */ + mi_command_loop /* command_loop_proc */ }; /* The various interpreter levels. */ -- 2.30.2