From patchwork Tue May 27 16:28:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31003 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 77D712066E for ; Tue, 27 May 2014 16:36:33 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id db11sf38397367veb.0 for ; Tue, 27 May 2014 09:36:33 -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=mjjX1xmql2i32X20Hj9DDVzMVwmJD1vc/EkeVpPFkJg=; b=lTvhoflSkvGWi1HAxxwdXp1CWENM1t7YvSz442MpQnAvf5VPG7wLuQeMCz6pqXK2/r HgJXLtezB3y1GWzAcdsW4+yBU2mgAIBtkRIuIZhtt6c5tu5clIvldkYIVbPWCxHAgDW5 d72BXXiqw8uXeg9TYK3n2SDiKev+DDcuoCKJM0Ug1qkQwoFJ77nh0SVAc57zaPl4m+LW vAvXI4uI0KY/AHp4VjJLW2+D2b1vFulJ7EACB6E0kkhQ4RWjHE5XCaeMuAko+uZMpDOb 5OcwkOlLKJ2cYmCsLkcPOSdQoImddb6gv37+j3lOyYTa8bpfG2pDWBNQ8iOD3Dbjlttr Y44w== X-Gm-Message-State: ALoCoQn4jvuim7C7RR26whZRHFpmfiziI8Ubkar2COWlfPP48GfHOrWRut23WBsfdQZ184+Am13x X-Received: by 10.58.236.5 with SMTP id uq5mr13309464vec.35.1401208593317; Tue, 27 May 2014 09:36:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.131 with SMTP id d3ls3206794qge.52.gmail; Tue, 27 May 2014 09:36:33 -0700 (PDT) X-Received: by 10.52.181.132 with SMTP id dw4mr1747444vdc.86.1401208593167; Tue, 27 May 2014 09:36:33 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id rq6si8479457vcb.97.2014.05.27.09.36.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:36:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so10979285veb.16 for ; Tue, 27 May 2014 09:36:33 -0700 (PDT) X-Received: by 10.52.170.237 with SMTP id ap13mr10200419vdc.27.1401208593101; Tue, 27 May 2014 09:36:33 -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 ib8csp133300vcb; Tue, 27 May 2014 09:36:32 -0700 (PDT) X-Received: by 10.140.33.181 with SMTP id j50mr39789330qgj.81.1401208592200; Tue, 27 May 2014 09:36:32 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q65si17658768qga.96.2014.05.27.09.36.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:36:32 -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]:36560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKMZ-0006W9-7o for patch@linaro.org; Tue, 27 May 2014 12:36:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF6-0003BI-6P for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF2-0002p2-CN for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:48 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF2-0002lf-6I for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:44 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WpKEt-0005ru-KG; Tue, 27 May 2014 17:28:35 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:31 +0100 Message-Id: <1401208114-22404-24-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 23/26] target-arm: A64: Generalize update_spsel for the various ELs 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.171 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 From: "Edgar E. Iglesias" Reviewed-by: Peter Crosthwaite Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-21-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/internals.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target-arm/internals.h b/target-arm/internals.h index c9897c2..564b5fa 100644 --- a/target-arm/internals.h +++ b/target-arm/internals.h @@ -107,6 +107,7 @@ int arm_rmode_to_sf(int rmode); static inline void update_spsel(CPUARMState *env, uint32_t imm) { + unsigned int cur_el = arm_current_pl(env); /* Update PSTATE SPSel bit; this requires us to update the * working stack pointer in xregs[31]. */ @@ -115,17 +116,17 @@ static inline void update_spsel(CPUARMState *env, uint32_t imm) } env->pstate = deposit32(env->pstate, 0, 1, imm); - /* EL0 has no access rights to update SPSel, and this code - * assumes we are updating SP for EL1 while running as EL1. + /* We rely on illegal updates to SPsel from EL0 to get trapped + * at translation time. */ - assert(arm_current_pl(env) == 1); + assert(cur_el >= 1 && cur_el <= 3); if (env->pstate & PSTATE_SP) { /* Switch from using SP_EL0 to using SP_ELx */ env->sp_el[0] = env->xregs[31]; - env->xregs[31] = env->sp_el[1]; + env->xregs[31] = env->sp_el[cur_el]; } else { /* Switch from SP_EL0 to SP_ELx */ - env->sp_el[1] = env->xregs[31]; + env->sp_el[cur_el] = env->xregs[31]; env->xregs[31] = env->sp_el[0]; } }