From patchwork Mon Aug 31 16:05:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 248823 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp3465922ilg; Mon, 31 Aug 2020 09:40:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrtDMYp7ZbLna2DIdiEYVoOGJonxIPOyMc4FhnAwn5i/Et4TiLx82XzKeJ3w+DkWp+Hi1z X-Received: by 2002:a25:e0a:: with SMTP id 10mr3509160ybo.256.1598892014191; Mon, 31 Aug 2020 09:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598892014; cv=none; d=google.com; s=arc-20160816; b=XgYCbZFNC50KTa9W5AXQjM7N6Be+Ea6kQ+9z/l7ElcWnW6ToWOSoLCnmMuJ3wcshjX kJFIhJIumraI4saluFa1IyDjqlJFrn1UosscrrxBYt8cWp4Fuxx1uHwuQWISGMTEoi2k yx1AlCzwn6YUNx5mvYmAbBXiA6bzwDXkCOGEbiJYunHOGC7c85uXCX2Dfo1jknBZLpAX sVM2vlXZYEckm5FV59EEgfwq8GAdSrcF9NBYXJjbdZ44/SdzmGWN+ugCpoPJXCxnWdjH 59g4ovorOwlOBwkaoHjOBIDDsSRujHEY0Lu6n65yhXj6ocItH/PbHUofSk63ynngxD4V gF0w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lNxGpdpg2KpPZCNJVqLbHwhbAMKlczMopXQuhke8q/4=; b=Mx6vkitZI+LK5wNIPuwOWLqYEXUg/NjSFqdAXoT+e8JbluR7RLsU+F07QNaf0VrNh+ BXOE+hRR6bXCnlTGJmVE/r1eqAXn233XWyyG557b87EuKYO8iPz6SFiZ6D7RRKYxu49f uppvQWWXwvbj4pp6rOhuv2IV7p4PMDdLNDOJLPjwjtH9fpWTaTKRz+bN/vy7fFSmUd4U WQHtTABdixv9CTFoI839AKkJFghTfha1JKPKwrG8Stt9crcr/SVz1rLYkkxPSyJh2nmX Mrohc2kbDyBPEflonfL8huU90lz74bPGV7lpWHP10j3Mm1fX8dNpn6j5CFZQJPFzwtNj Hryw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dxv8LcVE; 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 k20si9492283ybf.78.2020.08.31.09.40.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Aug 2020 09:40:14 -0700 (PDT) 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=dxv8LcVE; 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 ([::1]:53348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCmqr-00062r-LK for patch@linaro.org; Mon, 31 Aug 2020 12:40:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCmLI-0006RV-Ka for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:07:36 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:38711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kCmLG-00069X-LH for qemu-devel@nongnu.org; Mon, 31 Aug 2020 12:07:36 -0400 Received: by mail-pl1-x630.google.com with SMTP id t11so3247449plr.5 for ; Mon, 31 Aug 2020 09:07:34 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=lNxGpdpg2KpPZCNJVqLbHwhbAMKlczMopXQuhke8q/4=; b=dxv8LcVEWwecfxRCJfvYmEHbdR71XjfbkYnOaLcI2P2GROmTGYv/4RU8hSAkwN1za9 orqpUjU/eiBn4m70A8lgSiFQaLdQ7twDSBxY5GtbnKMPdAwWr13/N091aKoAyK/jFKLB jZSHUwJe3KSEbAKTsNRyvKJzmjpaRtalO/o+AqnlSn9JyTWku0H3xd/o9NFN0T/GOrOq wV+scaKle3dIJhoD2lRA19tuxHv5eMebs551joBfW1H23nvlIw/3/qkQr0Mltwr+hhSj lgZw2EQ6IP1S5f34VEjq9hwod6y2Y8eTSv7uMafkwuB0QiffTlv+yZETAiPkiZ8W/2as gpjg== 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:mime-version:content-transfer-encoding; bh=lNxGpdpg2KpPZCNJVqLbHwhbAMKlczMopXQuhke8q/4=; b=m3cHGt+1gjsxLTm0aIKu62pmYqBCkgEKt448FaNxiQKLTm/o3q5eQk9WDoSgxsb3cQ TjOk/PpneUDj0vclA+kAslJhFO0zLyWYfESRk2Uu5qF+UmreMkcAAovNY4va6Fis+W25 a0pRF7x/RFZHPJn0gvipy0H7vrGhLHYkjL6vPvmV3JefSNHRpNr/rHWsetJ4tRyY/1D5 /KTnfw1QYvHNgQeV7EGe28vw1hMptUFWYtLUSs4Xi5xCRVQSZ5wIBXZ2bI3qogs66Ayt A6o9PUZZSFMzlT1yOgyTD/miwIGc8BobyjsNQxKq4mEfXY/xKyRjM721hLMdbFZkmIvb unNg== X-Gm-Message-State: AOAM53282YmVMLKG1Zj6hYOjS2TH2hVQc1jSuGmJv0dAZBchGu9x4SYw 2CrtbwKkZMWfxz5Dy2UdgLy0RDsdQ3z1Uw== X-Received: by 2002:a17:90b:4d06:: with SMTP id mw6mr87594pjb.226.1598890052859; Mon, 31 Aug 2020 09:07:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id gt13sm17218pjb.43.2020.08.31.09.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Aug 2020 09:07:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 66/76] target/microblaze: Convert dec_br to decodetree Date: Mon, 31 Aug 2020 09:05:51 -0700 Message-Id: <20200831160601.833692-67-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200831160601.833692-1-richard.henderson@linaro.org> References: <20200831160601.833692-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x630.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Edgar E. Iglesias Reviewed-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/microblaze/insns.decode | 14 ++++++ target/microblaze/translate.c | 87 +++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 38 deletions(-) -- 2.25.1 diff --git a/target/microblaze/insns.decode b/target/microblaze/insns.decode index 8eba47d90c..340dd999b6 100644 --- a/target/microblaze/insns.decode +++ b/target/microblaze/insns.decode @@ -68,6 +68,20 @@ andi 101001 ..... ..... ................ @typeb andn 100011 ..... ..... ..... 000 0000 0000 @typea andni 101011 ..... ..... ................ @typeb +br 100110 ..... 00000 ..... 000 0000 0000 @typea_br +bra 100110 ..... 01000 ..... 000 0000 0000 @typea_br +brd 100110 ..... 10000 ..... 000 0000 0000 @typea_br +brad 100110 ..... 11000 ..... 000 0000 0000 @typea_br +brld 100110 ..... 10100 ..... 000 0000 0000 @typea_br +brald 100110 ..... 11100 ..... 000 0000 0000 @typea_br + +bri 101110 ..... 00000 ................ @typeb_br +brai 101110 ..... 01000 ................ @typeb_br +brid 101110 ..... 10000 ................ @typeb_br +braid 101110 ..... 11000 ................ @typeb_br +brlid 101110 ..... 10100 ................ @typeb_br +bralid 101110 ..... 11100 ................ @typeb_br + brk 100110 ..... 01100 ..... 000 0000 0000 @typea_br brki 101110 ..... 01100 ................ @typeb_br diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 1545974669..5c6e6e599e 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1048,6 +1048,53 @@ static bool trans_swx(DisasContext *dc, arg_typea *arg) return true; } +static void setup_dslot(DisasContext *dc, bool type_b) +{ + dc->tb_flags_to_set |= D_FLAG; + if (type_b && (dc->tb_flags & IMM_FLAG)) { + dc->tb_flags_to_set |= BIMM_FLAG; + } +} + +static bool do_branch(DisasContext *dc, int dest_rb, int dest_imm, + bool delay, bool abs, int link) +{ + uint32_t add_pc; + + if (delay) { + setup_dslot(dc, dest_rb < 0); + } + + if (link) { + tcg_gen_movi_i32(cpu_R[link], dc->base.pc_next); + } + + /* Store the branch taken destination into btarget. */ + add_pc = abs ? 0 : dc->base.pc_next; + if (dest_rb > 0) { + dc->jmp_dest = -1; + tcg_gen_addi_i32(cpu_btarget, cpu_R[dest_rb], add_pc); + } else { + dc->jmp_dest = add_pc + dest_imm; + tcg_gen_movi_i32(cpu_btarget, dc->jmp_dest); + } + dc->jmp_cond = TCG_COND_ALWAYS; + return true; +} + +#define DO_BR(NAME, NAMEI, DELAY, ABS, LINK) \ + static bool trans_##NAME(DisasContext *dc, arg_typea_br *arg) \ + { return do_branch(dc, arg->rb, 0, DELAY, ABS, LINK ? arg->rd : 0); } \ + static bool trans_##NAMEI(DisasContext *dc, arg_typeb_br *arg) \ + { return do_branch(dc, -1, arg->imm, DELAY, ABS, LINK ? arg->rd : 0); } + +DO_BR(br, bri, false, false, false) +DO_BR(bra, brai, false, true, false) +DO_BR(brd, brid, true, false, false) +DO_BR(brad, braid, true, true, false) +DO_BR(brld, brlid, true, false, true) +DO_BR(brald, bralid, true, true, true) + static bool trans_brk(DisasContext *dc, arg_typea_br *arg) { if (trap_userspace(dc, true)) { @@ -1372,14 +1419,6 @@ static void dec_msr(DisasContext *dc) } } -static void dec_setup_dslot(DisasContext *dc) -{ - dc->tb_flags_to_set |= D_FLAG; - if (dc->type_b && (dc->tb_flags & IMM_FLAG)) { - dc->tb_flags_to_set |= BIMM_FLAG; - } -} - static void dec_bcc(DisasContext *dc) { static const TCGCond mb_to_tcg_cc[] = { @@ -1398,7 +1437,7 @@ static void dec_bcc(DisasContext *dc) dslot = dc->ir & (1 << 25); if (dslot) { - dec_setup_dslot(dc); + setup_dslot(dc, dc->type_b); } dc->jmp_cond = mb_to_tcg_cc[cc]; @@ -1426,33 +1465,6 @@ static void dec_bcc(DisasContext *dc) tcg_temp_free_i32(next); } -static void dec_br(DisasContext *dc) -{ - unsigned int dslot, link, abs; - uint32_t add_pc; - - dslot = dc->ir & (1 << 20); - abs = dc->ir & (1 << 19); - link = dc->ir & (1 << 18); - - if (dslot) { - dec_setup_dslot(dc); - } - if (link && dc->rd) { - tcg_gen_movi_i32(cpu_R[dc->rd], dc->base.pc_next); - } - - add_pc = abs ? 0 : dc->base.pc_next; - if (dc->type_b) { - dc->jmp_dest = add_pc + dec_alu_typeb_imm(dc); - tcg_gen_movi_i32(cpu_btarget, dc->jmp_dest); - } else { - dc->jmp_dest = -1; - tcg_gen_addi_i32(cpu_btarget, cpu_R[dc->rb], add_pc); - } - dc->jmp_cond = TCG_COND_ALWAYS; -} - static inline void do_rti(DisasContext *dc) { TCGv_i32 t0, t1; @@ -1521,7 +1533,7 @@ static void dec_rts(DisasContext *dc) return; } - dec_setup_dslot(dc); + setup_dslot(dc, true); if (i_bit) { dc->tb_flags |= DRTI_FLAG; @@ -1583,7 +1595,6 @@ static struct decoder_info { }; void (*dec)(DisasContext *dc); } decinfo[] = { - {DEC_BR, dec_br}, {DEC_BCC, dec_bcc}, {DEC_RTS, dec_rts}, {DEC_MSR, dec_msr},