From nobody Tue Feb 10 11:32:43 2026 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 1547123340606235.01648184058558; Thu, 10 Jan 2019 04:29:00 -0800 (PST) Received: from localhost ([127.0.0.1]:58970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghZSF-0004lO-7N for importer@patchew.org; Thu, 10 Jan 2019 07:28:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghZHd-0004ZZ-Da for qemu-devel@nongnu.org; Thu, 10 Jan 2019 07:18:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghZHc-0007fD-Gb for qemu-devel@nongnu.org; Thu, 10 Jan 2019 07:18:01 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:42989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ghZHc-0007eT-9v for qemu-devel@nongnu.org; Thu, 10 Jan 2019 07:18:00 -0500 Received: by mail-pf1-x442.google.com with SMTP id 64so5217731pfr.9 for ; Thu, 10 Jan 2019 04:18:00 -0800 (PST) Received: from cloudburst.twiddle.net (c220-239-117-135.belrs4.nsw.optusnet.com.au. [220.239.117.135]) by smtp.gmail.com with ESMTPSA id h74sm140934699pfd.35.2019.01.10.04.17.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Jan 2019 04:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XRiJh3WKJG2YABKLlUHfm4ue/ZPukKnI+eeZ63W9pjg=; b=V0fTXv6l1QFL7jynuBWm85rs3eUq0bwkEwNdnAdtBwpE5gr78cbLwhBx4HYv5tfUr1 dcVJ57u+4CHHVpog/LJMT0p7o+dQbzjddus2JeIr8JTPNFuVUSOGF+kIvEANVRy34lL5 tBiAQ1JBjwC8FE2SjpboyRNQ2wefKCam3Ogzg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XRiJh3WKJG2YABKLlUHfm4ue/ZPukKnI+eeZ63W9pjg=; b=Ed3G/CViuwKImBgc25zeL3P9V+Yd2G2RNJDs/bSKRb5IOY3KwfPTuEcheP7eHza8eT lHmXiL7pmJSSRkdVCnOQRHppIrtz4Nz+oOLgKofyoEQHXxVlY5ja29jAuYk5Ie9LoHNX +ifTHN5eQFL2Xk7IxqnvTXuhmsoTdjQWxb34ZfYvDIEMoxrMUzjQkHtSH6Yn8GjAm+Dy f44oav+abgry0BD6X3utedw+JfsuZM9iW/PJ11k18E6T2xWP9iB8c1uN1D50oY0IHyOm E+OrVRborgxNJzvRi/aHwB0L3N17DlGhqwW7lPmAcobNfwcgzPzjJS1mda79kLC9fZQh KzUg== X-Gm-Message-State: AJcUukcAEz8/EdPMF/sLM62seTb+nSYwLqdEihxZdMxyrhdasq0jRfpn T0pwwBMaboWwj0lZJCpXXndId2jR0ofG9Q== X-Google-Smtp-Source: ALg8bN6/W8W7nx+HreDlrE9zDTvy1Hh86GqZOSIvJEHSIsik3CScpykHsJtnIM2HVSXYMpOY32qM0w== X-Received: by 2002:a63:1e56:: with SMTP id p22mr9168171pgm.126.1547122678809; Thu, 10 Jan 2019 04:17:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 23:17:31 +1100 Message-Id: <20190110121736.23448-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190110121736.23448-1-richard.henderson@linaro.org> References: <20190110121736.23448-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH 06/11] target/arm: Reset btype for direct branches and syscalls 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is all of the non-exception cases of DISAS_NORETURN. For the rest of the synchronous exceptions, the state of SPSR_ELx.BTYPE is CONSTRAINED UNPREDICTABLE. However, it makes more sense to me to have syscalls reset BTYPE. Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 68eb27089a..f319fa000e 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1362,6 +1362,7 @@ static void disas_uncond_b_imm(DisasContext *s, uint3= 2_t insn) } =20 /* B Branch / BL Branch with link */ + reset_btype(s); gen_goto_tb(s, 0, addr); } =20 @@ -1386,6 +1387,7 @@ static void disas_comp_b_imm(DisasContext *s, uint32_= t insn) tcg_cmp =3D read_cpu_reg(s, rt, sf); label_match =3D gen_new_label(); =20 + reset_btype(s); tcg_gen_brcondi_i64(op ? TCG_COND_NE : TCG_COND_EQ, tcg_cmp, 0, label_match); =20 @@ -1415,6 +1417,8 @@ static void disas_test_b_imm(DisasContext *s, uint32_= t insn) tcg_cmp =3D tcg_temp_new_i64(); tcg_gen_andi_i64(tcg_cmp, cpu_reg(s, rt), (1ULL << bit_pos)); label_match =3D gen_new_label(); + + reset_btype(s); tcg_gen_brcondi_i64(op ? TCG_COND_NE : TCG_COND_EQ, tcg_cmp, 0, label_match); tcg_temp_free_i64(tcg_cmp); @@ -1441,6 +1445,7 @@ static void disas_cond_b_imm(DisasContext *s, uint32_= t insn) addr =3D s->pc + sextract32(insn, 5, 19) * 4 - 4; cond =3D extract32(insn, 0, 4); =20 + reset_btype(s); if (cond < 0x0e) { /* genuinely conditional branches */ TCGLabel *label_match =3D gen_new_label(); @@ -1605,6 +1610,7 @@ static void handle_sync(DisasContext *s, uint32_t ins= n, * a self-modified code correctly and also to take * any pending interrupts immediately. */ + reset_btype(s); gen_goto_tb(s, 0, s->pc); return; default: @@ -1885,6 +1891,7 @@ static void disas_exc(DisasContext *s, uint32_t insn) switch (op2_ll) { case 1: /* SVC= */ gen_ss_advance(s); + reset_btype(s); gen_exception_insn(s, 0, EXCP_SWI, syn_aa64_svc(imm16), default_exception_el(s)); break; @@ -1899,6 +1906,7 @@ static void disas_exc(DisasContext *s, uint32_t insn) gen_a64_set_pc_im(s->pc - 4); gen_helper_pre_hvc(cpu_env); gen_ss_advance(s); + reset_btype(s); gen_exception_insn(s, 0, EXCP_HVC, syn_aa64_hvc(imm16), 2); break; case 3: /* SMC= */ @@ -1911,6 +1919,7 @@ static void disas_exc(DisasContext *s, uint32_t insn) gen_helper_pre_smc(cpu_env, tmp); tcg_temp_free_i32(tmp); gen_ss_advance(s); + reset_btype(s); gen_exception_insn(s, 0, EXCP_SMC, syn_aa64_smc(imm16), 3); break; default: --=20 2.17.2