| Message ID | 1407160408-4467-6-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 98ea5615ab24b21991d68b61bc91427fab273817 |
| Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBLFD72PAKGQEETGVOSI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f70.google.com (mail-qg0-f70.google.com [209.85.192.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0CC8821F5F for <linaro@patches.linaro.org>; Mon, 4 Aug 2014 13:59:09 +0000 (UTC) Received: by mail-qg0-f70.google.com with SMTP id z60sf14786451qgd.9 for <linaro@patches.linaro.org>; Mon, 04 Aug 2014 06:59:08 -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=n2lFxIvUi+nRWaqw0iJVvTpGqLVJoLR292xHOI1QIaw=; b=N7LOVfrxodlkQb3dmaGGlG81Yd+nh0x1DJBvG6aHjgjw0rOWZPxcg1n5XPh7E4VeLt a5N8NRPVyDIva/VUSwkJlGUJD+xEEpnemQ58CEet8GK9nF9E8GwzvYr/NyfVjzgctU2w 4kBHI7L/3VMu9hRovTrRiIUVnIW5llEP6m15zCM8c5UiyVszZE4p9QP6YOJsZomx2/No JqWo6sK0a8ineJFCGKJAaPibNaugfs9WIoN5CZWjeK2Sgy2+PcvkXOZvQhBGjsY/6YyK v35iRFC4MCsZh4QO6hTq5orG4oO0RqLuPGL2zo0VgdD87PBl/2fXggsHsScXXsyT2Kz8 8beA== X-Gm-Message-State: ALoCoQkzWa9djvHHV5hAHGRdfm7o56m2m0mKsd1nSDk0MUQvXIkcPhH8qOsby20BAhNSvYv7NAmO X-Received: by 10.52.163.231 with SMTP id yl7mr4646885vdb.1.1407160748569; Mon, 04 Aug 2014 06:59:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.37 with SMTP id q34ls891553qgd.5.gmail; Mon, 04 Aug 2014 06:59:08 -0700 (PDT) X-Received: by 10.52.147.15 with SMTP id tg15mr5338226vdb.53.1407160748396; Mon, 04 Aug 2014 06:59:08 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id e20si11946493vdj.21.2014.08.04.06.59.01 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:59:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id hy10so11135638vcb.32 for <patchwork-forward@linaro.org>; Mon, 04 Aug 2014 06:59:01 -0700 (PDT) X-Received: by 10.220.118.136 with SMTP id v8mr3665906vcq.50.1407160741588; Mon, 04 Aug 2014 06:59:01 -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 tc5csp306496vcb; Mon, 4 Aug 2014 06:59:01 -0700 (PDT) X-Received: by 10.140.80.165 with SMTP id c34mr34252323qgd.79.1407160740871; Mon, 04 Aug 2014 06:59:00 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y1si28664432qcr.8.2014.08.04.06.59.00 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:59:00 -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]:52488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1XEImy-0004fs-Jd for patch@linaro.org; Mon, 04 Aug 2014 09:59:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1XEIiF-0005BI-G9 for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1XEIi8-0007UO-J8 for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:07 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1XEIi8-0006mN-BC for qemu-devel@nongnu.org; Mon, 04 Aug 2014 09:54:00 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1XEIhd-0001Aq-4W for qemu-devel@nongnu.org; Mon, 04 Aug 2014 14:53:29 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Mon, 4 Aug 2014 14:53:21 +0100 Message-Id: <1407160408-4467-6-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 05/12] target-arm: A64: Respect SPSEL in ERET SP restore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=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.173 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit |
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 90a946a..25ad902 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -410,7 +410,7 @@ void HELPER(exception_return)(CPUARMState *env) } env->aarch64 = 1; pstate_write(env, spsr); - env->xregs[31] = env->sp_el[new_el]; + aarch64_restore_sp(env, new_el); env->pc = env->elr_el[cur_el]; }