From patchwork Fri Mar 27 19:10:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 455549 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 B99AB14012C for ; Sat, 28 Mar 2015 06:12:37 +1100 (AEDT) Received: from localhost ([::1]:51412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbZgJ-000370-RL for incoming@patchwork.ozlabs.org; Fri, 27 Mar 2015 15:12:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbZf5-0001dB-QV for qemu-devel@nongnu.org; Fri, 27 Mar 2015 15:11:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YbZer-000547-JE for qemu-devel@nongnu.org; Fri, 27 Mar 2015 15:11:19 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:36605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YbZer-00052y-Dc for qemu-devel@nongnu.org; Fri, 27 Mar 2015 15:11:05 -0400 Received: by obbld8 with SMTP id ld8so26678229obb.3 for ; Fri, 27 Mar 2015 12:11:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CT+ZrX6QleVTh7DpAYNq3OKxOPgBO9u3dfA1YHuRges=; b=EIPuBn6/29h6oH0M1qrVDDdCYqppgaaconWrLMtKC7Qmf+SjOwsVbIHAI4cm5xYe5p Ag9nPl3bsAdKwLeKSQ6c8dcx4sQZZ2GHishfEBBwxpimyTa964jHXrj+JvTp5PfASXtP JZ7IQG0UlEb2zKZw3lmrNKeE9wA+c/TVIQcLzV4z40Qf8gFxTK/H9okBz5tvqLYqXzZJ eJP6P8Rhufn7vwrfkCyXWHFdST0dee3/9GUmJ1cJwWYB5rDRpU59D1/21+0PpFYPioot A6NUl8FDzn/srIiE92UYoU/fnnt4Vihthyajzo63icSLQJclM/dT6FeomwjclBTwxxwn xAEA== X-Gm-Message-State: ALoCoQm3TfvcZ66UIkU5YGeX4yZugIHaTjBGK5d9Zv5U5EHrIRLCCyQuOoO05UyohlKl4GRtTHgV X-Received: by 10.182.126.162 with SMTP id mz2mr17533850obb.21.1427483465095; Fri, 27 Mar 2015 12:11:05 -0700 (PDT) Received: from gbellows-linaro.bellowshome.netattlocal.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id hc7sm1490859obb.16.2015.03.27.12.11.03 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 27 Mar 2015 12:11:04 -0700 (PDT) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, alex.bennee@linaro.org Date: Fri, 27 Mar 2015 14:10:41 -0500 Message-Id: <1427483446-31900-3-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1427483446-31900-1-git-send-email-greg.bellows@linaro.org> References: <1427483446-31900-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.214.180 Cc: Greg Bellows Subject: [Qemu-devel] [[PATCH] 2/7] target-arm: Extend helpers to route 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Updated the various helper routines to set the target EL as needed. Signed-off-by: Greg Bellows --- target-arm/op_helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 72a973a..aa175b5 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -306,6 +306,7 @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome) if (arm_feature(env, ARM_FEATURE_XSCALE) && ri->cp < 14 && extract32(env->cp15.c15_cpar, ri->cp, 1) == 0) { env->exception.syndrome = syndrome; + env->exception.target_el = MAX(arm_current_el(env), 1); raise_exception(env, EXCP_UDEF); } @@ -363,6 +364,7 @@ void HELPER(msr_i_pstate)(CPUARMState *env, uint32_t op, uint32_t imm) * to catch that case at translate time. */ if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UMA)) { + env->exception.target_el = MAX(arm_current_el(env), 1); raise_exception(env, EXCP_UDEF); } @@ -422,6 +424,7 @@ void HELPER(pre_hvc)(CPUARMState *env) if (undef) { env->exception.syndrome = syn_uncategorized(); + env->exception.target_el = MAX(arm_current_el(env), 1); raise_exception(env, EXCP_UDEF); } } @@ -452,11 +455,13 @@ void HELPER(pre_smc)(CPUARMState *env, uint32_t syndrome) } else if (!secure && cur_el == 1 && (env->cp15.hcr_el2 & HCR_TSC)) { /* In NS EL1, HCR controlled routing to EL2 has priority over SMD. */ env->exception.syndrome = syndrome; + env->exception.target_el = 2; raise_exception(env, EXCP_HYP_TRAP); } if (undef) { env->exception.syndrome = syn_uncategorized(); + env->exception.target_el = MAX(arm_current_el(env), 1); raise_exception(env, EXCP_UDEF); } }