From patchwork Mon Aug 4 13:53:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 34842 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5510E21F5F for ; Mon, 4 Aug 2014 13:57:19 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wn1sf38251717obc.2 for ; Mon, 04 Aug 2014 06:57:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version: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 :content-type:content-transfer-encoding; bh=EkWx2XFb5ailWpgnxRTzpcN/eGSMf+bxQlXQwOFxDOA=; b=CJyTIERRvfjsv4TFaS3eRV9qRcbnYk6e8f6n7c1aOs/ShIV8CDr9zQdsbYuYRGeiWA 9OKzgnuYm4KS7n1GNTX5dsJxKAx7wZ19/E3sH1IHjO2BzK2JIRBlO9nlzOoB98Q9zvu0 Ydb7IoxVP9ZFtVszRDi/Xq1a2rNauG4FkRpvrsh7egkgxLKA2Ehx7Bx9jiOsTB2MTnnH ZsjJvE1Ggt/b5q8byyIB13/X/56Hzf2Igjkp2WPLxwocC2uMYuts91d2n+cNPmW9tNtv PPxSUZGZiad+CB/W5oQx8eZ8LD2W1+ziGXnjdetqxRy30zUJIUk/l+q9jDlu4PSYwcJg /OhA== X-Gm-Message-State: ALoCoQn9wo+2gFHDy7gqx/MUcQz3KdZdUjZGjum4lnnqJeukXI5neAONsqX9ZP5DpzCSYO+tEbb2 X-Received: by 10.182.230.133 with SMTP id sy5mr9441557obc.22.1407160638506; Mon, 04 Aug 2014 06:57:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.51 with SMTP id s48ls2310354qgs.64.gmail; Mon, 04 Aug 2014 06:57:18 -0700 (PDT) X-Received: by 10.52.89.211 with SMTP id bq19mr903657vdb.93.1407160638394; Mon, 04 Aug 2014 06:57:18 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id qu14si1059375vdb.23.2014.08.04.06.57.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:57:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so10926020vcb.6 for ; Mon, 04 Aug 2014 06:57:18 -0700 (PDT) X-Received: by 10.52.3.40 with SMTP id 8mr5675558vdz.24.1407160638291; Mon, 04 Aug 2014 06:57:18 -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.221.37.5 with SMTP id tc5csp306388vcb; Mon, 4 Aug 2014 06:57:17 -0700 (PDT) X-Received: by 10.229.68.131 with SMTP id v3mr36769117qci.10.1407160637812; Mon, 04 Aug 2014 06:57:17 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id w8si28655897qcs.12.2014.08.04.06.57.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:57:17 -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]:52468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIlJ-0001Qt-FL for patch@linaro.org; Mon, 04 Aug 2014 09:57:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIiB-00054u-DC for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEIiA-0007dH-AT for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:03 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEIiA-0006mN-2Q for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:02 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1XEIhd-0001Au-5p for qemu-devel@nongnu.org; Mon, 04 Aug 2014 14:53:29 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 14:53:22 +0100 Message-Id: <1407160408-4467-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> References: <1407160408-4467-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 06/12] target-arm: A64: Respect SPSEL when taking exceptions 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.220.175 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: Alex Bennée Signed-off-by: Edgar E. Iglesias Reviewed-by: Greg Bellows Message-id: 1402994746-8328-4-git-send-email-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- target-arm/helper-a64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 2b4ce6a..027434a 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -489,8 +489,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) if (is_a64(env)) { env->banked_spsr[aarch64_banked_spsr_index(1)] = pstate_read(env); - env->sp_el[arm_current_pl(env)] = env->xregs[31]; - env->xregs[31] = env->sp_el[1]; + aarch64_save_sp(env, arm_current_pl(env)); env->elr_el[1] = env->pc; } else { env->banked_spsr[0] = cpsr_read(env); @@ -508,6 +507,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) pstate_write(env, PSTATE_DAIF | PSTATE_MODE_EL1h); env->aarch64 = 1; + aarch64_restore_sp(env, 1); env->pc = addr; cs->interrupt_request |= CPU_INTERRUPT_EXITTB;