From patchwork Mon May 19 09:22:58 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: 350190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 94F0F14007B for ; Mon, 19 May 2014 19:36:24 +1000 (EST) Received: from localhost ([::1]:46911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJza-0005aD-Iu for incoming@patchwork.ozlabs.org; Mon, 19 May 2014 05:36:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJya-00048t-MC for qemu-devel@nongnu.org; Mon, 19 May 2014 05:35:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmJyR-0000m4-Bs for qemu-devel@nongnu.org; Mon, 19 May 2014 05:35:20 -0400 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]:54847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmJyR-0000lx-63 for qemu-devel@nongnu.org; Mon, 19 May 2014 05:35:11 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so3773071wib.5 for ; Mon, 19 May 2014 02:35:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TiY4rGgptDReDPQu2ErrSw5o9BqL9VZEazkRaFTbxN0=; b=weWHatiC9DZ60Km7gkG0duBPPJzKzS/g67xGnmhjv25gFjBgBG5/VmeAJXkdknoZXP gcM0spDgORsDtsWsSZF4NnhRrz+SdivKZOrAO/WrL+NiV4mU+i8g7CPH5cNB9xfTELOA HEKGBcMx9WphYtDJYZGCqJndQh4fX+JgGYcaDuQ8LAvyyP5S7eMUBBVzohZ1aFpam2P0 Ns3LHKGSjiq0npkKafoc34JUei2e5pKR1blJ9Pb1Ej8p0dC5AALDBriU03kkzCWgXRry EtSG3BEYGBR6yy8voJaAG7lGSRdfNLiobWyjbJMrhuiRqvlbPZZQvF8RClkR21FlFMf4 BqIA== X-Received: by 10.180.89.1 with SMTP id bk1mr11747768wib.35.1400492110403; Mon, 19 May 2014 02:35:10 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id nb8sm14069763wic.18.2014.05.19.02.35.04 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 19 May 2014 02:35:09 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 19 May 2014 19:22:58 +1000 Message-Id: <1400491383-6725-18-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400491383-6725-1-git-send-email-edgar.iglesias@gmail.com> References: <1400491383-6725-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: 2a00:1450:400c:c05::22c Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, aggelerf@ethz.ch, agraf@suse.de, john.williams@xilinx.com, alex.bennee@linaro.org, christoffer.dall@linaro.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 17/22] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- 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]; } }