From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27150 invoked by alias); 8 May 2012 18:51:18 -0000 Received: (qmail 27141 invoked by uid 22791); 8 May 2012 18:51:15 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_DNSWL_NONE,RCVD_IN_HOSTKARMA_NO,RCVD_IN_NIX_SPAM,SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtaout22.012.net.il (HELO mtaout22.012.net.il) (80.179.55.172) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 08 May 2012 18:51:01 +0000 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M3P00H00W8RIL00@a-mtaout22.012.net.il> for gdb-patches@sourceware.org; Tue, 08 May 2012 21:50:59 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.210.75]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M3P00G18WCW5BN0@a-mtaout22.012.net.il>; Tue, 08 May 2012 21:50:57 +0300 (IDT) Date: Tue, 08 May 2012 18:51:00 -0000 From: Eli Zaretskii Subject: Re: GDB/MI and ">" prompts In-reply-to: <20120508155123.GA15555@adacore.com> To: Joel Brobecker Cc: marc.khouzam@ericsson.com, stanshebs@earthlink.net, gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83pqae1pb2.fsf@gnu.org> References: <83vckviv3b.fsf@gnu.org> <20120419154853.GM25623@adacore.com> <83sjfzitxx.fsf@gnu.org> <83r4vjitnj.fsf@gnu.org> <20120419185329.GO25623@adacore.com> <83mx67ikxm.fsf@gnu.org> <837gx7hhxa.fsf@gnu.org> <83lilg6ysn.fsf@gnu.org> <4F9EBD0D.2090701@earthlink.net> <20120508155123.GA15555@adacore.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-05/txt/msg00239.txt.bz2 > Date: Tue, 8 May 2012 08:51:23 -0700 > From: Joel Brobecker > Cc: 'Stan Shebs' , > "'gdb-patches@sourceware.org'" , > 'Eli Zaretskii' > > Thanks for doing the testing, Mark! > > Stan said: > > > If Eclipse is good, then this is OK to commit. > > Mark reported: > > So, it seems ok for an Eclipse perspective. > > So it seems Eli is good to go! Thanks. Here's what I actually committed: Index: gdb/ChangeLog =================================================================== RCS file: /cvs/src/src/gdb/ChangeLog,v retrieving revision 1.14219 diff -u -p -r1.14219 ChangeLog --- gdb/ChangeLog 8 May 2012 14:07:06 -0000 1.14219 +++ gdb/ChangeLog 8 May 2012 18:48:12 -0000 @@ -1,3 +1,16 @@ +2012-05-08 Eli Zaretskii + + Display the ">" prompt in interactive mode while reading canned + commands, even when the current interpreter is MI. + + * interps.c (interp_set_temp): New function. + + * interps.h (interp_set_temp): Add prototype. + + * cli/cli-script.c (restore_interp): New cleanup function. + (read_command_lines): Temporarily override the current interpreter + with CLI and arrange for restoring the original one. + 2012-05-12 Joel Sherrill * microblaze-rom.c (_initialize_picobug_rom): Add prototype. Index: gdb/interps.c =================================================================== RCS file: /cvs/src/src/gdb/interps.c,v retrieving revision 1.44 diff -u -p -r1.44 interps.c --- gdb/interps.c 4 Jan 2012 08:17:05 -0000 1.44 +++ gdb/interps.c 8 May 2012 18:48:12 -0000 @@ -253,6 +253,18 @@ interp_ui_out (struct interp *interp) return current_interpreter->procs->ui_out_proc (current_interpreter); } +/* Temporarily overrides the current interpreter. */ +struct interp * +interp_set_temp (const char *name) +{ + struct interp *interp = interp_lookup (name); + struct interp *old_interp = current_interpreter; + + if (interp) + current_interpreter = interp; + return old_interp; +} + /* Returns the interpreter's cookie. */ void * Index: gdb/interps.h =================================================================== RCS file: /cvs/src/src/gdb/interps.h,v retrieving revision 1.22 diff -u -p -r1.22 interps.h --- gdb/interps.h 4 Jan 2012 08:17:05 -0000 1.22 +++ gdb/interps.h 8 May 2012 18:48:12 -0000 @@ -69,6 +69,7 @@ extern struct interp *interp_lookup (con extern struct ui_out *interp_ui_out (struct interp *interp); extern void *interp_data (struct interp *interp); extern const char *interp_name (struct interp *interp); +extern struct interp *interp_set_temp (const char *name); extern int current_interp_named_p (const char *name); extern int current_interp_display_prompt_p (void); Index: gdb/cli/cli-script.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-script.c,v retrieving revision 1.74 diff -u -p -r1.74 cli-script.c --- gdb/cli/cli-script.c 24 Jan 2012 20:56:33 -0000 1.74 +++ gdb/cli/cli-script.c 8 May 2012 18:48:12 -0000 @@ -1178,6 +1178,12 @@ recurse_read_control_structure (char * ( return ret; } +static void +restore_interp (void *arg) +{ + interp_set_temp (interp_name ((struct interp *)arg)); +} + /* Read lines from the input stream and accumulate them in a chain of struct command_line's, which is then returned. For input from a terminal, the special command "end" is used to mark the end of the @@ -1210,8 +1216,21 @@ read_command_lines (char *prompt_arg, in } } - head = read_command_lines_1 (read_next_line, parse_commands, - validator, closure); + + /* Reading commands assumes the CLI behavior, so temporarily + override the current interpreter with CLI. */ + if (current_interp_named_p (INTERP_CONSOLE)) + head = read_command_lines_1 (read_next_line, parse_commands, + validator, closure); + else + { + struct interp *old_interp = interp_set_temp (INTERP_CONSOLE); + struct cleanup *old_chain = make_cleanup (restore_interp, old_interp); + + head = read_command_lines_1 (read_next_line, parse_commands, + validator, closure); + do_cleanups (old_chain); + } if (deprecated_readline_end_hook && from_tty && input_from_terminal_p ()) {