From patchwork Tue May 27 16:28:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 30997 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f70.google.com (mail-pb0-f70.google.com [209.85.160.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7173D2066E for ; Tue, 27 May 2014 16:33:36 +0000 (UTC) Received: by mail-pb0-f70.google.com with SMTP id rq2sf45128042pbb.1 for ; Tue, 27 May 2014 09:33:35 -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=JFzLYv8eMp6dA9scu6VAUqrXc3lEm0wHerczog+FvXg=; b=V1NtPDrvHEinkwI6PkDexzITwiVk8WbvRHG1khabfdCUx4PubsPGIfMejVsHk4TZqe 1cML6Ot305aBaIrWVJhxi3QPXGzDtogu9C+j+RXzakGnNo+iVJcjA/40mRnH+ZHEW8ZH K6R2QtaS+KzBD9XEWOzuv+u/bwVsu150a5rXHdy4Jui6D+C0iX3+qicJJIktYTqVW1nE NCR8LkwjTxj+OQTn782OGW3XIS/wg0Z7TTx8FCWfVbybn5RvQZ5FDePJuq5R9jGYPI0k 6U2GyZli3mydqYwaYY6/e/FcWFxCUlJjjl1+65dPyOQ6SBBo+G4x4Nk0ARuhC2Kb4Bmc VRlg== X-Gm-Message-State: ALoCoQmzUzwhbDGmCdUCYUCe9QfFETNFA+Qo1JJCuXUz5ZefDzed+OeAc4V6p73xDqJ9aWeSMUyE X-Received: by 10.66.216.130 with SMTP id oq2mr13951424pac.44.1401208415720; Tue, 27 May 2014 09:33:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.203 with SMTP id m69ls3245797qga.84.gmail; Tue, 27 May 2014 09:33:35 -0700 (PDT) X-Received: by 10.52.33.241 with SMTP id u17mr1731901vdi.82.1401208415493; Tue, 27 May 2014 09:33:35 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id rw10si8485880vcb.44.2014.05.27.09.33.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 09:33:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id sa20so10894763veb.23 for ; Tue, 27 May 2014 09:33:35 -0700 (PDT) X-Received: by 10.52.181.132 with SMTP id dw4mr1731112vdc.86.1401208415342; Tue, 27 May 2014 09:33:35 -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 ib8csp133027vcb; Tue, 27 May 2014 09:33:34 -0700 (PDT) X-Received: by 10.140.29.34 with SMTP id a31mr42066200qga.95.1401208414465; Tue, 27 May 2014 09:33:34 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o12si18129268qak.126.2014.05.27.09.33.34 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 27 May 2014 09:33:34 -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]:36525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKJh-000391-I9 for patch@linaro.org; Tue, 27 May 2014 12:33:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpKF3-00036F-Mj for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpKF2-0002pK-MJ for qemu-devel@nongnu.org; Tue, 27 May 2014 12:28:45 -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-FM 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-0005ro-In; Tue, 27 May 2014 17:28:35 +0100 From: Peter Maydell To: Anthony Liguori Date: Tue, 27 May 2014 17:28:30 +0100 Message-Id: <1401208114-22404-23-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 22/26] target-arm: A64: Generalize ERET to 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.178 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" Adds support for ERET to and from AArch64 EL2 and 3. Signed-off-by: Edgar E. Iglesias Message-id: 1400980132-25949-20-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/op_helper.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index e95a7f4..50a4157 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -386,13 +386,13 @@ void HELPER(msr_i_pstate)(CPUARMState *env, uint32_t op, uint32_t imm) void HELPER(exception_return)(CPUARMState *env) { - unsigned int spsr_idx = aarch64_banked_spsr_index(1); + int cur_el = arm_current_pl(env); + unsigned int spsr_idx = aarch64_banked_spsr_index(cur_el); uint32_t spsr = env->banked_spsr[spsr_idx]; int new_el, i; - int cur_el = arm_current_pl(env); if (env->pstate & PSTATE_SP) { - env->sp_el[1] = env->xregs[31]; + env->sp_el[cur_el] = env->xregs[31]; } else { env->sp_el[0] = env->xregs[31]; } @@ -400,6 +400,7 @@ void HELPER(exception_return)(CPUARMState *env) env->exclusive_addr = -1; if (spsr & PSTATE_nRW) { + /* TODO: We currently assume EL1/2/3 are running in AArch64. */ env->aarch64 = 0; new_el = 0; env->uncached_cpsr = 0x10; @@ -429,7 +430,7 @@ void HELPER(exception_return)(CPUARMState *env) env->aarch64 = 1; pstate_write(env, spsr); env->xregs[31] = env->sp_el[new_el]; - env->pc = env->elr_el[1]; + env->pc = env->elr_el[cur_el]; } return; @@ -443,7 +444,7 @@ illegal_return: * no change to exception level, execution state or stack pointer */ env->pstate |= PSTATE_IL; - env->pc = env->elr_el[1]; + env->pc = env->elr_el[cur_el]; spsr &= PSTATE_NZCV | PSTATE_DAIF; spsr |= pstate_read(env) & ~(PSTATE_NZCV | PSTATE_DAIF); pstate_write(env, spsr);