From patchwork Fri May 23 00:42:15 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: 351687 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 0FB61140082 for ; Fri, 23 May 2014 10:56:23 +1000 (EST) Received: from localhost ([::1]:40349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WndmX-0000Ce-3y for incoming@patchwork.ozlabs.org; Thu, 22 May 2014 20:56:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46079) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wndlz-00085m-BC for qemu-devel@nongnu.org; Thu, 22 May 2014 20:55:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wndlo-00011v-RI for qemu-devel@nongnu.org; Thu, 22 May 2014 20:55:47 -0400 Received: from mail-yk0-x22c.google.com ([2607:f8b0:4002:c07::22c]:56509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wndlo-00011c-Ef for qemu-devel@nongnu.org; Thu, 22 May 2014 20:55:36 -0400 Received: by mail-yk0-f172.google.com with SMTP id 79so3480066ykr.17 for ; Thu, 22 May 2014 17:55:36 -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=dO+9T73gxu+NrzPk/wee9HZMfxKP9yFWA9sLya7zj4s=; b=TpajSdYeJk14V0YB9iNqZuS9Qk2Wj0dK58t+wXFqr8wPv768nv8z/IOxUsbdrazZP8 iA/4lYK+J+WfpM+H3P6kX7NskNnHt31N9/rJOq36ywG0BhtXfF12wWi3w54brCZXkebO EgbccN9Nua9Bc5lg/gEsn8vPwJuT/jeO4ugdEpRN9B60xuy/tzYhqnmbuv2tDCo6xUED X4f+vrv5YsHFpMwQDu7PvIj0sHLRrclA232mP7GmTv6kkxtrRg56GBnJOJZvtcF9KNPE 2JZRg26nKamRBC+2L9b+6gmpb7AjKP6WqiXhpi+5tLYIIDfuKi+hHXqcyII5UVU0rer4 t/wQ== X-Received: by 10.236.185.167 with SMTP id u27mr1961707yhm.128.1400806536010; Thu, 22 May 2014 17:55:36 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id 63sm2170612yhi.13.2014.05.22.17.55.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 17:55:35 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Fri, 23 May 2014 10:42:15 +1000 Message-Id: <1400805738-11889-19-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400805738-11889-1-git-send-email-edgar.iglesias@gmail.com> References: <1400805738-11889-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:4002:c07::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 v4 18/21] 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" Reviewed-by: Peter Crosthwaite 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]; } }