From patchwork Fri Mar 1 21:49:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 1050488 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="Fdb5utaI"; 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 44B3SG6n1nz9s7h for ; Sat, 2 Mar 2019 09:07:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:44862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzqJO-0000BV-39 for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2019 17:07:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzq3T-0003Rx-BT for qemu-devel@nongnu.org; Fri, 01 Mar 2019 16:50:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzq3P-00037y-IL for qemu-devel@nongnu.org; Fri, 01 Mar 2019 16:50:54 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]:41510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzq3K-0002Z9-PM for qemu-devel@nongnu.org; Fri, 01 Mar 2019 16:50:51 -0500 Received: by mail-pf1-x42c.google.com with SMTP id d25so12019075pfn.8 for ; Fri, 01 Mar 2019 13:50:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=qsaDjuD7cYGnev4FgbYMJhzlxE/p3Kn1ZCz4427+MCo=; b=Fdb5utaI5ouAhx0MWV5CRVTaRnL5y0jxV3m4TJvmBaSri3DN+sRhr2TtghzgxBKe82 D6eBgr4V18fDWG+MrVMPJN80IDaz9XR8uoYEYGQ/9JWxczTNnT89HZVayuW4O28CdnUH TEmzhQmqrfhJAnuyziNElcNlIasCeNPyOy1UoEQZ4eEL7gj6GcSJfXWL1Gam2845xXuG HDUO+FvghJoGHxxgScisefa3e5RddLqRuP0o0PfTIuogkWneOI68M56zL8fD3/VIdZ1u tfjzHTGZNgOf12lrbhOs8H+iJ4Xq7PCAlkAdrwmg+kKgFaq+XuRDcxHPVM31YOxMZXQv MT5g== 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 :cc:from:to; bh=qsaDjuD7cYGnev4FgbYMJhzlxE/p3Kn1ZCz4427+MCo=; b=ETdTEvt9TyjK+KPWvk7ic1i+Ddii9c1mcI5TMKhD5U3Bhm46zzf+RwK+xZfBPZOSvp P9Fd5Wc2sbTCX7/63t8dFcxHiPm6nUHsAIORbTS8VvIRV8hiLRlaLnCqS8CepKxgfYma cro9WNP8CeqegO8NJn4Jo/TRDLkKVdgBWQXq+K8v6AXSoiCSY2SDBFbhtnTU+BLriDFa Fgqk4XHcxdNGTTu3q+gFUQ38K3QkHnpJAVyXJYP6E3zLWavuNiOYZMbAW0BWtcBnmACO oTU67oPtRuE1K8sL+Rn01dD01NlS7etULYidz0Qpv4wcDWLgWMf4/j7w5ym+7+wrz/te 7pdQ== X-Gm-Message-State: APjAAAUldut9HmbUK723l2KvqoPHz+RyNo6tJRSMyw7IcnCnp9aGYy3S +jd2eU5jpgAhTQfpxorWPM6meoXFf2M= X-Google-Smtp-Source: APXvYqz5z55FHzQjQkjwN4vBUokpZvaISx8Q6DIDr5QBOwxVyr1AnBc41JeTuohPcpP/NHAMe3I8QQ== X-Received: by 2002:a62:1752:: with SMTP id 79mr7725798pfx.127.1551477033715; Fri, 01 Mar 2019 13:50:33 -0800 (PST) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id h75sm38332418pfd.150.2019.03.01.13.50.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 13:50:33 -0800 (PST) Date: Fri, 1 Mar 2019 13:49:33 -0800 Message-Id: <20190301214945.4353-23-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20190301214945.4353-1-palmer@sifive.com> References: <20190301214945.4353-1-palmer@sifive.com> 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::42c Subject: [Qemu-devel] [PULL 22/34] target/riscv: Remove manual decoding from gen_store() 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 With decodetree we don't need to convert RISC-V opcodes into to MemOps as the old gen_store() did. Reviewed-by: Richard Henderson Signed-off-by: Bastian Koppelmann Signed-off-by: Peer Adelt Signed-off-by: Palmer Dabbelt --- target/riscv/insn_trans/trans_rvi.inc.c | 27 +++++++++++++++++-------- target/riscv/translate.c | 8 +++++--- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvi.inc.c b/target/riscv/insn_trans/trans_rvi.inc.c index cc361ed4d151..5a09c6335ae0 100644 --- a/target/riscv/insn_trans/trans_rvi.inc.c +++ b/target/riscv/insn_trans/trans_rvi.inc.c @@ -168,22 +168,34 @@ static bool trans_lhu(DisasContext *ctx, arg_lhu *a) return gen_load(ctx, a, MO_TEUW); } -static bool trans_sb(DisasContext *ctx, arg_sb *a) +static bool gen_store(DisasContext *ctx, arg_sb *a, TCGMemOp memop) { - gen_store(ctx, OPC_RISC_SB, a->rs1, a->rs2, a->imm); + TCGv t0 = tcg_temp_new(); + TCGv dat = tcg_temp_new(); + gen_get_gpr(t0, a->rs1); + tcg_gen_addi_tl(t0, t0, a->imm); + gen_get_gpr(dat, a->rs2); + + tcg_gen_qemu_st_tl(dat, t0, ctx->mem_idx, memop); + tcg_temp_free(t0); + tcg_temp_free(dat); return true; } + +static bool trans_sb(DisasContext *ctx, arg_sb *a) +{ + return gen_store(ctx, a, MO_SB); +} + static bool trans_sh(DisasContext *ctx, arg_sh *a) { - gen_store(ctx, OPC_RISC_SH, a->rs1, a->rs2, a->imm); - return true; + return gen_store(ctx, a, MO_TESW); } static bool trans_sw(DisasContext *ctx, arg_sw *a) { - gen_store(ctx, OPC_RISC_SW, a->rs1, a->rs2, a->imm); - return true; + return gen_store(ctx, a, MO_TESL); } #ifdef TARGET_RISCV64 @@ -199,8 +211,7 @@ static bool trans_ld(DisasContext *ctx, arg_ld *a) static bool trans_sd(DisasContext *ctx, arg_sd *a) { - gen_store(ctx, OPC_RISC_SD, a->rs1, a->rs2, a->imm); - return true; + return gen_store(ctx, a, MO_TEQ); } #endif diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 99d6d3b4ae91..cdc08b1bff20 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -56,6 +56,7 @@ typedef struct DisasContext { int frm; } DisasContext; +#ifdef TARGET_RISCV64 /* convert riscv funct3 to qemu memop for load/store */ static const int tcg_memop_lookup[8] = { [0 ... 7] = -1, @@ -69,6 +70,7 @@ static const int tcg_memop_lookup[8] = { [6] = MO_TEUL, #endif }; +#endif #ifdef TARGET_RISCV64 #define CASE_OP_32_64(X) case X: case glue(X, W) @@ -551,9 +553,8 @@ static void gen_load_c(DisasContext *ctx, uint32_t opc, int rd, int rs1, tcg_temp_free(t0); tcg_temp_free(t1); } -#endif -static void gen_store(DisasContext *ctx, uint32_t opc, int rs1, int rs2, +static void gen_store_c(DisasContext *ctx, uint32_t opc, int rs1, int rs2, target_long imm) { TCGv t0 = tcg_temp_new(); @@ -572,6 +573,7 @@ static void gen_store(DisasContext *ctx, uint32_t opc, int rs1, int rs2, tcg_temp_free(t0); tcg_temp_free(dat); } +#endif #ifndef CONFIG_USER_ONLY /* The states of mstatus_fs are: @@ -736,7 +738,7 @@ static void decode_RV32_64C0(DisasContext *ctx) case 7: #if defined(TARGET_RISCV64) /* C.SD (RV64/128) -> sd rs2', offset[7:3](rs1')*/ - gen_store(ctx, OPC_RISC_SD, rs1s, rd_rs2, + gen_store_c(ctx, OPC_RISC_SD, rs1s, rd_rs2, GET_C_LD_IMM(ctx->opcode)); #else /* C.FSW (RV32) -> fsw rs2', offset[6:2](rs1')*/