From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18965 invoked by alias); 20 Nov 2013 13:11:45 -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 18941 invoked by uid 89); 20 Nov 2013 13:11:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.1 required=5.0 tests=AWL,BAYES_50,GARBLED_BODY,RDNS_NONE,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Nov 2013 13:11:43 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Vj7Z1-0004Ni-Og from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 20 Nov 2013 05:11:27 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 20 Nov 2013 05:11:27 -0800 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; Wed, 20 Nov 2013 05:11:26 -0800 Message-ID: <528CB4A0.6000506@codesourcery.com> Date: Wed, 20 Nov 2013 13:23:00 -0000 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: Subject: Re: [PATCH 07/10] Associate target_dcache to address_space. References: <1383458049-20893-1-git-send-email-yao@codesourcery.com> <1383458049-20893-8-git-send-email-yao@codesourcery.com> <528C3E40.2070203@codesourcery.com> In-Reply-To: <528C3E40.2070203@codesourcery.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2013-11/txt/msg00595.txt.bz2 On 11/20/2013 12:44 PM, Yao Qi wrote: > target_dcache_get_or_init (void) > { > - if (!target_dcache_init_p ()) > - target_dcache = dcache_init (); > + DCACHE *dcache = address_space_data (current_program_space->aspace, > + target_dcache_aspace_key); > > - return target_dcache; > + if (dcache == NULL) > + dcache = dcache_init (); > + > + return dcache; > } Sigh, set_address_space_data is missed after conflict resolution. This patch fixed it. Committed. -- Yao (齐尧) gdb: 2013-11-20 Yao Qi * target-dcache.c (target_dcache_get_or_init): Call set_address_space_data if 'dcache' is NULL. --- gdb/target-dcache.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c index e1b0a56..58be6cd 100644 --- a/gdb/target-dcache.c +++ b/gdb/target-dcache.c @@ -79,7 +79,11 @@ target_dcache_get_or_init (void) target_dcache_aspace_key); if (dcache == NULL) - dcache = dcache_init (); + { + dcache = dcache_init (); + set_address_space_data (current_program_space->aspace, + target_dcache_aspace_key, dcache); + } return dcache; } -- 1.7.7.6