From patchwork Sat Mar 22 11:20:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 235 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx21.g.dreamhost.com (caibbdcaaahb.dreamhost.com [208.113.200.71]) by wilcox.dreamhost.com (Postfix) with ESMTP id ED4AD360080 for ; Sat, 22 Mar 2014 04:23:21 -0700 (PDT) Received: by homiemail-mx21.g.dreamhost.com (Postfix, from userid 14314964) id A4B3DC78872; Sat, 22 Mar 2014 04:23:21 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx21.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx21.g.dreamhost.com (Postfix) with ESMTPS id 78037C5E63C for ; Sat, 22 Mar 2014 04:23:21 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=F6pRJxOX4K38FRS/ mfbgda22CCUFXI/hkIDcCmZa0QYOAkpePZVswA1sOLAQFolcZL2/phZ84NAt+IPd fT+CZ+Da98MlBClALvQTAfRCdkX1LKr1NLVTG3gYiGAsUgA6ErekS92Dhrnpbzsx fZ3Fz9fnoK++5aWaELItfCznZlo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; s=default; bh=Zg6x4xaVH9/GMU1TMPrzXh 9hPDk=; b=hoccawT/Sjt80KBvGDDQIv2LcZutDTM/sc+n8ZwjIHkOWdrqr+tQYH kF2X3dYjbKoCN+mxs5fS6pYrHtdGiGPjz4XN1Uegg9kpg98tTi5xhlL7/fsrb5gK CbhafK8RYHmvoPOl+fjB/efUxELKQ3pUATnm9sZnuRBlLI8sbgnIg= Received: (qmail 15661 invoked by alias); 22 Mar 2014 11:23:20 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 15643 invoked by uid 89); 22 Mar 2014 11:23:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 22 Mar 2014 11:23:17 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1WRK1C-00024V-C8 from Yao_Qi@mentor.com ; Sat, 22 Mar 2014 04:23:14 -0700 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 22 Mar 2014 04:23:14 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.2.247.3; Sat, 22 Mar 2014 04:23:13 -0700 Message-ID: <532D7216.6010300@codesourcery.com> Date: Sat, 22 Mar 2014 19:20:54 +0800 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Pedro Alves CC: Subject: Re: [PATCH 3/3] Remove target_read_live_memory References: <1394541731-27486-1-git-send-email-yao@codesourcery.com> <1394541731-27486-3-git-send-email-yao@codesourcery.com> <532C29F2.1090302@redhat.com> In-Reply-To: <532C29F2.1090302@redhat.com> X-IsSubscribed: yes X-DH-Original-To: gdb@patchwork.siddhesh.in On 03/21/2014 08:00 PM, Pedro Alves wrote: > This reference to remote_ops must be removed, per my comment to patch 1. > IOW, OPS needs to stay. (The intro comment should then still say "of > OPS".) OK, still keep OPS in remote_xfer_live_readonly_partial. Patch below is pushed in. diff --git a/gdb/remote.c b/gdb/remote.c index 6654713..be8c423 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6874,43 +6874,16 @@ remote_read_bytes_1 (CORE_ADDR memaddr, gdb_byte *myaddr, ULONGEST len, return TARGET_XFER_OK; } -/* Read memory from the live target, even if currently inspecting a - traceframe. The return is the same as that of target_read. */ - -static enum target_xfer_status -target_read_live_memory (enum target_object object, - ULONGEST memaddr, gdb_byte *myaddr, ULONGEST len, - ULONGEST *xfered_len) -{ - enum target_xfer_status ret; - struct cleanup *cleanup; - - /* Switch momentarily out of tfind mode so to access live memory. - Note that this must not clear global state, such as the frame - cache, which must still remain valid for the previous traceframe. - We may be _building_ the frame cache at this point. */ - cleanup = make_cleanup_restore_traceframe_number (); - set_traceframe_number (-1); - - ret = target_xfer_partial (current_target.beneath, object, NULL, - myaddr, NULL, memaddr, len, xfered_len); - - do_cleanups (cleanup); - return ret; -} - -/* Using the set of read-only target sections of OPS, read live - read-only memory. Note that the actual reads start from the - top-most target again. +/* Using the set of read-only target sections of remote, read live + read-only memory. For interface/parameters/return description see target.h, to_xfer_partial. */ static enum target_xfer_status -memory_xfer_live_readonly_partial (struct target_ops *ops, - enum target_object object, - gdb_byte *readbuf, ULONGEST memaddr, - ULONGEST len, ULONGEST *xfered_len) +remote_xfer_live_readonly_partial (struct target_ops *ops, gdb_byte *readbuf, + ULONGEST memaddr, ULONGEST len, + ULONGEST *xfered_len) { struct target_section *secp; struct target_section_table *table; @@ -6933,8 +6906,8 @@ memory_xfer_live_readonly_partial (struct target_ops *ops, if (memend <= p->endaddr) { /* Entire transfer is within this section. */ - return target_read_live_memory (object, memaddr, - readbuf, len, xfered_len); + return remote_read_bytes_1 (memaddr, readbuf, len, + xfered_len); } else if (memaddr >= p->endaddr) { @@ -6945,8 +6918,8 @@ memory_xfer_live_readonly_partial (struct target_ops *ops, { /* This section overlaps the transfer. Just do half. */ len = p->endaddr - memaddr; - return target_read_live_memory (object, memaddr, - readbuf, len, xfered_len); + return remote_read_bytes_1 (memaddr, readbuf, len, + xfered_len); } } } @@ -6998,9 +6971,7 @@ remote_read_bytes (struct target_ops *ops, CORE_ADDR memaddr, do_cleanups (old_chain); /* This goes through the topmost target again. */ - res = memory_xfer_live_readonly_partial (ops, - TARGET_OBJECT_MEMORY, - myaddr, memaddr, + res = remote_xfer_live_readonly_partial (ops, myaddr, memaddr, len, xfered_len); if (res == TARGET_XFER_OK) return TARGET_XFER_OK; diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 673fddd..c522193 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3216,15 +3216,6 @@ set_current_traceframe (int num) clear_traceframe_info (); } -/* Make the traceframe NUM be the current trace frame, and do nothing - more. */ - -void -set_traceframe_number (int num) -{ - traceframe_number = num; -} - /* A cleanup used when switching away and back from tfind mode. */ struct current_traceframe_cleanup @@ -3261,12 +3252,6 @@ make_cleanup_restore_current_traceframe (void) restore_current_traceframe_cleanup_dtor); } -struct cleanup * -make_cleanup_restore_traceframe_number (void) -{ - return make_cleanup_restore_integer (&traceframe_number); -} - /* Given a number and address, return an uploaded tracepoint with that number, creating if necessary. */ diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index 8a1abbf..39b5edb 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -269,21 +269,12 @@ extern int get_traceframe_number (void); /* Returns the tracepoint number for current traceframe. */ extern int get_tracepoint_number (void); -/* Make the traceframe NUM be the current GDB trace frame number, and - do nothing more. In particular, this does not flush the - register/frame caches or notify the target about the trace frame - change, so that is can be used when we need to momentarily access - live memory. Targets lazily switch their current traceframe to - match GDB's traceframe number, at the appropriate times. */ -extern void set_traceframe_number (int); - /* Make the traceframe NUM be the current trace frame, all the way to the target, and flushes all global state (register/frame caches, etc.). */ extern void set_current_traceframe (int num); struct cleanup *make_cleanup_restore_current_traceframe (void); -struct cleanup *make_cleanup_restore_traceframe_number (void); void free_actions (struct breakpoint *);