From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYkP-0000l6-4h for qemu-devel@nongnu.org; Tue, 06 May 2014 02:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WhYkI-0004qE-UM for qemu-devel@nongnu.org; Tue, 06 May 2014 02:21:01 -0400 Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:56452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WhYkI-0004q7-Q9 for qemu-devel@nongnu.org; Tue, 06 May 2014 02:20:54 -0400 Received: by mail-qg0-f45.google.com with SMTP id z60so3014633qgd.18 for ; Mon, 05 May 2014 23:20:54 -0700 (PDT) From: "Edgar E. Iglesias" Date: Tue, 6 May 2014 16:08:22 +1000 Message-Id: <1399356506-5609-19-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> References: <1399356506-5609-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH v1 18/22] target-arm: A64: Generalize update_spsel for the various ELs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: rob.herring@linaro.org, peter.crosthwaite@xilinx.com, john.williams@xilinx.com, alex.bennee@linaro.org, agraf@suse.de From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- target-arm/internals.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/target-arm/internals.h b/target-arm/internals.h index 7c39946..5d802db 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,15 @@ 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. - */ - assert(arm_current_pl(env) == 1); + /* EL0 has no access rights to update SPSel. */ + 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]; } } -- 1.8.3.2