From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21954 invoked by alias); 15 Jan 2003 00:07:45 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 21947 invoked from network); 15 Jan 2003 00:07:44 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by 209.249.29.67 with SMTP; 15 Jan 2003 00:07:44 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id h0ENdIB31330 for ; Tue, 14 Jan 2003 18:39:18 -0500 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id h0F07Wa21616; Tue, 14 Jan 2003 19:07:32 -0500 Received: from localhost.redhat.com (romulus-int.sfbay.redhat.com [172.16.27.46]) by pobox.corp.redhat.com (8.11.6/8.11.6) with ESMTP id h0F07Vb19867; Tue, 14 Jan 2003 19:07:31 -0500 Received: by localhost.redhat.com (Postfix, from userid 469) id B4B8FFF79; Tue, 14 Jan 2003 19:11:51 -0500 (EST) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15908.42822.899881.673669@localhost.redhat.com> Date: Wed, 15 Jan 2003 00:07:00 -0000 To: Fernando Nasser Cc: Elena Zannoni , Michael Elizabeth Chastain , gdb-patches@sources.redhat.com Subject: Re: [RFC/RFA] New 'to' command In-Reply-To: <3E248AF5.7070305@redhat.com> References: <200301142113.h0ELDgN08815@duracef.shout.net> <15908.32619.688026.129488@localhost.redhat.com> <3E248AF5.7070305@redhat.com> X-SW-Source: 2003-01/txt/msg00545.txt.bz2 Fernando Nasser writes: > Elena Zannoni wrote:> Michael Elizabeth Chastain writes: > > > 'advance' sounds fine to me. > > > > > > Michael C > > > > all right! > > > > Elena > > > > That was quick. I was afraid I had started another long long thread :-) > > Regards to all, > Fernando > > -- > Fernando Nasser > Red Hat - Toronto E-Mail: fnasser@redhat.com > 2323 Yonge Street, Suite #300 > Toronto, Ontario M4P 2C9 This is what I am checking in. 2003-01-14 Elena Zannoni * breakpoint.c (until_break_command): Add new argument. Use it to decide whether to stop only at the current frame or not. * breakpoint.h (until_break_command): Update prototype. * infcmd.c (until_command): Add new argument to until_break_command call. (advance_command): New function. (_initialize_infcmd): Update help string for 'until' command. Add new 'advance' command. Index: breakpoint.c =================================================================== RCS file: /cvs/uberbaum/gdb/breakpoint.c,v retrieving revision 1.105 diff -u -p -r1.105 breakpoint.c --- breakpoint.c 4 Jan 2003 23:07:24 -0000 1.105 +++ breakpoint.c 15 Jan 2003 00:02:46 -0000 @@ -5576,7 +5576,7 @@ until_break_command_continuation (struct /* ARGSUSED */ void -until_break_command (char *arg, int from_tty) +until_break_command (char *arg, int from_tty, int anywhere) { struct symtabs_and_lines sals; struct symtab_and_line sal; @@ -5609,9 +5609,16 @@ until_break_command (char *arg, int from resolve_sal_pc (&sal); - breakpoint = - set_momentary_breakpoint (sal,get_frame_id (deprecated_selected_frame), - bp_until); + if (anywhere) + /* If the user told us to continue until a specified location, + we don't specify a frame at which we need to stop. */ + breakpoint = set_momentary_breakpoint (sal, null_frame_id, bp_until); + else + /* Otherwise, specify the current frame, because we want to stop only + at the very same frame. */ + breakpoint = set_momentary_breakpoint (sal, + get_frame_id (deprecated_selected_frame), + bp_until); if (!event_loop_p || !target_can_async_p ()) old_chain = make_cleanup_delete_breakpoint (breakpoint); @@ -5639,8 +5646,8 @@ until_break_command (char *arg, int from add_continuation (until_break_command_continuation, arg1); } - /* Keep within the current frame */ - + /* Keep within the current frame, or in frames called by the current + one. */ if (prev_frame) { sal = find_pc_line (get_frame_pc (prev_frame), 0); @@ -5659,7 +5666,7 @@ until_break_command (char *arg, int from if (!event_loop_p || !target_can_async_p ()) do_cleanups (old_chain); } - + #if 0 /* These aren't used; I don't konw what they were for. */ /* Set a breakpoint at the catch clause for NAME. */ Index: infcmd.c =================================================================== RCS file: /cvs/uberbaum/gdb/infcmd.c,v retrieving revision 1.69 diff -u -p -r1.69 infcmd.c --- infcmd.c 13 Dec 2002 16:26:02 -0000 1.69 +++ infcmd.c 15 Jan 2003 00:04:10 -0000 @@ -1140,10 +1140,41 @@ until_command (char *arg, int from_tty) } if (arg) - until_break_command (arg, from_tty); + until_break_command (arg, from_tty, 0); else until_next_command (from_tty); } + +static void +advance_command (char *arg, int from_tty) +{ + int async_exec = 0; + + if (!target_has_execution) + error ("The program is not running."); + + if (arg == NULL) + error_no_arg ("a location"); + + /* Find out whether we must run in the background. */ + if (arg != NULL) + async_exec = strip_bg_char (&arg); + + /* If we must run in the background, but the target can't do it, + error out. */ + if (event_loop_p && async_exec && !target_can_async_p ()) + error ("Asynchronous execution not supported on this target."); + + /* If we are not asked to run in the bg, then prepare to run in the + foreground, synchronously. */ + if (event_loop_p && !async_exec && target_can_async_p ()) + { + /* Simulate synchronous execution. */ + async_disable_stdin (); + } + + until_break_command (arg, from_tty, 1); +} /* Print the result of a function at the end of a 'finish' command. */ @@ -2130,10 +2161,14 @@ Argument N means do this N times (or til c = add_com ("until", class_run, until_command, "Execute until the program reaches a source line greater than the current\n\ -or a specified line or address or function (same args as break command).\n\ -Execution will also stop upon exit from the current stack frame."); +or a specified location (same args as break command) within the current frame."); set_cmd_completer (c, location_completer); add_com_alias ("u", "until", class_run, 1); + + c = add_com ("advance", class_run, advance_command, + "Continue the program up to the given location (same form as args for break command).\n\ +Execution will also stop upon exit from the current stack frame."); + set_cmd_completer (c, location_completer); c = add_com ("jump", class_run, jump_command, "Continue program being debugged at specified line or address.\n\ Index: breakpoint.h =================================================================== RCS file: /cvs/uberbaum/gdb/breakpoint.h,v retrieving revision 1.16 diff -u -p -r1.16 breakpoint.h --- breakpoint.h 11 Dec 2002 22:34:47 -0000 1.16 +++ breakpoint.h 15 Jan 2003 00:05:35 -0000 @@ -534,7 +534,7 @@ extern int deprecated_frame_in_dummy (st extern int breakpoint_thread_match (CORE_ADDR, ptid_t); -extern void until_break_command (char *, int); +extern void until_break_command (char *, int, int); extern void breakpoint_re_set (void);