[PULL,24/38] target/riscv: Remove the hret instruction

Message ID	20200303004848.136788-25-palmerdabbelt@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=+m3j=4U=nongnu.org=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CD0521D56 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> In-Reply-To: <20200303004848.136788-1-palmerdabbelt@google.com> References: <20200303004848.136788-1-palmerdabbelt@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Alistair Francis <alistair.francis@wdc.com>, Palmer Dabbelt <palmerdabbelt@google.com> From: Palmer Dabbelt <palmerdabbelt@google.com> To: Peter Maydell <peter.maydell@linaro.org> Precedence: list Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>
Series	[PULL,01/38] target/riscv: Convert MIP CSR to target_ulong \| expand [PULL,01/38] target/riscv: Convert MIP CSR to target_ulong [PULL,02/38] target/riscv: Add the Hypervisor extension [PULL,03/38] target/riscv: Add the Hypervisor CSRs to CPUState [PULL,04/38] target/riscv: Add support for the new execption numbers [PULL,05/38] target/riscv: Rename the H irqs to VS irqs [PULL,06/38] target/riscv: Add the virtulisation mode [PULL,07/38] target/riscv: Add the force HS exception mode [PULL,08/38] target/riscv: Fix CSR perm checking for HS mode [PULL,09/38] target/riscv: Print priv and virt in disas log [PULL,10/38] target/riscv: Dump Hypervisor registers if enabled [PULL,11/38] target/riscv: Add Hypervisor CSR access functions [PULL,12/38] target/riscv: Add Hypervisor virtual CSRs accesses [PULL,13/38] target/riscv: Add Hypervisor machine CSRs accesses [PULL,14/38] target/riscv: Add virtual register swapping function [PULL,15/38] target/riscv: Set VS bits in mideleg for Hyp extension [PULL,16/38] target/riscv: Extend the MIE CSR to support virtulisation [PULL,17/38] target/riscv: Extend the SIP CSR to support virtulisation [PULL,18/38] target/riscv: Add support for virtual interrupt setting [PULL,19/38] target/ricsv: Flush the TLB on virtulisation mode changes [PULL,20/38] target/riscv: Generate illegal instruction on WFI when V=1 [PULL,21/38] target/riscv: Add hypvervisor trap support [PULL,22/38] target/riscv: Add Hypervisor trap return support [PULL,23/38] target/riscv: Add hfence instructions [PULL,24/38] target/riscv: Remove the hret instruction [PULL,25/38] target/riscv: Only set TB flags with FP status if enabled [PULL,26/38] target/riscv: Disable guest FP support based on virtual status [PULL,27/38] target/riscv: Mark both sstatus and msstatus_hs as dirty [PULL,28/38] target/riscv: Respect MPRV and SPRV for floating point ops [PULL,29/38] target/riscv: Allow specifying MMU stage [PULL,30/38] target/riscv: Implement second stage MMU [PULL,31/38] target/riscv: Raise the new execptions when 2nd stage translation fails [PULL,32/38] target/riscv: Set htval and mtval2 on execptions [PULL,33/38] target/riscv: Add support for the 32-bit MSTATUSH CSR [PULL,34/38] target/riscv: Add the MSTATUS_MPV_ISSET helper macro [PULL,35/38] target/riscv: Allow enabling the Hypervisor extension [PULL,36/38] riscv: virt: Allow PCI address 0 [PULL,37/38] target/riscv: Emulate TIME CSRs for privileged mode [PULL,38/38] hw/riscv: Provide rdtime callback for TCG in CLINT emulation

Message ID

20200303004848.136788-25-palmerdabbelt@google.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CD0521D56
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>
In-Reply-To: <20200303004848.136788-1-palmerdabbelt@google.com>
References: <20200303004848.136788-1-palmerdabbelt@google.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Cc: qemu-riscv@nongnu.org,          qemu-devel@nongnu.org,
 Alistair Francis <alistair.francis@wdc.com>,
 Palmer Dabbelt <palmerdabbelt@google.com>
From: Palmer Dabbelt <palmerdabbelt@google.com>
To: Peter Maydell <peter.maydell@linaro.org>
Precedence: list
Errors-To: 
 qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org
Sender: "Qemu-devel"
 <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>

Series

[PULL,01/38] target/riscv: Convert MIP CSR to target_ulong | expand

Commit Message

Palmer Dabbelt March 3, 2020, 12:48 a.m. UTC

From: Alistair Francis <alistair.francis@wdc.com>

The hret instruction does not exist in the new spec versions, so remove
it from QEMU.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
---
 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

[PULL,24/38] target/riscv: Remove the hret instruction

Commit Message

Patch