From patchwork Sun May 25 01:08:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 30893 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2931320675 for ; Sun, 25 May 2014 01:12:43 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id id10sf15156708vcb.0 for ; Sat, 24 May 2014 18:12:42 -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:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=84ye59L1falKOUeIrlhCif/AhNfCowvbJu4tgbksJOA=; b=HtzJFkfeqfz8d5Et+SApUYQlYTmcuvUaJ1GbniCUZOBNvUmeFFY2GZSxT2byWTqqzg pNk0MshT6XhUzTHOHgx/UDWDHnlhBUAvph3ydpHP0eIkDrJe4vHiR3upjSgJTF1ORUEL TxlbgLaiKeqQa3/trOwMiR28jfwPmYUIQHfnXCZaCC7dw/Ry8uWdhIwJjWUZ9bVOc3v3 xREVUgoUlGklvb9kCZGib2G3bIHd91JaUm2gsWZFVBc7yirGPE0TAcmyeUfUQx58IpOS KzPQS0SwU6pLiGDdPFbNIXUheM+qMbuSkPYxJsQ2rSRalcJ5peBCXZ3xKCLDUuDQKi46 Pmgg== X-Gm-Message-State: ALoCoQkWZf9DTynpeRvvLtzjmij5ilv7M52RsfkUjvM11pVkKTE+c3zHTopUDS+ZAVfYFndiEAZa X-Received: by 10.236.178.98 with SMTP id e62mr5850444yhm.50.1400980362813; Sat, 24 May 2014 18:12:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.16 with SMTP id r16ls2237739qga.71.gmail; Sat, 24 May 2014 18:12:42 -0700 (PDT) X-Received: by 10.58.247.66 with SMTP id yc2mr12508420vec.13.1400980362656; Sat, 24 May 2014 18:12:42 -0700 (PDT) Received: from mail-vc0-x22a.google.com (mail-vc0-x22a.google.com [2607:f8b0:400c:c03::22a]) by mx.google.com with ESMTPS id ls1si4168848vcb.99.2014.05.24.18.12.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 24 May 2014 18:12:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22a as permitted sender) client-ip=2607:f8b0:400c:c03::22a; Received: by mail-vc0-f170.google.com with SMTP id lf12so7842184vcb.15 for ; Sat, 24 May 2014 18:12:42 -0700 (PDT) X-Received: by 10.58.112.8 with SMTP id im8mr583058veb.35.1400980362467; Sat, 24 May 2014 18:12:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp11565vcb; Sat, 24 May 2014 18:12:42 -0700 (PDT) X-Received: by 10.140.40.180 with SMTP id x49mr19251249qgx.16.1400980362047; Sat, 24 May 2014 18:12:42 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i5si8292323qcf.26.2014.05.24.18.12.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 24 May 2014 18:12:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:49825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoMzR-0006cR-KW for patch@linaro.org; Sat, 24 May 2014 21:12:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoMyU-0005k0-Ld for qemu-devel@nongnu.org; Sat, 24 May 2014 21:11:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoMyP-0004gE-TZ for qemu-devel@nongnu.org; Sat, 24 May 2014 21:11:42 -0400 Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:35811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoMyP-0004g6-Mr for qemu-devel@nongnu.org; Sat, 24 May 2014 21:11:37 -0400 Received: by mail-pa0-f46.google.com with SMTP id kq14so5800549pab.5 for ; Sat, 24 May 2014 18:11:36 -0700 (PDT) X-Received: by 10.67.29.204 with SMTP id jy12mr17112465pad.37.1400980296789; Sat, 24 May 2014 18:11:36 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id cz3sm11283300pbc.9.2014.05.24.18.11.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 24 May 2014 18:11:35 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 25 May 2014 11:08:32 +1000 Message-Id: <1400980132-25949-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400980132-25949-1-git-send-email-edgar.iglesias@gmail.com> References: <1400980132-25949-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22e Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, greg.bellows@linaro.org, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v5 03/23] target-arm/translate.c: Use get_mem_index() for SRS memory accesses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Original-Sender: edgar.iglesias@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c03::22a as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=fail header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell 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. Reviewed-by: Edgar E. Iglesias 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) {