RISC-V: Start to remove xlen preprocess
Subsystems (2)
v3 cover RISC-V: Start to remove xlen preprocess
The RISC-V QEMU port currently has lot of preprocessor directives that check if we are targetting a 32-bit or 64-bit CPU. This means that the 64-bit RISC-V target can not run 32-bit CPUs. This is different to most other QEMU architectures and doesn't allow us to mix xlens (such as when running Hypervisors with different xlen guests).
This series is a step toward removing some of those to allow us to use 32-bit CPUs on 64-bit RISC-V targets.
v3:
- Address Richard's comments
v2:
- Rebase on the latest RISC-V tree
Alistair Francis (15):
hw/riscv: Expand the is 32-bit check to support more CPUs target/riscv: Add a TYPE_RISCV_CPU_BASE CPU
riscv: spike: Remove target macro conditionals
riscv: virt: Remove target macro conditionals hw/riscv: boot: Remove compile time XLEN checks hw/riscv: virt: Remove compile time XLEN checks hw/riscv: spike: Remove compile time XLEN checks hw/riscv: sifive_u: Remove compile time XLEN checks target/riscv: fpu_helper: Match function defs in HELPER macros target/riscv: Add a riscv_cpu_is_32bit() helper function target/riscv: Specify the XLEN for CPUs target/riscv: cpu: Remove compile time XLEN checks target/riscv: cpu_helper: Remove compile time XLEN checks target/riscv: csr: Remove compile time XLEN checks target/riscv: cpu: Set XLEN independently from target
include/hw/riscv/boot.h | 8 +- include/hw/riscv/spike.h | 6 -- include/hw/riscv/virt.h | 6 -- target/riscv/cpu.h | 8 ++ target/riscv/cpu_bits.h | 4 +- hw/riscv/boot.c | 67 +++++++++------ hw/riscv/sifive_u.c | 57 ++++++------ hw/riscv/spike.c | 50 ++++++----- hw/riscv/virt.c | 36 ++++---- target/riscv/cpu.c | 84 ++++++++++++------ target/riscv/cpu_helper.c | 12 +-- target/riscv/csr.c | 176 ++++++++++++++++++++------------------ target/riscv/fpu_helper.c | 16 ++-- 13 files changed, 295 insertions(+), 235 deletions(-)
Signature · 1 line
2.29.2
PATCH v3 1/15 hw/riscv: Expand the is 32-bit check to support more CPUs
Currently the riscv_is_32_bit() function only supports the generic rv32 CPUs. Extend the function to support the SiFive and LowRISC CPUs as well.
--- hw/riscv/boot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
hw/riscv/boot.c +11 -1
@@ -41,7 +41,17 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +/* +* To determine if the CPU is 32-bit we need to check a few different CPUs. +* +* If the CPU starts with rv32 +* If the CPU is a sifive 3 seriries CPU (E31, U34) +* If it's the Ibex CPU +*/ +if (!strncmp (machine->cpu_type,"rv32" ,4 ) || + (!strncmp (machine->cpu_type,"sifive" ,6 ) && + machine->cpu_type[8 ] =='3' ) || + !strncmp (machine->cpu_type,"lowrisc-ibex" ,12 )) {return true; }else {return false;
Signature · 1 line
2.29.2
Re: [PATCH v3 01/15] hw/riscv: Expand the is 32-bit check to support more CPUs
Quoted 20 lines · Alistair Francis
Currently the
riscv_is_32_bit()function only supports the generic rv32 CPUs. Extend the function to support the SiFive and LowRISC CPUs as well.Signed-off-by Alistair Francis <[email protected]>--- hw/riscv/boot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)hw/riscv/boot.c +1
-1@@ -41,7 +41,17 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +/*
hw/riscv/boot.c line 54
Quoted 10 lines
hw/riscv/boot.c +10
-0+* To determine if the CPU is 32-bit we need to check a few different CPUs. +* +* If the CPU starts with rv32 +* If the CPU is a sifive 3 seriries CPU (E31, U34) +* If it's the Ibex CPU +*/ +if (!strncmp (machine->cpu_type,"rv32" ,4 ) || + (!strncmp (machine->cpu_type,"sifive" ,6 ) && + machine->cpu_type[8 ] =='3' ) || + !strncmp (machine->cpu_type,"lowrisc-ibex" ,12 )) {
This does not look like a scalable way. With more and more CPU added in the future, this may end up with a huge list of strncmps..
hw/riscv/boot.c line 57
Quoted 3 lines
hw/riscv/boot.c +0
-0return true; }else {return false;
Regards,
Bin
Re: [PATCH v3 01/15] hw/riscv: Expand the is 32-bit check to support more CPUs
Quoted 28 lines · Bin Meng
Quoted 25 lines · Alistair Francis
Currently the
riscv_is_32_bit()function only supports the generic rv32 CPUs. Extend the function to support the SiFive and LowRISC CPUs as well.Signed-off-by Alistair Francis <[email protected]>--- hw/riscv/boot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)hw/riscv/boot.c +6
-1@@ -41,7 +41,17 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +/* +* To determine if the CPU is 32-bit we need to check a few different CPUs. +* +* If the CPU starts with rv32 +* If the CPU is a sifive 3 seriries CPU (E31, U34) +* If it's the Ibex CPU
Quoted 8 lines
hw/riscv/boot.c line 54
Quoted 5 lines
hw/riscv/boot.c +5
-0+*/ +if (!strncmp (machine->cpu_type,"rv32" ,4 ) || + (!strncmp (machine->cpu_type,"sifive" ,6 ) && + machine->cpu_type[8 ] =='3' ) || + !strncmp (machine->cpu_type,"lowrisc-ibex" ,12 )) {This does not look like a scalable way. With more and more CPU added in the future, this may end up with a huge list of strncmps..
Any better ideas?
It should handle all SiFive CPUs, besides that we don't have that many CPUs.
Alistair
Quoted 7 lines
hw/riscv/boot.c line 57
Quoted 4 lines
hw/riscv/boot.c +0
-0return true; }else {return false;Regards,
Bin
Re: [PATCH v3 01/15] hw/riscv: Expand the is 32-bit check to support more CPUs
Quoted 38 lines · Alistair Francis
Quoted 28 lines · Bin Meng
Quoted 25 lines · Alistair Francis
Currently the
riscv_is_32_bit()function only supports the generic rv32 CPUs. Extend the function to support the SiFive and LowRISC CPUs as well.Signed-off-by Alistair Francis <[email protected]>--- hw/riscv/boot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)hw/riscv/boot.c +6
-1@@ -41,7 +41,17 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +/* +* To determine if the CPU is 32-bit we need to check a few different CPUs. +* +* If the CPU starts with rv32 +* If the CPU is a sifive 3 seriries CPU (E31, U34) +* If it's the Ibex CPU Quoted 8 lines
hw/riscv/boot.c line 54
Quoted 5 lines
hw/riscv/boot.c +5
-0+*/ +if (!strncmp (machine->cpu_type,"rv32" ,4 ) || + (!strncmp (machine->cpu_type,"sifive" ,6 ) && + machine->cpu_type[8 ] =='3' ) || + !strncmp (machine->cpu_type,"lowrisc-ibex" ,12 )) {This does not look like a scalable way. With more and more CPU added in the future, this may end up with a huge list of strncmps..
Quoted 1 line
Any better ideas?
It doesn't appear as if you need to query this before you've instantiated the cpu. The first dynamic use that I see is create_fdt, which happens after that point.
Verified like so:
$ gdb --args ./qemu-system-riscv64 -M virt (gdb) b rv64_base_cpu_init Breakpoint 1 at 0x548390: file ../qemu/target/riscv/cpu.c, line 156. (gdb) b riscv_is_32_bit Breakpoint 2 at 0x490dd0: file ../qemu/hw/riscv/boot.c, line 37. (gdb) run ... Thread 1 "qemu-system-ris" hit Breakpoint 1, rv64_base_cpu_init
From the machine, you can find the boot cpu, and use the riscv_cpu_is_32bit helper on that.
Also, just noticed that the two functions spell "32bit" differently. :-)
r~
Re: [PATCH v3 01/15] hw/riscv: Expand the is 32-bit check to support more CPUs
Quoted 57 lines · Richard Henderson
Quoted 38 lines · Alistair Francis
Quoted 28 lines · Bin Meng
Quoted 25 lines · Alistair Francis
Currently the
riscv_is_32_bit()function only supports the generic rv32 CPUs. Extend the function to support the SiFive and LowRISC CPUs as well.Signed-off-by Alistair Francis <[email protected]>--- hw/riscv/boot.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)hw/riscv/boot.c +6
-1@@ -41,7 +41,17 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +/* +* To determine if the CPU is 32-bit we need to check a few different CPUs. +* +* If the CPU starts with rv32 +* If the CPU is a sifive 3 seriries CPU (E31, U34) +* If it's the Ibex CPU Quoted 8 lines
hw/riscv/boot.c line 54
Quoted 5 lines
hw/riscv/boot.c +5
-0+*/ +if (!strncmp (machine->cpu_type,"rv32" ,4 ) || + (!strncmp (machine->cpu_type,"sifive" ,6 ) && + machine->cpu_type[8 ] =='3' ) || + !strncmp (machine->cpu_type,"lowrisc-ibex" ,12 )) {This does not look like a scalable way. With more and more CPU added in the future, this may end up with a huge list of strncmps..
Quoted 1 line
Any better ideas?
It doesn't appear as if you need to query this before you've instantiated the cpu. The first dynamic use that I see is
create_fdt, which happens after that point.Verified like so:
$ gdb --args ./qemu-system-riscv64 -M virt (gdb) b rv64_base_cpu_init Breakpoint 1 at 0x548390: file ../qemu/target/riscv/cpu.c, line 156. (gdb) b riscv_is_32_bit Breakpoint 2 at 0x490dd0: file ../qemu/hw/riscv/boot.c, line 37. (gdb) run ... Thread 1 "qemu-system-ris" hit Breakpoint 1, rv64_base_cpu_init
Quoted 4 lines
Quoted 1 line
From the machine, you can find the boot cpu, and use the
riscv_cpu_is_32bithelper on that.
Also, just noticed that the two functions spell "32bit" differently. :-)
Thanks for the help Richard.
I have added a commit in v4 that changes the function like you mention. The rebased ended up being a little tricky so I added the commit to the end instead.
Alistair
Quoted 3 lines
r~
PATCH v3 2/15 target/riscv: Add a TYPE_RISCV_CPU_BASE CPU
In reply to Alistair Francis--- target/riscv/cpu.h | 6 ++++++ 1 file changed, 6 insertions(+)
target/riscv/cpu.h +6 -0
@@ -44,6 +44,12 @@#define TYPE_RISCV_CPU_SIFIVE_U34 RISCV_CPU_TYPE_NAME("sifive-u34")#define TYPE_RISCV_CPU_SIFIVE_U54 RISCV_CPU_TYPE_NAME("sifive-u54") +#if defined(TARGET_RISCV32 ) +# define TYPE_RISCV_CPU_BASE TYPE_RISCV_CPU_BASE32 +#elif defined(TARGET_RISCV64 ) +# define TYPE_RISCV_CPU_BASE TYPE_RISCV_CPU_BASE64 +#endif +#define RV32 ((target_ulong)1 << (TARGET_LONG_BITS - 2))#define RV64 ((target_ulong)2 << (TARGET_LONG_BITS - 2))
Signature · 1 line
2.29.2
PATCH v3 3/15 riscv: spike: Remove target macro conditionals
In reply to Alistair Francis--- include/hw/riscv/spike.h | 6 ------ hw/riscv/spike.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
include/hw/riscv/spike.h +0 -6
@@ -47,10 +47,4 @@ enum {SPIKE_DRAM }; -#if defined(TARGET_RISCV32 ) -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE32 -#elif defined(TARGET_RISCV64 ) -#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_BASE64 -#endif -#endif
hw/riscv/spike.c +1 -1
@@ -317,7 +317,7 @@ static void spike_machine_class_init(ObjectClass *oc, void *data) mc->init = spike_board_init; mc->max_cpus =SPIKE_CPUS_MAX ; mc->is_default = true; - mc->default_cpu_type =SPIKE_V1_10_0_CPU ; + mc->default_cpu_type =TYPE_RISCV_CPU_BASE ; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id;
Signature · 1 line
2.29.2
PATCH v3 4/15 riscv: virt: Remove target macro conditionals
In reply to Alistair Francis--- include/hw/riscv/virt.h | 6 ------ hw/riscv/virt.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
include/hw/riscv/virt.h +0 -6
@@ -89,10 +89,4 @@ enum {#define FDT_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + 1 + \ FDT_PLIC_ADDR_CELLS + FDT_PLIC_INT_CELLS) -#if defined(TARGET_RISCV32 ) -#define VIRT_CPU TYPE_RISCV_CPU_BASE32 -#elif defined(TARGET_RISCV64 ) -#define VIRT_CPU TYPE_RISCV_CPU_BASE64 -#endif -#endif
hw/riscv/virt.c +1 -1
@@ -706,7 +706,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->desc ="RISC-V VirtIO board" ; mc->init = virt_machine_init; mc->max_cpus =VIRT_CPUS_MAX ; - mc->default_cpu_type =VIRT_CPU ; + mc->default_cpu_type =TYPE_RISCV_CPU_BASE ; mc->pci_allow_0_address = true; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
Signature · 1 line
2.29.2
PATCH v3 5/15 hw/riscv: boot: Remove compile time XLEN checks
In reply to Alistair Francis--- include/hw/riscv/boot.h | 8 +++--- hw/riscv/boot.c | 55 ++++++++++++++++++++++------------------- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 3 ++- hw/riscv/virt.c | 2 +- 5 files changed, 39 insertions(+), 31 deletions(-)
include/hw/riscv/boot.h +5 -3
@@ -41,10 +41,12 @@ target_ulong riscv_load_kernel(const char *kernel_filename,hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start);uint32_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); -void riscv_setup_rom_reset_vec (hwaddr saddr,hwaddr rom_base, -hwaddr rom_size,uint64_t kernel_entry, +void riscv_setup_rom_reset_vec (MachineState *machine,hwaddr saddr, +hwaddr rom_base,hwaddr rom_size, +uint64_t kernel_entry,uint32_t fdt_load_addr,void *fdt); -void riscv_rom_copy_firmware_info (hwaddr rom_base,hwaddr rom_size, +void riscv_rom_copy_firmware_info (MachineState *machine,hwaddr rom_base, +hwaddr rom_size,uint32_t reset_vec_size,uint64_t kernel_entry);
hw/riscv/boot.c +30 -25
99 lines not on this page · raw message
hw/riscv/sifive_u.c +1 -1
@@ -550,7 +550,7 @@ static void sifive_u_machine_init(MachineState *machine)rom_add_blob_fixed_as ("mrom.reset" , reset_vec,sizeof (reset_vec), memmap[SIFIVE_U_DEV_MROM ].base, &address_space_memory); -riscv_rom_copy_firmware_info (memmap[SIFIVE_U_DEV_MROM ].base, +riscv_rom_copy_firmware_info (machine, memmap[SIFIVE_U_DEV_MROM ].base, memmap[SIFIVE_U_DEV_MROM ].size,sizeof (reset_vec), kernel_entry); }
hw/riscv/spike.c +2 -1
@@ -296,7 +296,8 @@ static void spike_board_init(MachineState *machine) fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, s->fdt);/* load the reset vector */ -riscv_setup_rom_reset_vec (memmap[SPIKE_DRAM ].base, memmap[SPIKE_MROM ].base, +riscv_setup_rom_reset_vec (machine, memmap[SPIKE_DRAM ].base, + memmap[SPIKE_MROM ].base, memmap[SPIKE_MROM ].size, kernel_entry, fdt_load_addr, s->fdt);
hw/riscv/virt.c +1 -1
@@ -656,7 +656,7 @@ static void virt_machine_init(MachineState *machine) fdt_load_addr =riscv_load_fdt (memmap[VIRT_DRAM ].base, machine->ram_size, s->fdt);/* load the reset vector */ -riscv_setup_rom_reset_vec (start_addr, virt_memmap[VIRT_MROM ].base, +riscv_setup_rom_reset_vec (machine, start_addr, virt_memmap[VIRT_MROM ].base, virt_memmap[VIRT_MROM ].size, kernel_entry, fdt_load_addr, s->fdt);
Signature · 1 line
2.29.2
PATCH v3 6/15 hw/riscv: virt: Remove compile time XLEN checks
In reply to Alistair Francis--- hw/riscv/virt.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
hw/riscv/virt.c +17 -15
@@ -43,12 +43,6 @@#include "hw/pci/pci.h" #include "hw/pci-host/gpex.h" -#if defined(TARGET_RISCV32 ) -# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" -#else -# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" -#endif - static const struct MemmapEntry { hwaddr base; hwaddr size;
@@ -177,7 +171,7 @@ static void create_pcie_irq_map(void *fdt, char *nodename, }static void create_fdt (RISCVVirtState *s,const struct MemmapEntry *memmap, -uint64_t mem_size,const char *cmdline) +uint64_t mem_size,const char *cmdline,bool is_32_bit) {void *fdt;int i, cpu, socket;
@@ -242,11 +236,11 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, cpu_name =g_strdup_printf ("/cpus/cpu@%d" , s->soc[socket].hartid_base + cpu);qemu_fdt_add_subnode (fdt, cpu_name); -#if defined(TARGET_RISCV32 ) -qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv32" ); -#else -qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); -#endif +if (is_32_bit) { +qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv32" ); + }else { +qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); + } name =riscv_isa_string (&s->soc[socket].harts[cpu]);qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name);g_free (name);
@@ -608,7 +602,8 @@ static void virt_machine_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32_bit (machine));/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv_virt_board.mrom",
@@ -616,8 +611,15 @@ static void virt_machine_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[VIRT_MROM ].base, mask_rom); - firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , - start_addr,NULL ); +if (riscv_is_32_bit (machine)) { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv32-generic-fw_dynamic.bin" , + start_addr,NULL ); + }else { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv64-generic-fw_dynamic.bin" , + start_addr,NULL ); + }if (machine->kernel_filename) { kernel_start_addr = riscv_calc_kernel_start_addr(machine,
Signature · 1 line
2.29.2
PATCH v3 7/15 hw/riscv: spike: Remove compile time XLEN checks
In reply to Alistair Francis--- hw/riscv/spike.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-)
hw/riscv/spike.c +24 -21
@@ -43,17 +43,6 @@#include "sysemu/qtest.h" #include "sysemu/sysemu.h" -/* -* Not like other RISC-V machines that use plain binary bios images, -* keeping ELF files here was intentional because BIN files don't work -* for the Spike machine as HTIF emulation depends on ELF parsing. -*/ -#if defined(TARGET_RISCV32 ) -# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.elf" -#else -# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.elf" -#endif - static const struct MemmapEntry { hwaddr base; hwaddr size;
@@ -64,7 +53,7 @@ static const struct MemmapEntry { };static void create_fdt (SpikeState *s,const struct MemmapEntry *memmap, -uint64_t mem_size,const char *cmdline) +uint64_t mem_size,const char *cmdline,bool is_32_bit) {void *fdt;uint64_t addr, size;
@@ -115,11 +104,11 @@ static void create_fdt(SpikeState *s, const struct MemmapEntry *memmap, cpu_name =g_strdup_printf ("/cpus/cpu@%d" , s->soc[socket].hartid_base + cpu);qemu_fdt_add_subnode (fdt, cpu_name); -#if defined(TARGET_RISCV32 ) -qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv32" ); -#else -qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); -#endif +if (is_32_bit) { +qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv32" ); + }else { +qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); + } name =riscv_isa_string (&s->soc[socket].harts[cpu]);qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name);g_free (name);
@@ -254,7 +243,8 @@ static void spike_board_init(MachineState *machine) main_mem);/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32_bit (machine));/* boot rom */ memory_region_init_rom(mask_rom, NULL, "riscv.spike.mrom",
@@ -262,9 +252,22 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_MROM ].base, mask_rom); - firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , - memmap[SPIKE_DRAM ].base, - htif_symbol_callback); +/* +* Not like other RISC-V machines that use plain binary bios images, +* keeping ELF files here was intentional because BIN files don't work +* for the Spike machine as HTIF emulation depends on ELF parsing. +*/ +if (riscv_is_32_bit (machine)) { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv32-generic-fw_dynamic.elf" , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback); + }else { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv64-generic-fw_dynamic.elf" , + memmap[SPIKE_DRAM ].base, + htif_symbol_callback); + }if (machine->kernel_filename) { kernel_start_addr = riscv_calc_kernel_start_addr(machine,
Signature · 1 line
2.29.2
PATCH v3 8/15 hw/riscv: sifive_u: Remove compile time XLEN checks
In reply to Alistair Francis--- hw/riscv/sifive_u.c | 55 ++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-)
hw/riscv/sifive_u.c +30 -25
@@ -60,12 +60,6 @@#include <libfdt.h> -#if defined(TARGET_RISCV32 ) -# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" -#else -# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" -#endif - static const struct MemmapEntry { hwaddr base; hwaddr size;
@@ -93,7 +87,7 @@ static const struct MemmapEntry {#define GEM_REVISION 0x10070109static void create_fdt (SiFiveUState *s,const struct MemmapEntry *memmap, -uint64_t mem_size,const char *cmdline) +uint64_t mem_size,const char *cmdline,bool is_32_bit) {MachineState *ms =MACHINE (qdev_get_machine ());void *fdt;
@@ -178,11 +172,11 @@ static void create_fdt(SiFiveUState *s, const struct MemmapEntry *memmap,qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) { -#if defined(TARGET_RISCV32 ) -qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); -#else -qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); -#endif +if (is_32_bit) { +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv32" ); + }else { +qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); + } isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); }else { isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]);
@@ -458,7 +452,8 @@ static void sifive_u_machine_init(MachineState *machine) qemu_allocate_irq(sifive_u_machine_reset, NULL, 0));/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline); +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32_bit (machine));if (s->start_in_flash) {/*
@@ -487,8 +482,15 @@ static void sifive_u_machine_init(MachineState *machine)break ; } - firmware_end_addr =riscv_find_and_load_firmware (machine,BIOS_FILENAME , - start_addr,NULL ); +if (riscv_is_32_bit (machine)) { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv32-generic-fw_dynamic.bin" , + start_addr,NULL ); + }else { + firmware_end_addr =riscv_find_and_load_firmware (machine, +"opensbi-riscv64-generic-fw_dynamic.bin" , + start_addr,NULL ); + }if (machine->kernel_filename) { kernel_start_addr = riscv_calc_kernel_start_addr(machine,
@@ -518,9 +520,9 @@ static void sifive_u_machine_init(MachineState *machine)/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SIFIVE_U_DEV_DRAM ].base, machine->ram_size, s->fdt); -#if defined(TARGET_RISCV64 ) - start_addr_hi32 = start_addr >>32 ; -#endif +if (!riscv_is_32_bit (machine)) { + start_addr_hi32 = (uint64_t )start_addr >>32 ; + }/* reset vector */ uint32_t reset_vec[11 ] = {
@@ -528,13 +530,8 @@ static void sifive_u_machine_init(MachineState *machine)0x00000297 ,/* 1: auipc t0, %pcrel_hi(fw_dyn) */ 0x02828613 ,/* addi a2, t0, %pcrel_lo(1b) */ 0xf1402573 ,/* csrr a0, mhartid */ -#if defined(TARGET_RISCV32 ) - 0x0202a583, /* lw a1, 32(t0) */ - 0x0182a283, /* lw t0, 24(t0) */ -#elif defined(TARGET_RISCV64 ) -0x0202b583 ,/* ld a1, 32(t0) */ -0x0182b283 ,/* ld t0, 24(t0) */ -#endif +0 , +0 ,0x00028067 ,/* jr t0 */ start_addr,/* start: .dword */ start_addr_hi32,
@@ -542,6 +539,14 @@ static void sifive_u_machine_init(MachineState *machine) 0x00000000,/* fw_dyn: */ }; +if (riscv_is_32_bit (machine)) { + reset_vec[4 ] =0x0202a583 ;/* lw a1, 32(t0) */ + reset_vec[5 ] =0x0182a283 ;/* lw t0, 24(t0) */ + }else { + reset_vec[4 ] =0x0202b583 ;/* ld a1, 32(t0) */ + reset_vec[5 ] =0x0182b283 ;/* ld t0, 24(t0) */ + } +/* copy in the reset vector in little_endian byte order */ for (i =0 ; i <ARRAY_SIZE (reset_vec); i++) {
Signature · 1 line
2.29.2
PATCH v3 9/15 target/riscv: fpu_helper: Match function defs in HELPER macros
In reply to Alistair FrancisThe helper functions defined in helper.h specify that the argument is of type target_long. Let's change the implementation to match the header definition.
--- target/riscv/fpu_helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
target/riscv/fpu_helper.c +8 -8
@@ -224,13 +224,13 @@ target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_int64 (frs1, &env->fp_status); } -uint64_t helper_fcvt_lu_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_lu_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_uint64 (frs1, &env->fp_status);
@@ -248,12 +248,12 @@ uint64_t helper_fcvt_s_wu(CPURISCVState *env, target_ulong rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_s_l (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_s_l (CPURISCVState *env,target_ulong rs1) {return nanbox_s (int64_to_float32 (rs1, &env->fp_status)); } -uint64_t helper_fcvt_s_lu (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_s_lu (CPURISCVState *env,target_ulong rs1) {return nanbox_s (uint64_to_float32 (rs1, &env->fp_status)); }
@@ -337,12 +337,12 @@ target_ulong helper_fcvt_wu_d(CPURISCVState *env, uint64_t frs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_l_d (CPURISCVState *env,uint64_t frs1) +target_ulong helper_fcvt_l_d (CPURISCVState *env,uint64_t frs1) {return float64_to_int64 (frs1, &env->fp_status); } -uint64_t helper_fcvt_lu_d (CPURISCVState *env,uint64_t frs1) +target_ulong helper_fcvt_lu_d (CPURISCVState *env,uint64_t frs1) {return float64_to_uint64 (frs1, &env->fp_status); }
@@ -359,12 +359,12 @@ uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_d_l (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_d_l (CPURISCVState *env,target_ulong rs1) {return int64_to_float64 (rs1, &env->fp_status); } -uint64_t helper_fcvt_d_lu (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_d_lu (CPURISCVState *env,target_ulong rs1) {return uint64_to_float64 (rs1, &env->fp_status); }
Signature · 1 line
2.29.2
Re: [PATCH v3 09/15] target/riscv: fpu_helper: Match function defs in HELPER macros
Hi Alistair,
Quoted 2 lines · Alistair Francis
The helper functions defined in
helper.hspecify that the argument is of
I can't find the helper.h that declare these functions?
Quoted 13 lines
type
target_long. Let's change the implementation to match the header definition.Signed-off-by Alistair Francis <[email protected]>--- target/riscv/fpu_helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)target/riscv/fpu_helper.c +0
-0
target/riscv/fpu_helper.c target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) · line 230
Quoted 8 lines
target/riscv/fpu_helper.c +1
-1@@ -224,13 +224,13 @@ target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_int64 (frs1, &env->fp_status);
float32_to_int64() returns int64_t, so there is a truncation if changing it to target_ulong for 32-bit.
Quoted 42 lines
target/riscv/fpu_helper.c +5
-6} -uint64_t helper_fcvt_lu_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_lu_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_uint64 (frs1, &env->fp_status);@@ -248,12 +248,12 @@ uint64_t helper_fcvt_s_wu(CPURISCVState *env, target_ulong rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_s_l (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_s_l (CPURISCVState *env,target_ulong rs1) {return nanbox_s (int64_to_float32 (rs1, &env->fp_status)); } -uint64_t helper_fcvt_s_lu (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_s_lu (CPURISCVState *env,target_ulong rs1) {return nanbox_s (uint64_to_float32 (rs1, &env->fp_status)); }@@ -337,12 +337,12 @@ target_ulong helper_fcvt_wu_d(CPURISCVState *env, uint64_t frs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_l_d (CPURISCVState *env,uint64_t frs1) +target_ulong helper_fcvt_l_d (CPURISCVState *env,uint64_t frs1) {return float64_to_int64 (frs1, &env->fp_status); } -uint64_t helper_fcvt_lu_d (CPURISCVState *env,uint64_t frs1) +target_ulong helper_fcvt_lu_d (CPURISCVState *env,uint64_t frs1) {return float64_to_uint64 (frs1, &env->fp_status); }@@ -359,12 +359,12 @@ uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1) }#if defined(TARGET_RISCV64 ) -uint64_t helper_fcvt_d_l (CPURISCVState *env,uint64_t rs1)
target/riscv/fpu_helper.c uint64_t helper_fcvt_d_wu(CPURISCVState *env, target_ulong rs1) · line 370
Quoted 10 lines
target/riscv/fpu_helper.c +2
-1+uint64_t helper_fcvt_d_l (CPURISCVState *env,target_ulong rs1) {return int64_to_float64 (rs1, &env->fp_status); } -uint64_t helper_fcvt_d_lu (CPURISCVState *env,uint64_t rs1) +uint64_t helper_fcvt_d_lu (CPURISCVState *env,target_ulong rs1) {return uint64_to_float64 (rs1, &env->fp_status); }
Regards,
Bin
Re: [PATCH v3 09/15] target/riscv: fpu_helper: Match function defs in HELPER macros
Quoted 9 lines · Bin Meng
target/riscv/fpu_helper.c target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) · line 230
Quoted 6 lines
#if
defined(TARGET_RISCV64)target/riscv/fpu_helper.c +1
-1-uint64_t helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_int64 (frs1, &env->fp_status);
float32_to_int64()returnsint64_t, so there is a truncation if changing it totarget_ulongfor 32-bit.
There's not, because this function isn't defined for 32-bit (see first quoted line). But this point of confusion is exactly what I pointed out vs the previous revision.
r~
Re: [PATCH v3 09/15] target/riscv: fpu_helper: Match function defs in HELPER macros
Quoted 12 lines · Richard Henderson
Quoted 9 lines · Bin Meng
target/riscv/fpu_helper.c target_ulong helper_fcvt_wu_s(CPURISCVState *env, uint64_t rs1) · line 230
Quoted 6 lines
#if
defined(TARGET_RISCV64)target/riscv/fpu_helper.c +1
-1-uint64_t helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) +target_ulong helper_fcvt_l_s (CPURISCVState *env,uint64_t rs1) {float32 frs1 =check_nanbox_s (rs1);return float32_to_int64 (frs1, &env->fp_status);
float32_to_int64()returnsint64_t, so there is a truncation if changing it totarget_ulongfor 32-bit.
Quoted 3 lines
There's not, because this function isn't defined for 32-bit (see first quoted line). But this point of confusion is exactly what I pointed out vs the previous revision.
Ok, I have swapped this to changing helper.h now.
Alistair
Quoted 3 lines
r~
PATCH v3 10/15 target/riscv: Add a riscv_cpu_is_32bit() helper function
In reply to Alistair Francis--- target/riscv/cpu.h | 2 ++ target/riscv/cpu.c | 9 +++++++++ 2 files changed, 11 insertions(+)
target/riscv/cpu.h +2 -0
@@ -384,6 +384,8 @@ FIELD(TB_FLAGS, VILL, 8, 1)/* Is a Hypervisor instruction load/store allowed? */ FIELD(TB_FLAGS, HLSX, 9, 1) +bool riscv_cpu_is_32bit (CPURISCVState *env); +/* * A simplification for VLMAX * = (1 << LMUL) * VLEN / (8 * (1 << SEW))
target/riscv/cpu.c +9 -0
@@ -108,6 +108,15 @@ const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) } } +bool riscv_cpu_is_32bit (CPURISCVState *env) +{ +if (env->misa &RV64 ) { +return false; + } + +return true; +} +static void set_misa (CPURISCVState *env,target_ulong misa) { env->misa_mask = env->misa = misa;
Signature · 1 line
2.29.2
PATCH v3 11/15 target/riscv: Specify the XLEN for CPUs
In reply to Alistair Francis--- target/riscv/cpu.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-)
target/riscv/cpu.c +23 -10
@@ -158,22 +158,36 @@ static void riscv_base_cpu_init(Object *obj)set_misa (env,0 ); } -static void rvxx_sifive_u_cpu_init (Object *obj) +#ifdef TARGET_RISCV64 +static void rv64_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RVXLEN |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +set_misa (env,RV64 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 ); } -static void rvxx_sifive_e_cpu_init (Object *obj) +static void rv64_sifive_e_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env; -set_misa (env,RVXLEN |RVI |RVM |RVA |RVC |RVU ); +set_misa (env,RV64 |RVI |RVM |RVA |RVC |RVU );set_priv_version (env,PRIV_VERSION_1_10_0 );qdev_prop_set_bit (DEVICE (obj),"mmu" , false); } +#else +static void rv32_sifive_u_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +set_misa (env,RV32 |RVI |RVM |RVA |RVF |RVD |RVC |RVS |RVU ); +set_priv_version (env,PRIV_VERSION_1_10_0 ); +} -#if defined(TARGET_RISCV32 ) +static void rv32_sifive_e_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +set_misa (env,RV32 |RVI |RVM |RVA |RVC |RVU ); +set_priv_version (env,PRIV_VERSION_1_10_0 ); +qdev_prop_set_bit (DEVICE (obj),"mmu" , false); +}static void rv32_ibex_cpu_init (Object *obj) {
@@ -191,7 +205,6 @@ static void rv32_imafcu_nommu_cpu_init(Object *obj)set_resetvec (env,DEFAULT_RSTVEC ); qdev_prop_set_bit(DEVICE(obj), "mmu", false); } -#endif static ObjectClass *riscv_cpu_class_by_name (const char *cpu_model)
@@ -643,13 +656,13 @@ static const TypeInfo riscv_cpu_type_infos[] = {#if defined(TARGET_RISCV32 ) DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rvxx_sifive_e_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32_sifive_u_cpu_init), #elif defined(TARGET_RISCV64) DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rvxx_sifive_e_cpu_init), - DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rvxx_sifive_u_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64_sifive_e_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64_sifive_u_cpu_init),#endif };
Signature · 1 line
2.29.2
PATCH v3 12/15 target/riscv: cpu: Remove compile time XLEN checks
In reply to Alistair Francis--- target/riscv/cpu.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
target/riscv/cpu.c +10 -9
@@ -240,10 +240,10 @@ static void riscv_cpu_dump_state(CPUState *cs, FILE *f, int flags)#ifndef CONFIG_USER_ONLY qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mhartid " , env->mhartid);qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatus " , (target_ulong )env->mstatus); -#ifdef TARGET_RISCV32 -qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , - (target_ulong)(env->mstatus >>32 )); -#endif +if (riscv_cpu_is_32bit (env)) { +qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"mstatush " , + (target_ulong)(env->mstatus >>32 )); + }if (riscv_has_ext (env,RVH )) {qemu_fprintf (f," %s " TARGET_FMT_lx"\n" ,"hstatus " , env->hstatus); qemu_fprintf(f, " %s " TARGET_FMT_lx "\n", "vsstatus ",
@@ -356,11 +356,12 @@ static void riscv_cpu_reset(DeviceState *dev)static void riscv_cpu_disas_set_info (CPUState *s,disassemble_info *info) { -#if defined(TARGET_RISCV32 ) - info->print_insn = print_insn_riscv32; -#elif defined(TARGET_RISCV64 ) - info->print_insn = print_insn_riscv64; -#endif +RISCVCPU *cpu =RISCV_CPU (s); +if (riscv_cpu_is_32bit (&cpu->env)) { + info->print_insn = print_insn_riscv32; + }else { + info->print_insn = print_insn_riscv64; + } }static void riscv_cpu_realize (DeviceState *dev,Error **errp)
Signature · 1 line
2.29.2
PATCH v3 13/15 target/riscv: cpu_helper: Remove compile time XLEN checks
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
target/riscv/cpu_helper.c +7 -5
@@ -446,11 +446,13 @@ restart:return TRANSLATE_PMP_FAIL ; } -#if defined(TARGET_RISCV32 ) -target_ulong pte =address_space_ldl (cs->as, pte_addr, attrs, &res); -#elif defined(TARGET_RISCV64 ) -target_ulong pte =address_space_ldq (cs->as, pte_addr, attrs, &res); -#endif +target_ulong pte; +if (riscv_cpu_is_32bit (env)) { + pte =address_space_ldl (cs->as, pte_addr, attrs, &res); + }else { + pte =address_space_ldq (cs->as, pte_addr, attrs, &res); + } +if (res !=MEMTX_OK ) {return TRANSLATE_FAIL ; }
Signature · 1 line
2.29.2
PATCH v3 14/15 target/riscv: csr: Remove compile time XLEN checks
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 4 +- target/riscv/csr.c | 176 +++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 88 deletions(-)
target/riscv/cpu_bits.h +1 -3
@@ -437,9 +437,7 @@#define HSTATUS_VGEIN 0x0003F000#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 -#if defined(TARGET_RISCV64 ) -#define HSTATUS_VSXL 0x300000000 -#endif +#define HSTATUS_VSXL 0x300000000#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/csr.c +91 -85
342 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH v3 14/15] target/riscv: csr: Remove compile time XLEN checks
Quoted 324 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu_bits.h | 4 +- target/riscv/csr.c | 176 +++++++++++++++++++++------------------- 2 files changed, 92 insertions(+), 88 deletions(-)target/riscv/cpu_bits.h +1
-3@@ -437,9 +437,7 @@#define HSTATUS_VGEIN 0x0003F000#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 -#if defined(TARGET_RISCV64 ) -#define HSTATUS_VSXL 0x300000000 -#endif +#define HSTATUS_VSXL 0x300000000#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULLtarget/riscv/csr.c +82
-64@@ -102,44 +102,65 @@ static int ctr(CPURISCVState *env, int csrno) return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT; }break ; -#if defined(TARGET_RISCV32 ) -case CSR_CYCLEH : -if (!get_field (env->hcounteren,HCOUNTEREN_CY ) && -get_field (env->mcounteren,HCOUNTEREN_CY )) { -return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_TIMEH : -if (!get_field (env->hcounteren,HCOUNTEREN_TM ) && -get_field (env->mcounteren,HCOUNTEREN_TM )) { -return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; -case CSR_INSTRETH : -if (!get_field (env->hcounteren,HCOUNTEREN_IR ) && -get_field (env->mcounteren,HCOUNTEREN_IR )) { -return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; - } -break ; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: -if (!get_field (env->hcounteren,1 << (csrno -CSR_HPMCOUNTER3H )) && -get_field (env->mcounteren,1 << (csrno -CSR_HPMCOUNTER3H ))) { -return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + } +if (riscv_cpu_is_32bit (env)) { +switch (csrno) { +case CSR_CYCLEH : +if (!get_field (env->hcounteren,HCOUNTEREN_CY ) && +get_field (env->mcounteren,HCOUNTEREN_CY )) { +return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + } +break ; +case CSR_TIMEH : +if (!get_field (env->hcounteren,HCOUNTEREN_TM ) && +get_field (env->mcounteren,HCOUNTEREN_TM )) { +return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + } +break ; +case CSR_INSTRETH : +if (!get_field (env->hcounteren,HCOUNTEREN_IR ) && +get_field (env->mcounteren,HCOUNTEREN_IR )) { +return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + } +break ; + case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: +if (!get_field (env->hcounteren,1 << (csrno -CSR_HPMCOUNTER3H )) && +get_field (env->mcounteren,1 << (csrno -CSR_HPMCOUNTER3H ))) { +return -RISCV_EXCP_VIRT_INSTRUCTION_FAULT ; + } +break ; } -break ; -#endif } }#endif return 0 ; } +static int ctr32 (CPURISCVState *env,int csrno) +{ +if (!riscv_cpu_is_32bit (env)) { +return -RISCV_EXCP_ILLEGAL_INST ; + } + +return ctr (env, csrno); +} +#if !defined(CONFIG_USER_ONLY )static int any (CPURISCVState *env,int csrno) {return 0 ; } +static int any32 (CPURISCVState *env,int csrno) +{ +if (!riscv_cpu_is_32bit (env)) { +return -RISCV_EXCP_ILLEGAL_INST ; + } + +return any (env, csrno); + +} +static int smode (CPURISCVState *env,int csrno) {return -!riscv_has_ext (env,RVS );@@ -161,6 +182,16 @@ static int hmode(CPURISCVState *env, int csrno)return -RISCV_EXCP_ILLEGAL_INST ; } +static int hmode32 (CPURISCVState *env,int csrno) +{ +if (!riscv_cpu_is_32bit (env)) { +return 0 ; + } + +return hmode (env, csrno); + +} +static int pmp (CPURISCVState *env,int csrno) {return -!riscv_feature (env,RISCV_FEATURE_PMP );@@ -310,7 +341,6 @@ static int read_instret(CPURISCVState *env, int csrno, target_ulong *val)return 0 ; } -#if defined(TARGET_RISCV32 )static int read_instreth (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY )@@ -324,7 +354,6 @@ static int read_instreth(CPURISCVState *env, int csrno, target_ulong *val)#endif return 0 ; } -#endif /* TARGET_RISCV32 */ #if defined(CONFIG_USER_ONLY )static int read_time (CPURISCVState *env,int csrno,target_ulong *val)@@ -333,13 +362,11 @@ static int read_time(CPURISCVState *env, int csrno, target_ulong *val) return 0; } -#if defined(TARGET_RISCV32 )static int read_timeh (CPURISCVState *env,int csrno,target_ulong *val) { *val =cpu_get_host_ticks () >>32 ;return 0 ; } -#endif #else /* CONFIG_USER_ONLY */ @@ -355,7 +382,6 @@ static int read_time(CPURISCVState *env, int csrno, target_ulong *val)return 0 ; } -#if defined(TARGET_RISCV32 )static int read_timeh (CPURISCVState *env,int csrno,target_ulong *val) {uint64_t delta =riscv_cpu_virt_enabled (env) ? env->htimedelta :0 ;@@ -367,7 +393,6 @@ static int read_timeh(CPURISCVState *env, int csrno, target_ulong *val) *val = (env->rdtime_fn (env->rdtime_fn_arg) + delta) >>32 ;return 0 ; } -#endif /* Machine constants */ @@ -406,19 +431,17 @@ static const target_ulong sip_writable_mask = SIP_SSIP | MIP_USIP | MIP_UEIP;static const target_ulong hip_writable_mask =MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ;static const target_ulong vsip_writable_mask =MIP_VSSIP ; -#if defined(TARGET_RISCV32 ) -static const char valid_vm_1_10[16 ] = { +static const char valid_vm_1_10_32[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV32 ] =1 }; -#elif defined(TARGET_RISCV64 ) -static const char valid_vm_1_10[16 ] = { + +static const char valid_vm_1_10_64[16 ] = { [VM_1_10_MBARE ] =1 , [VM_1_10_SV39 ] =1 , [VM_1_10_SV48 ] =1 , [VM_1_10_SV57 ] =1 }; -#endif /* CONFIG_USER_ONLY */ /* Machine Information Registers */ static int read_zero (CPURISCVState *env,int csrno,target_ulong *val)@@ -441,7 +464,11 @@ static int read_mstatus(CPURISCVState *env, int csrno, target_ulong *val)static int validate_vm (CPURISCVState *env,target_ulong vm) { -return valid_vm_1_10[vm &0xf ]; +if (riscv_cpu_is_32bit (env)) { +return valid_vm_1_10_32[vm &0xf ]; + }else { +return valid_vm_1_10_64[vm &0xf ]; + } }static int write_mstatus (CPURISCVState *env,int csrno,target_ulong val)@@ -459,13 +486,14 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)MSTATUS_SPP |MSTATUS_FS |MSTATUS_MPRV |MSTATUS_SUM |MSTATUS_MPP |MSTATUS_MXR |MSTATUS_TVM |MSTATUS_TSR |MSTATUS_TW ; -#if defined(TARGET_RISCV64 ) -/* -* RV32: MPV and GVA are not in mstatus. The current plan is to -* add them to mstatush. For now, we just don't support it. -*/ - mask |=MSTATUS_MPV |MSTATUS_GVA ; -#endif + +if (!riscv_cpu_is_32bit (env)) { +/* +* RV32: MPV and GVA are not in mstatus. The current plan is to +* add them to mstatush. For now, we just don't support it. +*/ + mask |=MSTATUS_MPV |MSTATUS_GVA ; + } mstatus = (mstatus & ~mask) | (val & mask);@@ -477,7 +505,6 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)return 0 ; } -#ifdef TARGET_RISCV32 static int read_mstatush (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->mstatus >>32 ;@@ -497,7 +524,6 @@ static int write_mstatush(CPURISCVState *env, int csrno, target_ulong val)return 0 ; } -#endif static int read_misa (CPURISCVState *env,int csrno,target_ulong *val) {@@ -895,10 +921,10 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)static int read_hstatus (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->hstatus; -#ifdef TARGET_RISCV64 -/* We only support 64-bit VSXL */ - *val =set_field (*val,HSTATUS_VSXL ,2 ); -#endif +if (!riscv_cpu_is_32bit (env)) { +/* We only support 64-bit VSXL */ + *val =set_field (*val,HSTATUS_VSXL ,2 ); + }/* We only support little endian */ *val =set_field (*val,HSTATUS_VSBE ,0 );return 0 ;@@ -907,11 +933,9 @@ static int read_hstatus(CPURISCVState *env, int csrno, target_ulong *val)static int write_hstatus (CPURISCVState *env,int csrno,target_ulong val) { env->hstatus = val; -#ifdef TARGET_RISCV64 -if (get_field (val,HSTATUS_VSXL ) !=2 ) { +if (!riscv_cpu_is_32bit (env) &&get_field (val,HSTATUS_VSXL ) !=2 ) {qemu_log_mask (LOG_UNIMP ,"QEMU does not support mixed HSXLEN options." ); } -#endif if (get_field (val,HSTATUS_VSBE ) !=0 ) {qemu_log_mask (LOG_UNIMP ,"QEMU does not support big endian guests." ); }@@ -1053,11 +1077,7 @@ static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val)return -RISCV_EXCP_ILLEGAL_INST ; } -#if defined(TARGET_RISCV32 ) - *val = env->htimedelta &0xffffffff ; -#else *val = env->htimedelta; -#endif return 0 ; }@@ -1067,15 +1087,14 @@ static int write_htimedelta(CPURISCVState *env, int csrno, target_ulong val)return -RISCV_EXCP_ILLEGAL_INST ; } -#if defined(TARGET_RISCV32 ) - env->htimedelta =deposit64 (env->htimedelta,0 ,32 , (uint64_t )val); -#else - env->htimedelta = val; -#endif +if (riscv_cpu_is_32bit (env)) { + env->htimedelta =deposit64 (env->htimedelta,0 ,32 , (uint64_t )val); + }else { + env->htimedelta = val; + }return 0 ; } -#if defined(TARGET_RISCV32 )static int read_htimedeltah (CPURISCVState *env,int csrno,target_ulong *val) {if (!env->rdtime_fn) {@@ -1095,7 +1114,6 @@ static int write_htimedeltah(CPURISCVState *env, int csrno, target_ulong val) env->htimedelta =deposit64 (env->htimedelta,32 ,32 , (uint64_t )val);return 0 ; } -#endif /* Virtual CSR Registers */ static int read_vsstatus (CPURISCVState *env,int csrno,target_ulong *val)
target/riscv/csr.c static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 1396
Quoted 9 lines
target/riscv/csr.c +2
-4@@ -1374,26 +1392,20 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { /* User Timers and Counters */ [CSR_CYCLE] = { ctr, read_instret }, [CSR_INSTRET] = { ctr, read_instret }, -#if defined(TARGET_RISCV32) - [CSR_CYCLEH] = { ctr, read_instreth }, - [CSR_INSTRETH] = { ctr, read_instreth }, -#endif + [CSR_CYCLEH] = { ctr32, read_instreth }, + [CSR_INSTRETH] = { ctr32, read_instreth },
nits: please keep all the right } aligned
Quoted 46 lines
target/riscv/csr.c +5
-13/* In privileged mode, the monitor will have to emulate TIME CSRs only if * rdtime callback is not provided by machine/platform emulation */ [CSR_TIME] = { ctr, read_time }, -#if defined(TARGET_RISCV32) - [CSR_TIMEH ] = { ctr, read_timeh }, -#endif + [CSR_TIMEH ] = { ctr32, read_timeh }, #if !defined(CONFIG_USER_ONLY)/* Machine Timers and Counters */ [CSR_MCYCLE] = { any, read_instret }, [CSR_MINSTRET] = { any, read_instret }, -#if defined(TARGET_RISCV32) - [CSR_MCYCLEH] = { any, read_instreth }, - [CSR_MINSTRETH ] = { any, read_instreth }, -#endif + [CSR_MCYCLEH] = { any32, read_instreth }, + [CSR_MINSTRETH ] = { any32, read_instreth }, /* Machine Information Registers */ [CSR_MVENDORID] = { any, read_zero },@@ -1410,9 +1422,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_MTVEC] = { any, read_mtvec, write_mtvec }, [CSR_MCOUNTEREN] = { any, read_mcounteren, write_mcounteren }, -#if defined(TARGET_RISCV32) - [CSR_MSTATUSH] = { any, read_mstatush, write_mstatush }, -#endif + [CSR_MSTATUSH] = { any32, read_mstatush, write_mstatush }, [CSR_MSCOUNTEREN] = { any, read_mscounteren, write_mscounteren },@@ -1452,9 +1462,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_HGEIP] = { hmode, read_hgeip, write_hgeip }, [CSR_HGATP] = { hmode, read_hgatp, write_hgatp }, [CSR_HTIMEDELTA] = { hmode, read_htimedelta, write_htimedelta }, -#if defined(TARGET_RISCV32) - [CSR_HTIMEDELTAH] = { hmode, read_htimedeltah, write_htimedeltah}, -#endif + [CSR_HTIMEDELTAH] = { hmode32, read_htimedeltah, write_htimedeltah}, [CSR_VSSTATUS] = { hmode, read_vsstatus, write_vsstatus }, [CSR_VSIP] = { hmode, NULL, NULL, rmw_vsip },@@ -1477,9 +1485,7 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_HPMCOUNTER3 ... CSR_HPMCOUNTER31] = { ctr, read_zero },
target/riscv/csr.c static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { · line 1491
Quoted 10 lines
target/riscv/csr.c +2
-4[CSR_MHPMCOUNTER3 ... CSR_MHPMCOUNTER31] = { any, read_zero }, [CSR_MHPMEVENT3 ... CSR_MHPMEVENT31] = { any, read_zero }, -#if defined(TARGET_RISCV32 ) - [CSR_HPMCOUNTER3H ... CSR_HPMCOUNTER31H] = { ctr, read_zero }, - [CSR_MHPMCOUNTER3H ... CSR_MHPMCOUNTER31H] = { any, read_zero }, -#endif + [CSR_HPMCOUNTER3H ... CSR_HPMCOUNTER31H] = { ctr32, read_zero }, + [CSR_MHPMCOUNTER3H ... CSR_MHPMCOUNTER31H] = { any32, read_zero }, #endif /* !CONFIG_USER_ONLY */ };
Otherwise,
PATCH v3 15/15 target/riscv: cpu: Set XLEN independently from target
In reply to Alistair Francis--- target/riscv/cpu.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
target/riscv/cpu.c +16 -9
@@ -151,14 +151,14 @@ static void riscv_any_cpu_init(Object *obj)set_priv_version (env,PRIV_VERSION_1_11_0 ); } -static void riscv_base_cpu_init (Object *obj) +#if defined(TARGET_RISCV64 ) +static void rv64_base_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;/* We set this in the realise function */ -set_misa (env,0 ); +set_misa (env,RV64 ); } -#ifdef TARGET_RISCV64 static void rv64_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -174,6 +174,13 @@ static void rv64_sifive_e_cpu_init(Object *obj) qdev_prop_set_bit(DEVICE(obj), "mmu", false); }#else +static void rv32_base_cpu_init (Object *obj) +{ +CPURISCVState *env = &RISCV_CPU (obj)->env; +/* We set this in the realise function */ +set_misa (env,RV32 ); +} +static void rv32_sifive_u_cpu_init (Object *obj) {CPURISCVState *env = &RISCV_CPU (obj)->env;
@@ -372,7 +379,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)RISCVCPUClass *mcc =RISCV_CPU_GET_CLASS (dev);int priv_version =PRIV_VERSION_1_11_0 ;int vext_version =VEXT_VERSION_0_07_1 ; -target_ulong target_misa =0 ; +target_ulong target_misa = env->misa;Error *local_err =NULL ;cpu_exec_realizefn (cs, &local_err);
@@ -407,8 +414,8 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_resetvec (env, cpu->cfg.resetvec); -/* If misa isn't set (rv32 and rv64 machines) set it here */ -if (!env->misa) { +/* If only XLEN is set for misa, then set misa from properties */ +if (env->misa ==RV32 || env->misa ==RV64 ) {/* Do some ISA extension error checking */ if (cpu->cfg.ext_i && cpu->cfg.ext_e) { error_setg(errp,
@@ -504,7 +511,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)set_vext_version (env, vext_version); } -set_misa (env,RVXLEN | target_misa); +set_misa (env, target_misa); }riscv_cpu_register_gdb_regs_for_features (cs);
@@ -655,13 +662,13 @@ static const TypeInfo riscv_cpu_type_infos[] = { }, DEFINE_CPU(TYPE_RISCV_CPU_ANY, riscv_any_cpu_init),#if defined(TARGET_RISCV32 ) - DEFINE_CPU(TYPE_RISCV_CPU_BASE32, riscv_base_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE32, rv32_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_IBEX, rv32_ibex_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E31, rv32_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E34, rv32_imafcu_nommu_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U34, rv32_sifive_u_cpu_init), #elif defined(TARGET_RISCV64) - DEFINE_CPU(TYPE_RISCV_CPU_BASE64, riscv_base_cpu_init), + DEFINE_CPU(TYPE_RISCV_CPU_BASE64, rv64_base_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_E51, rv64_sifive_e_cpu_init), DEFINE_CPU(TYPE_RISCV_CPU_SIFIVE_U54, rv64_sifive_u_cpu_init),#endif
Signature · 1 line
2.29.2