From patchwork Tue Mar 12 13:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 1055414 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="EMV7jdYe"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JbmH0XCMz9s6w for ; Wed, 13 Mar 2019 00:43:59 +1100 (AEDT) Received: from localhost ([127.0.0.1]:52752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hhE-0005fI-Th for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 09:43:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3hUe-00033q-EB for qemu-devel@nongnu.org; Tue, 12 Mar 2019 09:30:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3hGJ-00088G-LM for qemu-devel@nongnu.org; Tue, 12 Mar 2019 09:16:09 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:44309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3hGJ-0007zj-Bm for qemu-devel@nongnu.org; Tue, 12 Mar 2019 09:16:07 -0400 Received: by mail-pf1-x42e.google.com with SMTP id a3so1796716pff.11 for ; Tue, 12 Mar 2019 06:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding:cc:from:to; bh=ToX/SXdJ161autvl4ZZt2ntjrkT+rRoe3YT2cC0hsfE=; b=EMV7jdYeX2X7rNw+tP3UOlXI+R/GACpL7w42xS9pU5MpSeT5JAOvjqNe3mcItG2JHm HhzOoNYYmicFduijLR7VbT9rlsyRHDSSe2WWF0CUIZzmBXQkIK3pRTHYFgqF62M9Hof+ XfPl1m914Z3Q8pt9SOUYnigHYcOU9sNdnsSu7Y1RweYIQF+mx3UIT3IIsr1emobznse7 H/37EMRW1HiYrKSUzgtt1JzdIp4YPh/1O2QoqqyghNqnfdfl2fob3S1nkPFfHVnld/DU iJ+N2cGX5zrxbVMctb1+Yeh2ZhLw33nSXKvu/LgdIexPutTILLOEzGKEqi6UZoVmnftA G36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:cc:from:to; bh=ToX/SXdJ161autvl4ZZt2ntjrkT+rRoe3YT2cC0hsfE=; b=h+lvazUvsmw0NmKtCB2DZxocOQVwpiuV4r5qSOpSyMt4SVtgltMlL7p5xmUPJA3dvV bEjKP/469Voz5UQeaj5fvY695fMkRlwdBwFegv2DjlPXRE+1vAdguAGQMEgmTvgEyn8O KO2XQYVADGH1IAP37mBtlBgrlZ6vL8SIxehE7z/Yd2dT71nZJ/TkaZeZjjOgv4pneoRv FbCdOf8NAcaXteObP41wPq4OfIzE9xSG+FnhBq36n82ZHQEOZYWU0fF+YWLawrE7IWOH 9zl+mVeSbivb3omLOYjzuKw1G0zjoOinK2vc/mRLzXGmMDqjhqWObw3wcv9GlufV4Dqn Y11Q== X-Gm-Message-State: APjAAAXyoWJGyr8QhKV9TcUmuu95uu2tENzpVZWxsF0IiG6L1IlAe5Yv NoYXelE4WWyBSfPMPIwg58Sgkbl3RnNSfyP1 X-Google-Smtp-Source: APXvYqyc8DTPAShp0mOzSFtvrkORSuJlMP6COVIYBZi00fHvUsHtqgEtCsgW1PwjQ7zpijU0tfbLsA== X-Received: by 2002:a63:4e1a:: with SMTP id c26mr34757462pgb.175.1552396560926; Tue, 12 Mar 2019 06:16:00 -0700 (PDT) Received: from localhost (2001-b011-7001-120c-5816-f057-fc2f-b780.dynamic-ip6.hinet.net. [2001:b011:7001:120c:5816:f057:fc2f:b780]) by smtp.gmail.com with ESMTPSA id u11sm32968820pgq.28.2019.03.12.06.15.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 06:16:00 -0700 (PDT) Date: Tue, 12 Mar 2019 06:15:03 -0700 Message-Id: <20190312131526.14710-7-palmer@sifive.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190312131526.14710-1-palmer@sifive.com> References: <20190312131526.14710-1-palmer@sifive.com> MIME-Version: 1.0 From: Palmer Dabbelt To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42e Subject: [Qemu-devel] [PULL 06/29] target/riscv: Convert RVXI fence insns to decodetree 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: Bastian Koppelmann , Peer Adelt , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Palmer Dabbelt Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Bastian Koppelmann Acked-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Bastian Koppelmann Signed-off-by: Peer Adelt Signed-off-by: Palmer Dabbelt --- target/riscv/insn32.decode | 2 ++ target/riscv/insn_trans/trans_rvi.inc.c | 19 +++++++++++++++++++ target/riscv/translate.c | 12 ------------ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index 1f5bf1f6f97d..804b721ca51e 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -82,3 +82,5 @@ srl 0000000 ..... ..... 101 ..... 0110011 @r sra 0100000 ..... ..... 101 ..... 0110011 @r or 0000000 ..... ..... 110 ..... 0110011 @r and 0000000 ..... ..... 111 ..... 0110011 @r +fence ---- pred:4 succ:4 ----- 000 ----- 0001111 +fence_i ---- ---- ---- ----- 001 ----- 0001111 diff --git a/target/riscv/insn_trans/trans_rvi.inc.c b/target/riscv/insn_trans/trans_rvi.inc.c index 136fa54d0655..973d6371df85 100644 --- a/target/riscv/insn_trans/trans_rvi.inc.c +++ b/target/riscv/insn_trans/trans_rvi.inc.c @@ -318,3 +318,22 @@ static bool trans_sraw(DisasContext *ctx, arg_sraw *a) return true; } #endif + +static bool trans_fence(DisasContext *ctx, arg_fence *a) +{ + /* FENCE is a full memory barrier. */ + tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); + return true; +} + +static bool trans_fence_i(DisasContext *ctx, arg_fence_i *a) +{ + /* + * FENCE_I is a no-op in QEMU, + * however we need to end the translation block + */ + tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); + tcg_gen_exit_tb(NULL, 0); + ctx->base.is_jmp = DISAS_NORETURN; + return true; +} diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 1ae84dcd5992..f720746cb791 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1950,18 +1950,6 @@ static void decode_RV32_64G(DisasContext *ctx) gen_fp_arith(ctx, MASK_OP_FP_ARITH(ctx->opcode), rd, rs1, rs2, GET_RM(ctx->opcode)); break; - case OPC_RISC_FENCE: - if (ctx->opcode & 0x1000) { - /* FENCE_I is a no-op in QEMU, - * however we need to end the translation block */ - tcg_gen_movi_tl(cpu_pc, ctx->pc_succ_insn); - tcg_gen_exit_tb(NULL, 0); - ctx->base.is_jmp = DISAS_NORETURN; - } else { - /* FENCE is a full memory barrier. */ - tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC); - } - break; case OPC_RISC_SYSTEM: gen_system(ctx, MASK_OP_SYSTEM(ctx->opcode), rd, rs1, (ctx->opcode & 0xFFF00000) >> 20);