From patchwork Fri May 23 15:31:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 30819 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9AD9C2066E for ; Fri, 23 May 2014 15:31:52 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf18765437pab.3 for ; Fri, 23 May 2014 08:31:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=5QDImE4sSKPNJEylvFiE0YhQuByx6toH5F9uxDL5zHo=; b=kNOf+EJ7jUUAiPf3RPcJcUuDwKFuPru8w+s8xG+Xzed9u/dQd4njuHVncJNi/21Jp+ 5BZ2KLOnjYcDF2fuo+sKK5YroCwBYi841gbEvr/jDTDajkBlLsok+hGRraDzQJU9uMp6 Fnr4vGx1DkzvU7eNJMzrZHclseNHI35kF2Xmsoai7wGOwU7lV19nsVt250HAyB5TScrb u1RfIkhkQmFhLdYorh8IBJJFAEiIvnYG+sJp25PQCHj/601ZJgdfxuAdjhuS/DLbbV8Q 97EHPII7+UFwa7QsZ6+Cm2bbUjCNOU86omDoOCy719juPvZole24K9VMDQe9KQJQnkqq LlnQ== X-Gm-Message-State: ALoCoQnBOf9t9iNvvxhtP1lV1Z2H4MAn0lFXU+e3x+445LR4Hlsk00t6ExsTNaGQ+mSsp9Jizbru X-Received: by 10.67.30.197 with SMTP id kg5mr2478050pad.36.1400859111608; Fri, 23 May 2014 08:31:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.82 with SMTP id l76ls1774580qga.61.gmail; Fri, 23 May 2014 08:31:51 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr4928520vcb.2.1400859111441; Fri, 23 May 2014 08:31:51 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id g4si1819293vdt.98.2014.05.23.08.31.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 08:31:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so6479189vcb.1 for ; Fri, 23 May 2014 08:31:51 -0700 (PDT) X-Received: by 10.58.34.72 with SMTP id x8mr1156938vei.61.1400859111369; Fri, 23 May 2014 08:31:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp40974vcb; Fri, 23 May 2014 08:31:51 -0700 (PDT) X-Received: by 10.66.146.170 with SMTP id td10mr6969072pab.105.1400859108066; Fri, 23 May 2014 08:31:48 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id qq9si4385352pbc.26.2014.05.23.08.31.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 23 May 2014 08:31:47 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WnrRe-00047A-BC; Fri, 23 May 2014 16:31:42 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, "Edgar E. Iglesias" , peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, aggelerf@ethz.ch, rth@twiddle.net Subject: [PATCH 3/5] target-arm/translate.c: Use get_mem_index() for SRS memory accesses Date: Fri, 23 May 2014 16:31:40 +0100 Message-Id: <1400859102-15779-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1400859102-15779-1-git-send-email-peter.maydell@linaro.org> References: <1400859102-15779-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The SRS instruction was using a hardcoded 0 for the memory accesses. This happens to be OK since the SRS instruction is UNPREDICTABLE in User and System modes, but is awkward if we want to rearrange the MMU index uses. Switch to using get_mem_index() like all the other accesses. Signed-off-by: Peter Maydell --- target-arm/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index e708f4a..e40b0a7 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -7338,11 +7338,11 @@ static void gen_srs(DisasContext *s, } tcg_gen_addi_i32(addr, addr, offset); tmp = load_reg(s, 14); - gen_aa32_st32(tmp, addr, 0); + gen_aa32_st32(tmp, addr, get_mem_index(s)); tcg_temp_free_i32(tmp); tmp = load_cpu_field(spsr); tcg_gen_addi_i32(addr, addr, 4); - gen_aa32_st32(tmp, addr, 0); + gen_aa32_st32(tmp, addr, get_mem_index(s)); tcg_temp_free_i32(tmp); if (writeback) { switch (amode) {