From patchwork Tue May 27 16:28:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31005 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B5D672066E for ; Tue, 27 May 2014 16:37:27 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wo20sf47818376obc.11 for ; Tue, 27 May 2014 09:37:27 -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=NkI0qFMkhmAF/cBAM07RDBBQ+kJoFVYehlsQoMMvgCM=; b=RPWnbx1O7LoAvZ6JAR5zWEwBOsix/lrd7JIAhwxuBNOEbe3zWHcn2zQStTdCJ0mHGc BR653VhxchLMZc7i6QEkTbJb8ssidl6WUK+B7hwAW8UI8Ej+QQDlfL3cDoOZ+fTIW58y iUPtp4VxH89r+5jCXr78z0ZR4b723PbDWW7QvC80qz+K0hThzWb/KAp5CT4fW+6NriI5 VFMInha7cORg+E4b31HCzaL9uQtTXW3EfJQkcDeMWzwaBLdD0NEYdRT7xAhnNqzGQkqg VeGItgsdzp65n4iZ9QsDuJJjY9xI0xuz5qfBA06AJAhiFZuoRoRi0NSsuR7WL+FyPDR3 p9qw== X-Gm-Message-State: ALoCoQnxldg8DTnLvnBMTaKqGQDCHKaY4UuBQxVtwqUqFurOv3I2rSl3PwnmMbqXgw1V9NQz41Id X-Received: by 10.42.10.141 with SMTP id q13mr12617146icq.5.1401208647375; Tue, 27 May 2014 09:37:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.115 with SMTP id e106ls3193478qgd.65.gmail; Tue, 27 May 2014 09:37:27 -0700 (PDT) X-Received: by 10.52.246.42 with SMTP id xt10mr4857536vdc.5.1401208647122; Tue, 27 May 2014 09:37:27 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id a19si8480885vdt.26.2014.05.27.09.37.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:37:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so10951673veb.31 for ; Tue, 27 May 2014 09:37:27 -0700 (PDT) X-Received: by 10.58.185.165 with SMTP id fd5mr2742832vec.41.1401208647056; Tue, 27 May 2014 09:37:27 -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 ib8csp133364vcb; Tue, 27 May 2014 09:37:26 -0700 (PDT) X-Received: by 10.224.167.132 with SMTP id q4mr44011587qay.77.1401208646624; Tue, 27 May 2014 09:37:26 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s9si18218427qai.28.2014.05.27.09.37.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:37:26 -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]:36524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKJW-00034x-8P for patch@linaro.org; Tue, 27 May 2014 12:33:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF8-0003Ev-E1 for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF7-0002sl-NI for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:50 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF7-0002lf-Gb for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:49 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEs-0005qC-Ik; Tue, 27 May 2014 17:28:34 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:14 +0100 Message-Id: <1401208114-22404-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> References: <1401208114-22404-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 06/26] 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-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.128.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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 Message-id: 1400980132-25949-4-git-send-email-edgar.iglesias@gmail.com --- 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) {