From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8700 invoked by alias); 21 Jun 2013 17:25:20 -0000 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 Received: (qmail 8297 invoked by uid 89); 21 Jun 2013 17:25:19 -0000 X-Spam-SWARE-Status: No, score=-7.5 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS,TW_CP autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 21 Jun 2013 17:25:19 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5LHPHWX000589 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Jun 2013 13:25:17 -0400 Received: from barimba.redhat.com (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5LHPBT2021447; Fri, 21 Jun 2013 13:25:17 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 10/16] push last_sent_step into struct remote_state Date: Fri, 21 Jun 2013 17:25:00 -0000 Message-Id: <1371835506-15691-11-git-send-email-tromey@redhat.com> In-Reply-To: <1371835506-15691-1-git-send-email-tromey@redhat.com> References: <1371835506-15691-1-git-send-email-tromey@redhat.com> X-SW-Source: 2013-06/txt/msg00603.txt.bz2 This moves the global last_sent_step into remote_state. * remote.c (struct remote_state) : New field. (last_sent_step): Remove. (remote_resume, remote_wait_as): Update. --- gdb/remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index 19767bc..1c5b27d 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -392,6 +392,8 @@ struct remote_state char *last_program_signals_packet; enum gdb_signal last_sent_signal; + + int last_sent_step; }; /* Private data that we'll store in (struct thread_info)->private. */ @@ -4912,8 +4914,6 @@ remote_vcont_resume (ptid_t ptid, int step, enum gdb_signal siggnal) /* Tell the remote machine to resume. */ -static int last_sent_step; - static void remote_resume (struct target_ops *ops, ptid_t ptid, int step, enum gdb_signal siggnal) @@ -4931,7 +4931,7 @@ remote_resume (struct target_ops *ops, remote_notif_process (¬if_client_stop); rs->last_sent_signal = siggnal; - last_sent_step = step; + rs->last_sent_step = step; /* The vCont packet doesn't need to specify threads via Hc. */ /* No reverse support (yet) for vCont. */ @@ -6033,7 +6033,7 @@ remote_wait_as (ptid_t ptid, struct target_waitstatus *status, int options) rs->last_sent_signal = GDB_SIGNAL_0; target_terminal_inferior (); - strcpy ((char *) buf, last_sent_step ? "s" : "c"); + strcpy ((char *) buf, rs->last_sent_step ? "s" : "c"); putpkt ((char *) buf); /* We just told the target to resume, so a stop reply is in -- 1.8.1.4