From patchwork Tue Jan 8 22:31:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 155014 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp35506jaa; Tue, 8 Jan 2019 14:38:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN4vsRJ6ARQEIdCYFYqQ1MntTZNXz4/K4GIz4SLd+1pruW+rb0izcUTuFWJRR0rJ5Ly9FyYJ X-Received: by 2002:a1c:c58d:: with SMTP id v135mr3308932wmf.88.1546987084430; Tue, 08 Jan 2019 14:38:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546987084; cv=none; d=google.com; s=arc-20160816; b=yOz9GG4RY5xZ5z+oDaRSUa9TG9vOz/GfAn6x76M5E/53Dqmo869NZTZrKt3j97reIV +SrSdeZMv4mehFO1FxtgaToo0YgNX8Mmf9umzvgxNspHNdysOYIg1/loGGLZ2ktRzJFD EkHd1YA5Mh3rnpyCqfBZvhXRnQB6xudCUsSKBoE018llWPzMOlEAnKLf+uwWxECnYrGH uAFdPF/Gs92Sr3SGG1/ja6I3RlgvNEi2yY8ChcgPqkRVY48xHwGtoxedH5V4ZjrCU3v3 9/g8W1z0feIbEjmg0PBlWdNG78hKEku4sdvbQ54x7/wZyW5jv1wrPj2ybOpyMFjzcJNu FL6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Z8qLMJYEQtQI0+ZnJhB24wgZSIfyCc/5D6oRFz2V9go=; b=yPNdJupWHqO+xwzOfEeRAfMTtt3Xwvq5zKRw//cYCh/9Q2ahr8+G2GdAYzMErLjPzo TF4RFJ3dhthj/+Poo/vUujvYVbr9USGfS8J4Pi97ZERvELkYiTjokHhqTRErCZnQfaFy 7v7BKTfe4wX9CGDWqwJ3PAGfIcK7W2fwmFHL8VmFXoPjsN4gtf2/jB7nZygQI33rmrbC x0dZnbFf2M0KAhuVBcwTNHv4IJUr6eSu4RA/clXXK6k1XcHQQboTg3Y2bdGHpPFRxH/n 4R0x5ApxlkM1m6RWPsQrVjDhZX4EGBH27nBm/DN7Ziiqei3eh4GvuUNK4T+gRb19C6uu ssvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R3gXpTZS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m1si42764251wrb.215.2019.01.08.14.38.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 08 Jan 2019 14:38:04 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=R3gXpTZS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:40864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gh00Z-0004N6-97 for patch@linaro.org; Tue, 08 Jan 2019 17:38:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggzv4-00008i-DM for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggzv3-0004jn-Be for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:22 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:34736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggzuz-0004aA-GX for qemu-devel@nongnu.org; Tue, 08 Jan 2019 17:32:19 -0500 Received: by mail-pl1-x632.google.com with SMTP id w4so2573439plz.1 for ; 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=Z8qLMJYEQtQI0+ZnJhB24wgZSIfyCc/5D6oRFz2V9go=; b=R3gXpTZSaiE8d5WYeOn4NMl16RDAmJb/j5qCZMxUSxnP5bBKR12WBx4637xdus7RZk Mpb2mq67BYTV0FMcFugQ8g04Iit8j1reCaX8W59X1YcLidTqQ1/7ue7vsjpjKjA5od7j z4jOAAw7XLEOXuWrDC3jdVBpW56TnxwoNRpwg= 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=Z8qLMJYEQtQI0+ZnJhB24wgZSIfyCc/5D6oRFz2V9go=; b=EUGHbi5+G6L9Mp0pGTMj2X2U62V6HntYp+QeLwfOO9MDHVAJiPzBDAnsJxv1DwOvlM PVsyApPYcyT5iANk2K4busbudD7B6V0gNWY/fUSRBEhcCUTw7F2YDGUPBRE037ugU1MO IvseB2o5NeO/WdOLgbNusRb0Qgbw6vp4143W4UZWlVeYUPMccM+rtEW21oAVaVO9ltAF +DZL8IKIV6LFpMvAu+33EK6NLYgFgY7SGeITHAmRO8f7CrY09Dk5nF+PN+RpBQV5eB9v JGrRJdB3Ft4HWkIWmgsIoasJHuaA97/4tWFVuPvbKsE017ZK9Qtc1SpRrpl5YL04xIj2 /iZA== X-Gm-Message-State: AJcUukdGODhKFOBWrFbmfCcBSic1wGLbFbB1XUZHjoHTlMuoFp/2yacQ 624eTQRAznNR07TwYM6S5qjWprKebHc= X-Received: by 2002:a17:902:7107:: with SMTP id a7mr3575869pll.290.1546986727781; Tue, 08 Jan 2019 14:32:07 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Jan 2019 14:32:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 9 Jan 2019 08:31:10 +1000 Message-Id: <20190108223129.5570-13-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::632 Subject: [Qemu-devel] [PATCH v3 12/31] 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will enable PAuth decode in a subsequent patch. Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 47 +++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 11 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 2df2323646..e601753032 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, uint32_t insn) rn = extract32(insn, 5, 5); op4 = extract32(insn, 0, 5); - if (op4 != 0x0 || op3 != 0x0 || op2 != 0x1f) { - unallocated_encoding(s); - return; + if (op2 != 0x1f) { + goto do_unallocated; } 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 != 0) { + goto do_unallocated; + } + dst = cpu_reg(s, rn); + break; + + default: + goto do_unallocated; + } + + gen_a64_set_pc(s, dst); /* BLR also needs to load return address */ if (opc == 1) { tcg_gen_movi_i64(cpu_reg(s, 30), s->pc); } break; + case 4: /* ERET */ if (s->current_el == 0) { - unallocated_encoding(s); - return; + goto do_unallocated; + } + switch (op3) { + case 0: + if (op4 != 0) { + goto do_unallocated; + } + dst = 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 = 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, uint32_t insn) /* Must exit loop to check un-masked IRQs */ s->base.is_jmp = DISAS_EXIT; return; + case 5: /* DRPS */ - if (rn != 0x1f) { - unallocated_encoding(s); + if (op3 != 0 || op4 != 0 || rn != 0x1f) { + goto do_unallocated; } else { unsupported_encoding(s, insn); } return; + default: + do_unallocated: unallocated_encoding(s); return; }