From nobody Wed Feb 11 05:36:36 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546987560275433.75059922474327; Tue, 8 Jan 2019 14:46:00 -0800 (PST) Received: from localhost ([127.0.0.1]:43203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gh089-0004dL-Qd for importer@patchew.org; Tue, 08 Jan 2019 17:45:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggzv5-00009q-B0 for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggzv4-0004lD-D8 for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:23 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:34528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggzv3-0004b3-Gs for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:21 -0500 Received: by mail-pf1-x442.google.com with SMTP id h3so2625655pfg.1 for ; Tue, 08 Jan 2019 14:32:11 -0800 (PST) Received: from cloudburst.lan (2001-44b8-2176-c800-8cc6-2630-7d99-5ef1.static.ipv6.internode.on.net. [2001:44b8:2176:c800:8cc6:2630:7d99:5ef1]) by smtp.gmail.com with ESMTPSA id w128sm100686177pfw.79.2019.01.08.14.32.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Jan 2019 14:32:09 -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=WDCmraVytCVp2uFN73TTP/9xo07ZZ0ObLi7t4pJW3JA=; b=jXBE5C17wp/0FbJPVfp92h1OyAwVnbDKJzg4CA7KdrgYS0aF396XYH7OS4FoHiIw3O tmqxrC9mUL+MKx3OBGpsd/hcLEAHIZm/xxhmHT0EK75ZY1P4hZXOLEe6uxE5ObJpHDhx rVe1TTzylSkgXavjGoYqXEbaY816FY9m3eJfc= 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=WDCmraVytCVp2uFN73TTP/9xo07ZZ0ObLi7t4pJW3JA=; b=rHuhJ5K7HiYBPG1y8brVEhe5x3UbgKwBaktwfNKcvaAEi4Gl3fRrx/tC4qaRYlmy1G 7+IMFfWb6oWjwzekYZRbhnJ0cRceDbOhproyTz+1I14WfAJDWuj/LqxEtjyAY2GROT7V Mzcthk0tGuqJYeM8HrBPr+6Y/hR/62rUl6uz18/RCtnnOf8wXaYKHUYpO1rbAgDXqgY6 t/cicog1lSY+lS5tzsJec5m4K/lV943BqRkVMmEkahPi2+4Aakx5J4CTiBsg+vPvC5NF H3n47o+9+cg3UFS21P7CdhEcF8TPZpzfVQSGOpJHc3dUMr6Wlj9eyY0JBU0K+zCkkOKR Hl0g== X-Gm-Message-State: AJcUukdRj0O/tn85fDpze7HfeUkKHumwOxEBGfFPc1sBhP4u9qY6FTeE nJ3JnbRHB1UuxK/PWUi1xDn6Lqj33JI= X-Google-Smtp-Source: ALg8bN4LlN2e1ICkI68oRAou0tyU4si6uT1rQ77jIv5dW/8g3E28GBQyHvZJXregRoboRxAYMoRIHg== X-Received: by 2002:a62:2082:: with SMTP id m2mr3429485pfj.163.1546986730269; Tue, 08 Jan 2019 14:32:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 08:31:11 +1000 Message-Id: <20190108223129.5570-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190108223129.5570-1-richard.henderson@linaro.org> References: <20190108223129.5570-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 v3 13/31] target/arm: Decode PAuth within 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: , 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" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 82 +++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index e601753032..fa50003f0b 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -1982,6 +1982,7 @@ static void disas_uncond_b_reg(DisasContext *s, uint3= 2_t insn) { unsigned int opc, op2, op3, rn, op4; TCGv_i64 dst; + TCGv_i64 modifier; =20 opc =3D extract32(insn, 21, 4); op2 =3D extract32(insn, 16, 5); @@ -1999,12 +2000,44 @@ static void disas_uncond_b_reg(DisasContext *s, uin= t32_t insn) case 2: /* RET */ switch (op3) { case 0: + /* BR, BLR, RET */ if (op4 !=3D 0) { goto do_unallocated; } dst =3D cpu_reg(s, rn); break; =20 + case 2: + case 3: + if (!dc_isar_feature(aa64_pauth, s)) { + goto do_unallocated; + } + if (opc =3D=3D 2) { + /* RETAA, RETAB */ + if (rn !=3D 0x1f || op4 !=3D 0x1f) { + goto do_unallocated; + } + rn =3D 30; + modifier =3D cpu_X[31]; + } else { + /* BRAAZ, BRABZ, BLRAAZ, BLRABZ */ + if (op4 !=3D 0x1f) { + goto do_unallocated; + } + modifier =3D new_tmp_a64_zero(s); + } + if (s->pauth_active) { + dst =3D new_tmp_a64(s); + if (op3 =3D=3D 2) { + gen_helper_autia(dst, cpu_env, cpu_reg(s, rn), modifie= r); + } else { + gen_helper_autib(dst, cpu_env, cpu_reg(s, rn), modifie= r); + } + } else { + dst =3D cpu_reg(s, rn); + } + break; + default: goto do_unallocated; } @@ -2016,12 +2049,38 @@ static void disas_uncond_b_reg(DisasContext *s, uin= t32_t insn) } break; =20 + case 8: /* BRAA */ + case 9: /* BLRAA */ + if (!dc_isar_feature(aa64_pauth, s)) { + goto do_unallocated; + } + if (op3 !=3D 2 || op3 !=3D 3) { + goto do_unallocated; + } + if (s->pauth_active) { + dst =3D new_tmp_a64(s); + modifier =3D cpu_reg_sp(s, op4); + if (op3 =3D=3D 2) { + gen_helper_autia(dst, cpu_env, cpu_reg(s, rn), modifier); + } else { + gen_helper_autib(dst, cpu_env, cpu_reg(s, rn), modifier); + } + } else { + dst =3D cpu_reg(s, rn); + } + gen_a64_set_pc(s, dst); + /* BLRAA also needs to load return address */ + if (opc =3D=3D 9) { + tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); + } + break; + case 4: /* ERET */ if (s->current_el =3D=3D 0) { goto do_unallocated; } switch (op3) { - case 0: + case 0: /* ERET */ if (op4 !=3D 0) { goto do_unallocated; } @@ -2030,6 +2089,27 @@ static void disas_uncond_b_reg(DisasContext *s, uint= 32_t insn) offsetof(CPUARMState, elr_el[s->current_el])); break; =20 + case 2: /* ERETAA */ + case 3: /* ERETAB */ + if (!dc_isar_feature(aa64_pauth, s)) { + goto do_unallocated; + } + if (rn !=3D 0x1f || op4 !=3D 0x1f) { + goto do_unallocated; + } + dst =3D tcg_temp_new_i64(); + tcg_gen_ld_i64(dst, cpu_env, + offsetof(CPUARMState, elr_el[s->current_el])); + if (s->pauth_active) { + modifier =3D cpu_X[31]; + if (op3 =3D=3D 2) { + gen_helper_autia(dst, cpu_env, dst, modifier); + } else { + gen_helper_autib(dst, cpu_env, dst, modifier); + } + } + break; + default: goto do_unallocated; } --=20 2.17.2