RISC-V: Start to remove xlen preprocess
Subsystems (2)
v2 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.
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 | 69 +++++++++------ 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 | 182 ++++++++++++++++++++------------------ target/riscv/fpu_helper.c | 16 ++-- 13 files changed, 302 insertions(+), 236 deletions(-)
Signature · 1 line
2.29.2
PATCH v2 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 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
hw/riscv/boot.c +13 -1
@@ -40,7 +40,19 @@bool riscv_is_32_bit (MachineState *machine) { -if (!strncmp (machine->cpu_type,"rv32" ,4 )) { +fprintf (stderr,"machine->cpu_type[8]: %c\n" , machine->cpu_type[8 ]); + +/* +* 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
PATCH v2 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 v2 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 v2 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 v2 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
Re: [PATCH v2 05/15] hw/riscv: boot: Remove compile time XLEN checks
hw/riscv/boot.c uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt) · line 242
Quoted 11 lines · Alistair Francis
hw/riscv/boot.c +11
-0+if (riscv_is_32_bit (machine)) { + dinfo.magic =cpu_to_le32 (FW_DYNAMIC_INFO_MAGIC_VALUE ); + dinfo.version =cpu_to_le32 (FW_DYNAMIC_INFO_VERSION ); + dinfo.next_mode =cpu_to_le32 (FW_DYNAMIC_INFO_NEXT_MODE_S ); + dinfo.next_addr =cpu_to_le32 (kernel_entry); + }else { + dinfo.magic =cpu_to_le64 (FW_DYNAMIC_INFO_MAGIC_VALUE ); + dinfo.version =cpu_to_le64 (FW_DYNAMIC_INFO_VERSION ); + dinfo.next_mode =cpu_to_le64 (FW_DYNAMIC_INFO_NEXT_MODE_S ); + dinfo.next_addr =cpu_to_le64 (kernel_entry); + }
This looks like it's still based on the TARGET, but via the types in fw_dynamic_info. So far it would be clearer with sizeof(dinfo.magic) or something.
r~
Re: [PATCH v2 05/15] hw/riscv: boot: Remove compile time XLEN checks
Quoted 14 lines · Richard Henderson
hw/riscv/boot.c uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt) · line 242
Quoted 11 lines · Alistair Francis
hw/riscv/boot.c +11
-0+if (riscv_is_32_bit (machine)) { + dinfo.magic =cpu_to_le32 (FW_DYNAMIC_INFO_MAGIC_VALUE ); + dinfo.version =cpu_to_le32 (FW_DYNAMIC_INFO_VERSION ); + dinfo.next_mode =cpu_to_le32 (FW_DYNAMIC_INFO_NEXT_MODE_S ); + dinfo.next_addr =cpu_to_le32 (kernel_entry); + }else { + dinfo.magic =cpu_to_le64 (FW_DYNAMIC_INFO_MAGIC_VALUE ); + dinfo.version =cpu_to_le64 (FW_DYNAMIC_INFO_VERSION ); + dinfo.next_mode =cpu_to_le64 (FW_DYNAMIC_INFO_NEXT_MODE_S ); + dinfo.next_addr =cpu_to_le64 (kernel_entry); + }
Quoted 2 lines
This looks like it's still based on the TARGET, but via the types in
fw_dynamic_info. So far it would be clearer with sizeof(dinfo.magic) or something.
Fixed.
Alistair
Quoted 3 lines
r~
PATCH v2 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 v2 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 v2 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 v2 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 v2 09/15] target/riscv: fpu_helper: Match function defs in HELPER macros
Quoted 3 lines · Alistair Francis
The helper functions defined in
helper.hspecify that the argument is of typetarget_long. Let's change the implementation to match the header definition.
Given that these are riscv64 specific, you could alternately change the header definition. Dunno if that's clearer or not, considering an implementation like float32_to_int64 -- is it immediately obvious whether or not we are truncating the result?
r~
Re: [PATCH v2 09/15] target/riscv: fpu_helper: Match function defs in HELPER macros
Quoted 10 lines · Richard Henderson
Quoted 3 lines · Alistair Francis
The helper functions defined in
helper.hspecify that the argument is of typetarget_long. Let's change the implementation to match the header definition.Given that these are riscv64 specific, you could alternately change the header definition. Dunno if that's clearer or not, considering an implementation like
float32_to_int64-- is it immediately obvious whether or not we are truncating the result?
I suspect the headers are going to have to be changed before we have full dynamic xlen support. This series is already pretty large so here I just wanted to get it to compile without warnings. I think the FPU will take more work so I'm just going to put header changes off until then.
Alistair
Quoted 3 lines
r~
PATCH v2 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
Re: [PATCH v2 10/15] target/riscv: Add a riscv_cpu_is_32bit() helper function
target/riscv/cpu.c const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) · line 117
Quoted 7 lines · Alistair Francis
target/riscv/cpu.c +7
-0+bool riscv_cpu_is_32bit (CPURISCVState *env) +{ +if (env->misa &RV64 ) { +return false; + } + +return true;
Is this ever going to more than
return !(env->misa & RV64);
?
r~
Re: [PATCH v2 10/15] target/riscv: Add a riscv_cpu_is_32bit() helper function
Quoted 12 lines · Richard Henderson
target/riscv/cpu.c const char *riscv_cpu_get_trap_name(target_ulong cause, bool async) · line 117
Quoted 7 lines · Alistair Francis
target/riscv/cpu.c +7
-0+bool riscv_cpu_is_32bit (CPURISCVState *env) +{ +if (env->misa &RV64 ) { +return false; + } + +return true;Is this ever going to more than
Quoted 1 line
return !(env->misa & RV64);
Eventually this could also depend on mstatus, to allow a 32-bit kernel to run on a 64-bit firmware.
It will also hopefully one day be configurable by hypervisors.
Alistair
Quoted 5 lines
?
r~
PATCH v2 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
Re: [PATCH v2 11/15] target/riscv: Specify the XLEN for CPUs
Quoted 9 lines · Alistair Francis
target/riscv/cpu.c +3
-1+#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 ); }
target/riscv/cpu.c static void riscv_base_cpu_init(Object *obj) · line 176
Quoted 10 lines
target/riscv/cpu.c +3
-2-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
I guess it isn't much duplication, but you could retain the rvxx functions and pass in xlen as an argument. Either way,
r~
Re: [PATCH v2 11/15] target/riscv: Specify the XLEN for CPUs
Quoted 11 lines · Richard Henderson
Quoted 9 lines · Alistair Francis
target/riscv/cpu.c +3
-1+#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 ); }
Quoted 13 lines
target/riscv/cpu.c static void riscv_base_cpu_init(Object *obj) · line 176
Quoted 10 lines
target/riscv/cpu.c +3
-2-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 I guess it isn't much duplication, but you could retain the rvxx functions and pass in xlen as an argument. Either way,
Good idea, this file still needs more work in the future. So I'll do that when fixing it up.
Quoted 2 lines
Reviewed-by Richard Henderson <[email protected]>
Thanks.
Alistair
Quoted 2 lines
r~
PATCH v2 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
Re: [PATCH v2 12/15] target/riscv: cpu: Remove compile time XLEN checks
Quoted 5 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Bin Meng <[email protected]>--- target/riscv/cpu.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
r~
PATCH v2 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
Re: [PATCH v2 13/15] target/riscv: cpu_helper: Remove compile time XLEN checks
Quoted 4 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu_helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
r~
PATCH v2 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 | 182 +++++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 89 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 +96 -86
347 lines not on this page · raw message
Signature · 1 line
2.29.2
Re: [PATCH v2 14/15] target/riscv: csr: Remove compile time XLEN checks
Quoted 6 lines · Alistair Francis
target/riscv/csr.c +0
-2@@ -1053,11 +1077,11 @@ static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val)return -RISCV_EXCP_ILLEGAL_INST ; } -#if defined(TARGET_RISCV32 ) - *val = env->htimedelta &0xffffffff ;
target/riscv/csr.c static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val) · line 1086
Quoted 10 lines
target/riscv/csr.c +5
-3-#else - *val = env->htimedelta; -#endif +if (riscv_cpu_is_32bit (env)) { + *val = env->htimedelta &0xffffffff ; + }else { + *val = env->htimedelta; + }return 0 ; }
Certainly this mask was useless before the patch, because of the ifdef and target_ulong.
Afterward, target_ulong may be larger than uint32_t... but what does the rest of the value, and the register into which it is stored, represent?
Are you going to keep the register values sign-extended, as-if by addw et al, in which case casting to int32_t would be better. Are you going to simply ignore the upper 32 bits, in which case dropping the masking entirely would be better.
r~
Re: [PATCH v2 14/15] target/riscv: csr: Remove compile time XLEN checks
Quoted 22 lines · Richard Henderson
Quoted 6 lines · Alistair Francis
target/riscv/csr.c +0
-2@@ -1053,11 +1077,11 @@ static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val)return -RISCV_EXCP_ILLEGAL_INST ; } -#if defined(TARGET_RISCV32 ) - *val = env->htimedelta &0xffffffff ;target/riscv/csr.c static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val) · line 1086
Quoted 10 lines
target/riscv/csr.c +5
-3-#else - *val = env->htimedelta; -#endif +if (riscv_cpu_is_32bit (env)) { + *val = env->htimedelta &0xffffffff ; + }else { + *val = env->htimedelta; + }return 0 ; }Certainly this mask was useless before the patch, because of the ifdef and
target_ulong.
Quoted 7 lines
Afterward,
target_ulongmay be larger thanuint32_t... but what does the rest of the value, and the register into which it is stored, represent?Are you going to keep the register values sign-extended, as-if by addw et al, in which case casting to
int32_twould be better. Are you going to simply ignore the upper 32 bits, in which case dropping the masking entirely would be better.
We are just going to ignore the top half, so I'll drop the mask.
Alistair
Quoted 3 lines
r~
PATCH v2 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
Quoted 27 lines · Alistair Francis
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.
v2:
- Rebase on the latest RISC-V treeAlistair Francis (15):
hw/riscv: Expand the is 32-bit check to support more CPUs target/riscv: Add aTYPE_RISCV_CPU_BASECPU
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 ariscv_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
Quoted 14 lines
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 | 69 +++++++++------ 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 | 182 ++++++++++++++++++++------------------ target/riscv/fpu_helper.c | 16 ++-- 13 files changed, 302 insertions(+), 236 deletions(-)
Thanks, this is awesome! That's always been one of the headaches floating around the port that I was hoping to have some time to sort out :). I just gave it a quick look, but
as it certainly seems better than before.