RISC-V: Hypervisor prep work part 2
Subsystems (2)
v2 cover RISC-V: Hypervisor prep work part 2
The first three patches are ones that I have pulled out of my original Hypervisor series at an attempt to reduce the number of patches in the series.
These three patches all make sense without the Hypervisor series so can be merged seperatley and will reduce the review burden of the next version of the patches.
The fource patch is a prep patch for the new v0.4 Hypervisor spec.
The final patch is unreleated to Hypervisor that I'm just slipping in here because it seems easier then sending it by itself.
v2:
- Small corrections based on feedback
- Remove the CSR permission check patch
Alistair Francis (4):
target/riscv: Don't set write permissions on dirty PTEs
riscv: plic: Remove unused interrupt functions target/riscv: Create function to test if FP is enabled target/riscv: Update the Hypervisor CSRs to v0.4
Atish Patra (1):
target/riscv: Fix Floating Point register names
hw/riscv/sifive_plic.c | 12 ------------ include/hw/riscv/sifive_plic.h | 3 --- target/riscv/cpu.c | 8 ++++---- target/riscv/cpu.h | 6 +++++- target/riscv/cpu_bits.h | 35 +++++++++++++++++----------------- target/riscv/cpu_helper.c | 16 ++++++++++++---- target/riscv/csr.c | 20 ++++++++++--------- 7 files changed, 50 insertions(+), 50 deletions(-)
Signature · 1 line
2.22.0
PATCH v2 1/5 target/riscv: Don't set write permissions on dirty PTEs
Setting write permission on dirty PTEs results in userspace inside a Hypervisor guest (VU) becoming corrupted. This appears to be because it ends up with write permission in the second stage translation in cases where we aren't doing a store.
--- target/riscv/cpu_helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
target/riscv/cpu_helper.c +2 -4
@@ -340,10 +340,8 @@ restart:if ((pte &PTE_X )) { *prot |=PAGE_EXEC ; } -/* add write permission on stores or if the page is already dirty, -so that we TLB miss on later writes to update the dirty bit */ -if ((pte &PTE_W ) && - (access_type ==MMU_DATA_STORE || (pte &PTE_D ))) { +/* add write permission on stores */ +if ((pte &PTE_W ) && (access_type ==MMU_DATA_STORE )) { *prot |=PAGE_WRITE ; }return TRANSLATE_SUCCESS ;
Signature · 1 line
2.22.0
PATCH v2 2/5 riscv: plic: Remove unused interrupt functions
In reply to Alistair Francis--- hw/riscv/sifive_plic.c | 12 ------------ include/hw/riscv/sifive_plic.h | 3 --- 2 files changed, 15 deletions(-)
hw/riscv/sifive_plic.c +0 -12
@@ -161,18 +161,6 @@ static void sifive_plic_update(SiFivePLICState *plic) } } -void sifive_plic_raise_irq (SiFivePLICState *plic,uint32_t irq) -{ -sifive_plic_set_pending (plic, irq, true); -sifive_plic_update (plic); -} - -void sifive_plic_lower_irq (SiFivePLICState *plic,uint32_t irq) -{ -sifive_plic_set_pending (plic, irq, false); -sifive_plic_update (plic); -} -static uint32_t sifive_plic_claim (SiFivePLICState *plic,uint32_t addrid) {int i, j;
include/hw/riscv/sifive_plic.h +0 -3
@@ -69,9 +69,6 @@ typedef struct SiFivePLICState {uint32_t aperture_size; } SiFivePLICState; -void sifive_plic_raise_irq (SiFivePLICState *plic,uint32_t irq); -void sifive_plic_lower_irq (SiFivePLICState *plic,uint32_t irq); - DeviceState *sifive_plic_create(hwaddr addr, char *hart_config, uint32_t num_sources, uint32_t num_priorities, uint32_t priority_base, uint32_t pending_base,
Signature · 1 line
2.22.0
PATCH v2 3/5 target/riscv: Create function to test if FP is enabled
In reply to Alistair FrancisLet's create a function that tests if floating point support is enabled. We can then protect all floating point operations based on if they are enabled.
This patch so far doesn't change anything, it's just preparing for the Hypervisor support for floating point operations.
--- target/riscv/cpu.h | 6 +++++- target/riscv/cpu_helper.c | 10 ++++++++++ target/riscv/csr.c | 20 +++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-)
target/riscv/cpu.h +5 -1
@@ -255,6 +255,7 @@ void riscv_cpu_do_interrupt(CPUState *cpu);int riscv_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int riscv_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg);bool riscv_cpu_exec_interrupt (CPUState *cs,int interrupt_request); +bool riscv_cpu_fp_enabled (CPURISCVState *env);int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch);hwaddr riscv_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
@@ -298,7 +299,10 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc,#ifdef CONFIG_USER_ONLY *flags =TB_FLAGS_MSTATUS_FS ;#else - *flags =cpu_mmu_index (env,0 ) | (env->mstatus &MSTATUS_FS ); + *flags =cpu_mmu_index (env,0 ); +if (riscv_cpu_fp_enabled (env)) { + *flags |= env->mstatus &MSTATUS_FS ; + }#endif }
target/riscv/cpu_helper.c +10 -0
@@ -71,6 +71,16 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request)#if !defined(CONFIG_USER_ONLY ) +/* Return true is floating point support is currently enabled */ +bool riscv_cpu_fp_enabled (CPURISCVState *env) +{ +if (env->mstatus &MSTATUS_FS ) { +return true; + } + +return false; +} +int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts) {CPURISCVState *env = &cpu->env;
target/riscv/csr.c +11 -9
@@ -46,7 +46,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops)static int fs (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -108,7 +108,7 @@ static int pmp(CPURISCVState *env, int csrno)static int read_fflags (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -119,7 +119,7 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val)static int write_fflags (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -131,7 +131,7 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val)static int read_frm (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -142,7 +142,7 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val)static int write_frm (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -154,7 +154,7 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val)static int read_fcsr (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -166,7 +166,7 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val)static int write_fcsr (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -307,6 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) {target_ulong mstatus = env->mstatus;target_ulong mask =0 ; +int dirty;/* flush tlb on mstatus fields that affect VM */ if (env->priv_ver <=PRIV_VERSION_1_09_1 ) {
@@ -340,8 +341,9 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) mstatus = (mstatus & ~mask) | (val & mask); -int dirty = ((mstatus &MSTATUS_FS ) ==MSTATUS_FS ) | - ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); + dirty = (riscv_cpu_fp_enabled (env) && + ((mstatus &MSTATUS_FS ) ==MSTATUS_FS )) | + ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); mstatus =set_field (mstatus,MSTATUS_SD , dirty); env->mstatus = mstatus;
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH-4.2 v2 3/5] target/riscv: Create function to test if FP is enabled
Quoted 163 lines · Alistair Francis
Let's create a function that tests if floating point support is enabled. We can then protect all floating point operations based on if they are enabled.
This patch so far doesn't change anything, it's just preparing for the Hypervisor support for floating point operations.
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Christophe de Dinechin <[email protected]>--- target/riscv/cpu.h | 6 +++++- target/riscv/cpu_helper.c | 10 ++++++++++ target/riscv/csr.c | 20 +++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-)target/riscv/cpu.h +5
-1@@ -255,6 +255,7 @@ void riscv_cpu_do_interrupt(CPUState *cpu);int riscv_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int riscv_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg);bool riscv_cpu_exec_interrupt (CPUState *cs,int interrupt_request); +bool riscv_cpu_fp_enabled (CPURISCVState *env);int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch);hwaddr riscv_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,@@ -298,7 +299,10 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc, #ifdef CONFIG_USER_ONLY *flags =TB_FLAGS_MSTATUS_FS ;#else - *flags =cpu_mmu_index (env,0 ) | (env->mstatus &MSTATUS_FS ); + *flags =cpu_mmu_index (env,0 ); +if (riscv_cpu_fp_enabled (env)) { + *flags |= env->mstatus &MSTATUS_FS ; + }#endif }target/riscv/cpu_helper.c +10
-0@@ -71,6 +71,16 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request)#if !defined(CONFIG_USER_ONLY ) +/* Return true is floating point support is currently enabled */ +bool riscv_cpu_fp_enabled (CPURISCVState *env) +{ +if (env->mstatus &MSTATUS_FS ) { +return true; + } + +return false; +} +int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts) {CPURISCVState *env = &cpu->env;target/riscv/csr.c +1
-1@@ -46,7 +46,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops)static int fs (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
target/riscv/csr.c +2
-2@@ -108,7 +108,7 @@ static int pmp(CPURISCVState *env, int csrno)static int read_fflags (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif @@ -119,7 +119,7 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val)static int write_fflags (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }env->mstatus |= MSTATUS_FS;target/riscv/csr.c +1
-1@@ -131,7 +131,7 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val)static int read_frm (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
target/riscv/csr.c +1
-1@@ -142,7 +142,7 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val)static int write_frm (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }env->mstatus |= MSTATUS_FS;target/riscv/csr.c +1
-1@@ -154,7 +154,7 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val)static int read_fcsr (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
target/riscv/csr.c +1
-1@@ -166,7 +166,7 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val)static int write_fcsr (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }env->mstatus |= MSTATUS_FS;target/riscv/csr.c +1
-0@@ -307,6 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) {target_ulong mstatus = env->mstatus;target_ulong mask =0 ; +int dirty;/* flush tlb on mstatus fields that affect VM */ if (env->priv_ver <= PRIV_VERSION_1_09_1) {target/riscv/csr.c +3
-3@@ -340,8 +341,9 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) mstatus = (mstatus & ~mask) | (val & mask); -int dirty = ((mstatus &MSTATUS_FS ) ==MSTATUS_FS ) | - ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); + dirty = (riscv_cpu_fp_enabled (env) && + ((mstatus &MSTATUS_FS ) ==MSTATUS_FS )) | + ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); mstatus =set_field (mstatus,MSTATUS_SD , dirty); env->mstatus = mstatus; --2.22.0
Reviewed-by Chih-Min Chao <[email protected]>
PATCH v2 4/5 target/riscv: Update the Hypervisor CSRs to v0.4
In reply to Alistair FrancisUpdate the Hypervisor CSR addresses to match the v0.4 spec.
--- target/riscv/cpu_bits.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
target/riscv/cpu_bits.h +18 -17
@@ -173,6 +173,24 @@#define CSR_SPTBR 0x180#define CSR_SATP 0x180 +/* Hpervisor CSRs */ +#define CSR_HSTATUS 0x600 +#define CSR_HEDELEG 0x602 +#define CSR_HIDELEG 0x603 +#define CSR_HCOUNTERNEN 0x606 +#define CSR_HGATP 0x680 + +#if defined(TARGET_RISCV32 ) +#define HGATP_MODE SATP32_MODE +#define HGATP_VMID SATP32_ASID +#define HGATP_PPN SATP32_PPN +#endif +#if defined(TARGET_RISCV64 ) +#define HGATP_MODE SATP64_MODE +#define HGATP_VMID SATP64_ASID +#define HGATP_PPN SATP64_PPN +#endif +/* Physical Memory Protection */ #define CSR_PMPCFG0 0x3a0#define CSR_PMPCFG1 0x3a1
@@ -206,23 +224,6 @@#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 -/* Hpervisor CSRs */ -#define CSR_HSTATUS 0xa00 -#define CSR_HEDELEG 0xa02 -#define CSR_HIDELEG 0xa03 -#define CSR_HGATP 0xa80 - -#if defined(TARGET_RISCV32 ) -#define HGATP_MODE SATP32_MODE -#define HGATP_ASID SATP32_ASID -#define HGATP_PPN SATP32_PPN -#endif -#if defined(TARGET_RISCV64 ) -#define HGATP_MODE SATP64_MODE -#define HGATP_ASID SATP64_ASID -#define HGATP_PPN SATP64_PPN -#endif -/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03#define CSR_MHPMCOUNTER4 0xb04
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH-4.2 v2 4/5] target/riscv: Update the Hypervisor CSRs to v0.4
Quoted 64 lines · Alistair Francis
Update the Hypervisor CSR addresses to match the v0.4 spec.
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu_bits.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)target/riscv/cpu_bits.h +18
-18@@ -173,6 +173,24 @@#define CSR_SPTBR 0x180#define CSR_SATP 0x180 +/* Hpervisor CSRs */ +#define CSR_HSTATUS 0x600 +#define CSR_HEDELEG 0x602 +#define CSR_HIDELEG 0x603 +#define CSR_HCOUNTERNEN 0x606 +#define CSR_HGATP 0x680 + +#if defined(TARGET_RISCV32 ) +#define HGATP_MODE SATP32_MODE +#define HGATP_VMID SATP32_ASID +#define HGATP_PPN SATP32_PPN +#endif +#if defined(TARGET_RISCV64 ) +#define HGATP_MODE SATP64_MODE +#define HGATP_VMID SATP64_ASID +#define HGATP_PPN SATP64_PPN +#endif +/* Physical Memory Protection */ #define CSR_PMPCFG0 0x3a0#define CSR_PMPCFG1 0x3a1@@ -206,23 +224,6 @@#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 -/* Hpervisor CSRs */ -#define CSR_HSTATUS 0xa00 -#define CSR_HEDELEG 0xa02 -#define CSR_HIDELEG 0xa03 -#define CSR_HGATP 0xa80 - -#if defined(TARGET_RISCV32 ) -#define HGATP_MODE SATP32_MODE -#define HGATP_ASID SATP32_ASID -#define HGATP_PPN SATP32_PPN -#endif -#if defined(TARGET_RISCV64 ) -#define HGATP_MODE SATP64_MODE -#define HGATP_ASID SATP64_ASID -#define HGATP_PPN SATP64_PPN -#endif -/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03#define CSR_MHPMCOUNTER4 0xb04 --2.22.0
Reviewed-by Chih-Min Chao <[email protected]>
PATCH v2 5/5 target/riscv: Fix Floating Point register names
In reply to Alistair FrancisFrom: Atish Patra <[email protected]>
As per the RISC-V spec, Floating Point registers are named as f0..f31 so lets fix the register names accordingly.
--- target/riscv/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
target/riscv/cpu.c +4 -4
@@ -40,10 +40,10 @@ const char * const riscv_int_regnames[] = { };const char *const riscv_fpr_regnames[] = { -"ft0" ,"ft1" ,"ft2" ,"ft3" ,"ft4" ,"ft5" ,"ft6" ,"ft7" , -"fs0" ,"fs1" ,"fa0" ,"fa1" ,"fa2" ,"fa3" ,"fa4" ,"fa5" , -"fa6" ,"fa7" ,"fs2" ,"fs3" ,"fs4" ,"fs5" ,"fs6" ,"fs7" , -"fs8" ,"fs9" ,"fs10" ,"fs11" ,"ft8" ,"ft9" ,"ft10" ,"ft11" +"f0" ,"f1" ,"f2" ,"f3" ,"f4" ,"f5" ,"f6" ,"f7" , +"f8" ,"f9" ,"f10" ,"f11" ,"f12" ,"f13" ,"f14" ,"f15" , +"f16" ,"f17" ,"f18" ,"f19" ,"f20" ,"f21" ,"f22" ,"f23" , +"f24" ,"f25" ,"f26" ,"f27" ,"f28" ,"f29" ,"f30" ,"f31" };const char *const riscv_excp_names[] = {
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH-4.2 v2 5/5] target/riscv: Fix Floating Point register names
Quoted 20 lines · Alistair Francis
From: Atish Patra <[email protected]>
As per the RISC-V spec, Floating Point registers are named as f0..f31 so lets fix the register names accordingly.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)target/riscv/cpu.c +0
-1@@ -40,10 +40,10 @@ const char * const riscv_int_regnames[] = { };const char *const riscv_fpr_regnames[] = { -"ft0" ,"ft1" ,"ft2" ,"ft3" ,"ft4" ,"ft5" ,"ft6" ,"ft7" ,
target/riscv/cpu.c const char * const riscv_int_regnames[] = { · line 49
Quoted 10 lines
target/riscv/cpu.c +4
-3-"fs0" ,"fs1" ,"fa0" ,"fa1" ,"fa2" ,"fa3" ,"fa4" ,"fa5" , -"fa6" ,"fa7" ,"fs2" ,"fs3" ,"fs4" ,"fs5" ,"fs6" ,"fs7" , -"fs8" ,"fs9" ,"fs10" ,"fs11" ,"ft8" ,"ft9" ,"ft10" ,"ft11" +"f0" ,"f1" ,"f2" ,"f3" ,"f4" ,"f5" ,"f6" ,"f7" , +"f8" ,"f9" ,"f10" ,"f11" ,"f12" ,"f13" ,"f14" ,"f15" , +"f16" ,"f17" ,"f18" ,"f19" ,"f20" ,"f21" ,"f22" ,"f23" , +"f24" ,"f25" ,"f26" ,"f27" ,"f28" ,"f29" ,"f30" ,"f31" }; const char * const riscv_excp_names[] = {
I actually don't think this one is right: riscv_int_regnames uses the ABI names, so this should match. I'd be OK switching both of them, but not just one.
I've queued the other four patches.
Re: [Qemu-devel] [PATCH-4.2 v2 5/5] target/riscv: Fix Floating Point register names
Quoted 31 lines · Palmer Dabbelt
Quoted 29 lines · Alistair Francis
From: Atish Patra <[email protected]>
As per the RISC-V spec, Floating Point registers are named as f0..f31 so lets fix the register names accordingly.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)target/riscv/cpu.c +4
-4@@ -40,10 +40,10 @@ const char * const riscv_int_regnames[] = { };const char *const riscv_fpr_regnames[] = { -"ft0" ,"ft1" ,"ft2" ,"ft3" ,"ft4" ,"ft5" ,"ft6" ,"ft7" , -"fs0" ,"fs1" ,"fa0" ,"fa1" ,"fa2" ,"fa3" ,"fa4" ,"fa5" , -"fa6" ,"fa7" ,"fs2" ,"fs3" ,"fs4" ,"fs5" ,"fs6" ,"fs7" , -"fs8" ,"fs9" ,"fs10" ,"fs11" ,"ft8" ,"ft9" ,"ft10" ,"ft11" +"f0" ,"f1" ,"f2" ,"f3" ,"f4" ,"f5" ,"f6" ,"f7" , +"f8" ,"f9" ,"f10" ,"f11" ,"f12" ,"f13" ,"f14" ,"f15" , +"f16" ,"f17" ,"f18" ,"f19" ,"f20" ,"f21" ,"f22" ,"f23" , +"f24" ,"f25" ,"f26" ,"f27" ,"f28" ,"f29" ,"f30" ,"f31" };
Quoted 5 lines
target/riscv/cpu.c const char * const riscv_int_regnames[] = { · line 49
Quoted 1 line
target/riscv/cpu.c +0
-0const char *const riscv_excp_names[] = {I actually don't think this one is right:
riscv_int_regnamesuses the ABI names, so this should match. I'd be OK switching both of them, but not just one.
I like that the int registers use the ABI names though, as I find that useful.
What about we change the registers to use both? As in something like x0/zero for all registers?
The disadvantage is that it's a little longer, but it seems the most useful.
Alistair
Quoted 2 lines
I've queued the other four patches.
Re: [Qemu-devel] [PATCH-4.2 v2 5/5] target/riscv: Fix Floating Point register names
Quoted 38 lines · On Tue, 13 Aug 2019 10:06:58 PDT (-0700), [email protected] wrote:
Quoted 31 lines · Palmer Dabbelt
Quoted 29 lines · Alistair Francis
From: Atish Patra <[email protected]>
As per the RISC-V spec, Floating Point registers are named as f0..f31 so lets fix the register names accordingly.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)target/riscv/cpu.c +4
-4@@ -40,10 +40,10 @@ const char * const riscv_int_regnames[] = { };const char *const riscv_fpr_regnames[] = { -"ft0" ,"ft1" ,"ft2" ,"ft3" ,"ft4" ,"ft5" ,"ft6" ,"ft7" , -"fs0" ,"fs1" ,"fa0" ,"fa1" ,"fa2" ,"fa3" ,"fa4" ,"fa5" , -"fa6" ,"fa7" ,"fs2" ,"fs3" ,"fs4" ,"fs5" ,"fs6" ,"fs7" , -"fs8" ,"fs9" ,"fs10" ,"fs11" ,"ft8" ,"ft9" ,"ft10" ,"ft11" +"f0" ,"f1" ,"f2" ,"f3" ,"f4" ,"f5" ,"f6" ,"f7" , +"f8" ,"f9" ,"f10" ,"f11" ,"f12" ,"f13" ,"f14" ,"f15" , +"f16" ,"f17" ,"f18" ,"f19" ,"f20" ,"f21" ,"f22" ,"f23" , +"f24" ,"f25" ,"f26" ,"f27" ,"f28" ,"f29" ,"f30" ,"f31" };Quoted 5 lines
target/riscv/cpu.c const char * const riscv_int_regnames[] = { · line 49
Quoted 1 line
target/riscv/cpu.c +0
-0const char *const riscv_excp_names[] = {I actually don't think this one is right:
riscv_int_regnamesuses the ABI names, so this should match. I'd be OK switching both of them, but not just one.
Quoted 6 lines
I like that the int registers use the ABI names though, as I find that useful.
What about we change the registers to use both? As in something like x0/zero for all registers?
The disadvantage is that it's a little longer, but it seems the most useful.
I'm fine with that, as long as it doesn't show up in the GDB XML stuff as that will likely cause issues.
Quoted 4 lines
Alistair
Quoted 2 lines
I've queued the other four patches.