From patchwork Tue Mar 3 00:48:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 11417007 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36C4014B4 for ; Tue, 3 Mar 2020 01:02:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CD0521D56 for ; Tue, 3 Mar 2020 01:02:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DOHQl+JO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CD0521D56 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vwn-00038f-3O for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Mar 2020 20:02:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45263) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8vkk-0002GG-MY for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8vkj-0004Qb-MK for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:42 -0500 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:35662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8vkj-0004QR-GT for qemu-devel@nongnu.org; Mon, 02 Mar 2020 19:49:41 -0500 Received: by mail-pj1-x1036.google.com with SMTP id s8so550363pjq.0 for ; Mon, 02 Mar 2020 16:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding:cc:from:to; bh=HbGfUPv0cd7o7bP476lAqHrxUZfWuNH/ffddHd7fEos=; b=DOHQl+JOUZUliOK+7WLqmFiyd3DpxYgoGCw0tqjRJV3G83Xhl2Cgv/Dks6rQlMnRki teZIaoP1vr8yHes8Tc74kWdw3CryhJplC5zREOA/f7bFWn8Gh/m4kVnn9hEyI7ADzPti Eh7l7Pf5+0dEovihMu5Nc2K+DIivoSPq3oWAf9JVUZzeZzF5V6UMu8v0ZITbjgd9bnVz h04Dw485DjfpRAmGaslfz9V3ICklk68MtR2ITaEhbDD+L5S2mLzjV+/AsGHu2LRS9Jnx HfIbk3A4QFB7tGiFX8R5dfnXDzfaIOZ9BKerOi2Mi5b22achDJqF0xIPfIFSjomy0DYu AEjw== 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=HbGfUPv0cd7o7bP476lAqHrxUZfWuNH/ffddHd7fEos=; b=Pi7PK29lz0Dii2PwljkHwC8pbNvZqp9u+hT3xYzZ9X6K6FUWIyMACps2SavHCNSL1g Ov3goAbagGqwmG54g7zU0edL51KsrKisodeuh8/dDIw4vVykeWa6iqjrCK7q3uimRx7T ithoBunYnrKWM7puHLGkM0kV0NG40CM1qJquOlIGjl7tdovyTTpGcM0g51PgOVDcPJyl OMbGhyZhYQ3N1RHLTwhgoD5vgVbJndiF9mtYGwcNAx8ETurdXOrC5H0XoXT+iR/GqvRG TkyiDYMjzC/2hgRqQ9MNXH4D94NPsVCcKkVeS93ZMEHxfbpqKw8c8Mu39aZezHFW/pqG wiTA== X-Gm-Message-State: ANhLgQ1EXMO1j1pMymTTO+Qnbi/wzcMvGeBuIX5I+sTVF1QRO95esG+U b2eSYqm/aG6VsdObTqbS3uXmu4ax65OFpw== X-Google-Smtp-Source: ADFU+vt8FQmcxf5ZJYv2NcYU5ZuBI+/79Ajeg7uSmXRJhFLosymtvVcYfVLC5w/42sFDSSJU6MIgNA== X-Received: by 2002:a17:90a:9409:: with SMTP id r9mr1221904pjo.39.1583196580433; Mon, 02 Mar 2020 16:49:40 -0800 (PST) Received: from localhost ([2620:0:1000:2514:23a5:d584:6a92:3e3c]) by smtp.gmail.com with ESMTPSA id d6sm97750pjv.38.2020.03.02.16.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 16:49:39 -0800 (PST) Subject: [PULL 24/38] target/riscv: Remove the hret instruction Date: Mon, 2 Mar 2020 16:48:34 -0800 Message-Id: <20200303004848.136788-25-palmerdabbelt@google.com> X-Mailer: git-send-email 2.25.0.265.gbab2e86ba0-goog In-Reply-To: <20200303004848.136788-1-palmerdabbelt@google.com> References: <20200303004848.136788-1-palmerdabbelt@google.com> MIME-Version: 1.0 Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Alistair Francis , Palmer Dabbelt 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::1036 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alistair Francis The hret instruction does not exist in the new spec versions, so remove it from QEMU. Signed-off-by: Alistair Francis Reviewed-by: Palmer Dabbelt Signed-off-by: Palmer Dabbelt --- target/riscv/insn32.decode | 1 - target/riscv/insn_trans/trans_privileged.inc.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode index cfd9ca6d2b..b883672e63 100644 --- a/target/riscv/insn32.decode +++ b/target/riscv/insn32.decode @@ -75,7 +75,6 @@ ecall 000000000000 00000 000 00000 1110011 ebreak 000000000001 00000 000 00000 1110011 uret 0000000 00010 00000 000 00000 1110011 sret 0001000 00010 00000 000 00000 1110011 -hret 0010000 00010 00000 000 00000 1110011 mret 0011000 00010 00000 000 00000 1110011 wfi 0001000 00101 00000 000 00000 1110011 hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma diff --git a/target/riscv/insn_trans/trans_privileged.inc.c b/target/riscv/insn_trans/trans_privileged.inc.c index b9b5a89b52..76c2fad71c 100644 --- a/target/riscv/insn_trans/trans_privileged.inc.c +++ b/target/riscv/insn_trans/trans_privileged.inc.c @@ -58,11 +58,6 @@ static bool trans_sret(DisasContext *ctx, arg_sret *a) #endif } -static bool trans_hret(DisasContext *ctx, arg_hret *a) -{ - return false; -} - static bool trans_mret(DisasContext *ctx, arg_mret *a) { #ifndef CONFIG_USER_ONLY