From nobody Thu Dec 18 19:31:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547824561012743.1604281657102; Fri, 18 Jan 2019 07:16:01 -0800 (PST) Received: from localhost ([127.0.0.1]:41250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVsF-0000ET-UH for importer@patchew.org; Fri, 18 Jan 2019 10:16:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbT-0002lH-Ux for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbS-0007MF-ID for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:39 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:33902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbS-0007DK-9D for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:38 -0500 Received: by mail-wm1-x330.google.com with SMTP id y185so1177885wmd.1 for ; Fri, 18 Jan 2019 06:58:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xMCUqvzbLbsVfz5yGZwAqUo9i6sJoLWv7qiRiKnTHbk=; b=abatj47NVg/stMTFAnhIHWvPu9xLBznYqJHLk4z1Hh/5I5ABlAEEEwz/hBY2RBuigX XYHgJ+IGnEozDqLKeBhO8GMMkbqy7w9DhJmXXCIHOGT9hL3/ul46dZiR2mEykHg/V8gL 6yzvHZ0DpB1AFsJD+koHSHSiDorMhmfe0ch8w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xMCUqvzbLbsVfz5yGZwAqUo9i6sJoLWv7qiRiKnTHbk=; b=RwDxeLZerCmsQWuM+5qv0HYvdWkrpuCmF6hq0Tii83p62B8GsxgFdVHdlUltdiA7cA di2X8SQR5qEKmd+2yydDkeKfQzUhLEiuKgNgMsLyrmLMBTr6ou3PrTWEEB4kQCx2Wehp 0konM3qPy81ZwVUm8pO6GZxSriArqvgWq6r3XBQZGUEYlJtnRq59sl4xlhzj/DWUh7Vn BVUIMk02OCbtch0PU2xbW58pQr0cflmamGDQSusVW4D14x+4yXBDN/eH36Bc8fGi5czx v4IlFhCkZdyuKEFeP30KTkBr/A30A/EhJOIbQXGigbY8qpNiNCpxcdkUunhlIKesueAh pu0w== X-Gm-Message-State: AJcUukdJYJ1khu1qdr3PjTn3Jp9GGT3ROsYGdmJORgbTN/RzX1yfhykx AKKKpHlCqwJL9IDejKCEMNkKjOsDEE2UWQ== X-Google-Smtp-Source: ALg8bN76gn8aBree6+zjNUrdjllYx87HcBBVgE0gtFOxduziUuzvVvAOLbr86Ab6+jbjmKilGR6gAQ== X-Received: by 2002:a1c:6e01:: with SMTP id j1mr15518011wmc.103.1547823504300; Fri, 18 Jan 2019 06:58:24 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:31 +0000 Message-Id: <20190118145805.6852-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PULL 15/49] target/arm: Add new_pc argument to helper_exception_return X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20190108223129.5570-12-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper-a64.h | 2 +- target/arm/helper-a64.c | 10 +++++----- target/arm/translate-a64.c | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/target/arm/helper-a64.h b/target/arm/helper-a64.h index 55299896c46..aff8d6c9f39 100644 --- a/target/arm/helper-a64.h +++ b/target/arm/helper-a64.h @@ -86,7 +86,7 @@ DEF_HELPER_2(advsimd_f16tosinth, i32, f16, ptr) DEF_HELPER_2(advsimd_f16touinth, i32, f16, ptr) DEF_HELPER_2(sqrt_f16, f16, f16, ptr) =20 -DEF_HELPER_1(exception_return, void, env) +DEF_HELPER_2(exception_return, void, env, i64) =20 DEF_HELPER_FLAGS_3(pacia, TCG_CALL_NO_WG, i64, env, i64, i64) DEF_HELPER_FLAGS_3(pacib, TCG_CALL_NO_WG, i64, env, i64, i64) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 66ff70dcdbb..101fa6d3eaa 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -925,7 +925,7 @@ static int el_from_spsr(uint32_t spsr) } } =20 -void HELPER(exception_return)(CPUARMState *env) +void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) { int cur_el =3D arm_current_el(env); unsigned int spsr_idx =3D aarch64_banked_spsr_index(cur_el); @@ -991,9 +991,9 @@ void HELPER(exception_return)(CPUARMState *env) aarch64_sync_64_to_32(env); =20 if (spsr & CPSR_T) { - env->regs[15] =3D env->elr_el[cur_el] & ~0x1; + env->regs[15] =3D new_pc & ~0x1; } else { - env->regs[15] =3D env->elr_el[cur_el] & ~0x3; + env->regs[15] =3D new_pc & ~0x3; } qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to " "AArch32 EL%d PC 0x%" PRIx32 "\n", @@ -1005,7 +1005,7 @@ void HELPER(exception_return)(CPUARMState *env) env->pstate &=3D ~PSTATE_SS; } aarch64_restore_sp(env, new_el); - env->pc =3D env->elr_el[cur_el]; + env->pc =3D new_pc; qemu_log_mask(CPU_LOG_INT, "Exception return from AArch64 EL%d to " "AArch64 EL%d PC 0x%" PRIx64 "\n", cur_el, new_el, env->pc); @@ -1031,7 +1031,7 @@ illegal_return: * no change to exception level, execution state or stack pointer */ env->pstate |=3D PSTATE_IL; - env->pc =3D env->elr_el[cur_el]; + env->pc =3D new_pc; spsr &=3D PSTATE_NZCV | PSTATE_DAIF; spsr |=3D pstate_read(env) & ~(PSTATE_NZCV | PSTATE_DAIF); pstate_write(env, spsr); diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 3f08db580bf..2df2323646b 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1981,6 +1981,7 @@ static void disas_exc(DisasContext *s, uint32_t insn) static void disas_uncond_b_reg(DisasContext *s, uint32_t insn) { unsigned int opc, op2, op3, rn, op4; + TCGv_i64 dst; =20 opc =3D extract32(insn, 21, 4); op2 =3D extract32(insn, 16, 5); @@ -2011,7 +2012,11 @@ static void disas_uncond_b_reg(DisasContext *s, uint= 32_t insn) if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_start(); } - gen_helper_exception_return(cpu_env); + dst =3D tcg_temp_new_i64(); + tcg_gen_ld_i64(dst, cpu_env, + offsetof(CPUARMState, elr_el[s->current_el])); + gen_helper_exception_return(cpu_env, dst); + tcg_temp_free_i64(dst); if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_end(); } --=20 2.20.1