From nobody Thu Dec 18 17:56:50 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 1547825470832381.7519347599489; Fri, 18 Jan 2019 07:31:10 -0800 (PST) Received: from localhost ([127.0.0.1]:41504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkW6v-00054Z-KN for importer@patchew.org; Fri, 18 Jan 2019 10:31:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkVbV-0002mY-R0 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkVbS-0007N3-Ne for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:41 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33772) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkVbS-0007EH-E8 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:38 -0500 Received: by mail-wr1-x42d.google.com with SMTP id c14so15472689wrr.0 for ; Fri, 18 Jan 2019 06:58:27 -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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:25 -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=wEgLsAnQR7ViJgKrNThi99LLu9ydTWhqGdccpoXTZRU=; b=AK2btKjDR/U7VUY/GII7/HckYQjIywWFepCcawy8O+4cvK7ow6eu8UBOghwBM/zGYC 7Fuiyli1gQXYe0VME74Y2PrPVpTQPwwUYlUqNaWcLvVJInl2161PO2SmuMYwvJcEgQC8 wajuh0ukKtzh/hD7lV4HhnCFjT1cl+9Mwaitc= 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=wEgLsAnQR7ViJgKrNThi99LLu9ydTWhqGdccpoXTZRU=; b=I0CT22OfMHrfbEEe8VLpXZsk08N/4MjVaHCHlR6LvGudDKWv+lajwYkth3IcT6VyX6 AMg0ApM84y56dXReVo9L4NZoV6RfbZvzJHV6LDXv+cY36IlcI9y2fM+dRkXn6eWmwynS 3G2B53BdrTv+k/bqTevnJXnpEtCcKjFZH+cj+o086NxfQCMpT8kaWjeazQNkWXuy51MZ cCBMHQ0x1ID+nEWl40Xj398Wl0DE2Jnxs0So3RVcQVGIktLE2DkV1HMUUZqzH+K4va3r NkK+i+cayZl5A3phFC0oxWBdYt48zB+9ode1zdmkTkN4Q2LIketrL0vUmhqMIPajO1GV 4w1g== X-Gm-Message-State: AJcUukelXHfYF3rRTgUrEBXwLSoM/QtoQ00HYnhbP8cRkP39sEDehS09 K5Pno/Fc3U0CqKGK/bMasYiYdlyzMK0FFA== X-Google-Smtp-Source: ALg8bN4X8bX30fKEoITxvYAvmV9iCq9B7ZUL1XfOiE8NxWqRhNSzUSHO7snXGSw+a65Ae92AHd6RLg== X-Received: by 2002:adf:c711:: with SMTP id k17mr16229723wrg.197.1547823505909; Fri, 18 Jan 2019 06:58:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:32 +0000 Message-Id: <20190118145805.6852-17-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::42d Subject: [Qemu-devel] [PULL 16/49] target/arm: Rearrange decode in disas_uncond_b_reg 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 This will enable PAuth decode in a subsequent patch. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20190108223129.5570-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 47 +++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 2df2323646b..e6017530326 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1989,32 +1989,54 @@ static void disas_uncond_b_reg(DisasContext *s, uin= t32_t insn) rn =3D extract32(insn, 5, 5); op4 =3D extract32(insn, 0, 5); =20 - if (op4 !=3D 0x0 || op3 !=3D 0x0 || op2 !=3D 0x1f) { - unallocated_encoding(s); - return; + if (op2 !=3D 0x1f) { + goto do_unallocated; } =20 switch (opc) { case 0: /* BR */ case 1: /* BLR */ case 2: /* RET */ - gen_a64_set_pc(s, cpu_reg(s, rn)); + switch (op3) { + case 0: + if (op4 !=3D 0) { + goto do_unallocated; + } + dst =3D cpu_reg(s, rn); + break; + + default: + goto do_unallocated; + } + + gen_a64_set_pc(s, dst); /* BLR also needs to load return address */ if (opc =3D=3D 1) { tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); } break; + case 4: /* ERET */ if (s->current_el =3D=3D 0) { - unallocated_encoding(s); - return; + goto do_unallocated; + } + switch (op3) { + case 0: + if (op4 !=3D 0) { + goto do_unallocated; + } + dst =3D tcg_temp_new_i64(); + tcg_gen_ld_i64(dst, cpu_env, + offsetof(CPUARMState, elr_el[s->current_el])); + break; + + default: + goto do_unallocated; } if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) { gen_io_start(); } - 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) { @@ -2023,14 +2045,17 @@ static void disas_uncond_b_reg(DisasContext *s, uin= t32_t insn) /* Must exit loop to check un-masked IRQs */ s->base.is_jmp =3D DISAS_EXIT; return; + case 5: /* DRPS */ - if (rn !=3D 0x1f) { - unallocated_encoding(s); + if (op3 !=3D 0 || op4 !=3D 0 || rn !=3D 0x1f) { + goto do_unallocated; } else { unsupported_encoding(s, insn); } return; + default: + do_unallocated: unallocated_encoding(s); return; } --=20 2.20.1