From patchwork Wed Feb 13 15:53:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10810277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 883AE922 for ; Wed, 13 Feb 2019 16:09:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72D622A2FE for ; Wed, 13 Feb 2019 16:09:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6843B2DDCD; Wed, 13 Feb 2019 16:09:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 264B72DDCF for ; Wed, 13 Feb 2019 16:09:56 +0000 (UTC) Received: from localhost ([127.0.0.1]:59276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtx6i-0004aH-6b for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Feb 2019 11:09:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtwtJ-0001su-AO for qemu-devel@nongnu.org; Wed, 13 Feb 2019 10:56:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtwtF-0002iQ-Aq for qemu-devel@nongnu.org; Wed, 13 Feb 2019 10:56:03 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:38975) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtwtB-0000xf-Et for qemu-devel@nongnu.org; Wed, 13 Feb 2019 10:55:59 -0500 Received: by mail-pl1-x632.google.com with SMTP id 101so1346048pld.6 for ; Wed, 13 Feb 2019 07:54:46 -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=w7VQRx07PCvyefnek535b7w+gwAuVbOr1bTDkd1rg44=; b=ACa08nWLFQ5v2ew7KU58/FLJAlG4na7E6UGwkHysnsFw+6RGAQgd/Hz5u7OsYAh3Sj QTMYjHTxk7PCei1NSdD9Qkroxozhbh3tHXe4w/kQJv4RIVmTys8rhqhbPpHP3Eaj8KMy I+Bl6HP6AwsbVgORW9i95lmG2h+G0qqdj9O5tTqUs10yh75fhr3IlDwlKAiQUSxK1VOT amLHyXrBgwqYPzZ1Esf83tC+e3Zow0HTbfKPbUxULl3s3+53bOXdMoU3qIS4aPe2TfPu ijSeKl4K6aZcRY6+x+1dET7cJnttHKlECpIZLIdwQMbioKD63fyYn8nmKrnZSIeun4Fg emoQ== 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=w7VQRx07PCvyefnek535b7w+gwAuVbOr1bTDkd1rg44=; b=PCdR4dyFcY9lF+taLiuyYj14FU2We/WVIe14BdazWG6zC9Hr+ebunOkmBCQP3SH3aJ FOf5To0Ir5OGnCi/NYETmdwtBKQLBOeOxQsLnDcwKOY2DV9xDBpSsFjvbxB+JptXIL4E bKV3HMdbT0E+FZHzig2OenNeWlxtGwYZ/3lXd/LslVJsJPyEFnQE8/btVSK9/Z5yS1NK iL0IC9NOtggxh5HD2iT2TATKWaOBPLYAwRAntyn+MXwirvc9/L/9Qr+1gosbdDx5IUZm 503hp5Kh9F/vkw/jHTsMD35515KzIagaOPYvj/EtXgyXWI3X9cyb6Nnfg/tPQI5o64j/ h1Ig== X-Gm-Message-State: AHQUAuZ2xp9UQz0WzvyQl/4YjhH2zUjIcLDeM+E1Ylk34E7GNIDGZy/2 Xho8+pnJT9Rnmy0qDvHbOM14wfbhCxQ= X-Google-Smtp-Source: AHgI3IbpZUY1vf82XWUjixdL4m2O2UAzIuYcEK3aqhA5LoFtjQSkewAi05ihhotzTiRCMm5VsewI/A== X-Received: by 2002:a17:902:b715:: with SMTP id d21mr1192473pls.242.1550073284947; Wed, 13 Feb 2019 07:54:44 -0800 (PST) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id h79sm31626526pfj.186.2019.02.13.07.54.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 07:54:44 -0800 (PST) Date: Wed, 13 Feb 2019 07:53:44 -0800 Message-Id: <20190213155414.22285-6-palmer@sifive.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20190213155414.22285-1-palmer@sifive.com> References: <20190213155414.22285-1-palmer@sifive.com> From: Palmer Dabbelt To: qemu-riscv@nongnu.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 v7 05/35] target/riscv: Convert RV64I load/store 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-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Bastian Koppelmann this splits the 64-bit only instructions into its own decode file such that we generate the decoder for these instructions only for the RISC-V 64 bit target. Acked-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Bastian Koppelmann Signed-off-by: Peer Adelt --- target/riscv/Makefile.objs | 8 +++++--- target/riscv/insn32-64.decode | 25 +++++++++++++++++++++++++ target/riscv/insn_trans/trans_rvi.inc.c | 20 ++++++++++++++++++++ target/riscv/translate.c | 7 ------- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 target/riscv/insn32-64.decode diff --git a/target/riscv/Makefile.objs b/target/riscv/Makefile.objs index bf0a268033a0..05087a91bb85 100644 --- a/target/riscv/Makefile.objs +++ b/target/riscv/Makefile.objs @@ -2,10 +2,12 @@ obj-y += translate.o op_helper.o cpu_helper.o cpu.o csr.o fpu_helper.o gdbstub.o DECODETREE = $(SRC_PATH)/scripts/decodetree.py -target/riscv/decode_insn32.inc.c: \ - $(SRC_PATH)/target/riscv/insn32.decode $(DECODETREE) +decode32-y = $(SRC_PATH)/target/riscv/insn32.decode +decode32-$(TARGET_RISCV64) += $(SRC_PATH)/target/riscv/insn32-64.decode + +target/riscv/decode_insn32.inc.c: $(decode32-y) $(DECODETREE) $(call quiet-command, \ - $(PYTHON) $(DECODETREE) -o $@ --decode decode_insn32 $<, \ + $(PYTHON) $(DECODETREE) -o $@ --decode decode_insn32 $(decode32-y), \ "GEN", $(TARGET_DIR)$@) target/riscv/translate.o: target/riscv/decode_insn32.inc.c diff --git a/target/riscv/insn32-64.decode b/target/riscv/insn32-64.decode new file mode 100644 index 000000000000..439d4e2c587b --- /dev/null +++ b/target/riscv/insn32-64.decode @@ -0,0 +1,25 @@ +# +# RISC-V translation routines for the RV Instruction Set. +# +# Copyright (c) 2018 Peer Adelt, peer.adelt@hni.uni-paderborn.de +# Bastian Koppelmann, kbastian@mail.uni-paderborn.de +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2 or later, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# this program. If not, see . + +# This is concatenated with insn32.decode for risc64 targets. +# Most of the fields and formats are there. + +# *** RV64I Base Instruction Set (in addition to RV32I) *** +lwu ............ ..... 110 ..... 0000011 @i +ld ............ ..... 011 ..... 0000011 @i +sd ....... ..... ..... 011 ..... 0100011 @s diff --git a/target/riscv/insn_trans/trans_rvi.inc.c b/target/riscv/insn_trans/trans_rvi.inc.c index d13b7b2b6d8f..61f708dba144 100644 --- a/target/riscv/insn_trans/trans_rvi.inc.c +++ b/target/riscv/insn_trans/trans_rvi.inc.c @@ -130,3 +130,23 @@ static bool trans_sw(DisasContext *ctx, arg_sw *a) gen_store(ctx, OPC_RISC_SW, a->rs1, a->rs2, a->imm); return true; } + +#ifdef TARGET_RISCV64 +static bool trans_lwu(DisasContext *ctx, arg_lwu *a) +{ + gen_load(ctx, OPC_RISC_LWU, a->rd, a->rs1, a->imm); + return true; +} + +static bool trans_ld(DisasContext *ctx, arg_ld *a) +{ + gen_load(ctx, OPC_RISC_LD, a->rd, a->rs1, a->imm); + return true; +} + +static bool trans_sd(DisasContext *ctx, arg_sd *a) +{ + gen_store(ctx, OPC_RISC_SD, a->rs1, a->rs2, a->imm); + return true; +} +#endif diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c5bcfd6b9756..3b0bcc33d0fe 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1909,13 +1909,6 @@ static void decode_RV32_64G(DisasContext *ctx) imm = GET_IMM(ctx->opcode); switch (op) { - case OPC_RISC_LOAD: - gen_load(ctx, MASK_OP_LOAD(ctx->opcode), rd, rs1, imm); - break; - case OPC_RISC_STORE: - gen_store(ctx, MASK_OP_STORE(ctx->opcode), rs1, rs2, - GET_STORE_IMM(ctx->opcode)); - break; case OPC_RISC_ARITH_IMM: #if defined(TARGET_RISCV64) case OPC_RISC_ARITH_IMM_W: