SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/char: riscv_htif: Drop useless assignment of memory region

Browse Source 
struct HTIFState has 3 members for address space and memory region,
and are initialized during htif_mm_init(). But they are actually
useless. Drop them.

Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20221229091828.1945072-4-bmeng@tinylab.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Bin Meng 2022-12-29 17:18:19 +08:00 committed by Alistair Francis
parent bc9c3b1862
commit dc68824641
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/char/riscv_htif.c
View File

@ -265,8 +265,8 @@ bool htif_uses_elf_symbols(void)
return (address_symbol_set == 3) ? true : false; return (address_symbol_set == 3) ? true : false;
} }
HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, HTIFState *htif_mm_init(MemoryRegion *address_space, CPURISCVState *env,
CPURISCVState *env, Chardev *chr, uint64_t nonelf_base) Chardev *chr, uint64_t nonelf_base)
{ {
uint64_t base, size, tohost_offset, fromhost_offset; uint64_t base, size, tohost_offset, fromhost_offset;
@ -281,9 +281,6 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,
fromhost_offset = fromhost_addr - base; fromhost_offset = fromhost_addr - base;
HTIFState *s = g_new0(HTIFState, 1); HTIFState *s = g_new0(HTIFState, 1);
s->address_space = address_space;
s->main_mem = main_mem;
s->main_mem_ram_ptr = memory_region_get_ram_ptr(main_mem);
s->env = env; s->env = env;
s->tohost_offset = tohost_offset; s->tohost_offset = tohost_offset;
s->fromhost_offset = fromhost_offset; s->fromhost_offset = fromhost_offset;

5
hw/riscv/spike.c
View File

@ -316,9 +316,8 @@ static void spike_board_init(MachineState *machine)
fdt_load_addr); fdt_load_addr);
/* initialize HTIF using symbols found in load_kernel */ /* initialize HTIF using symbols found in load_kernel */
htif_mm_init(system_memory, mask_rom, htif_mm_init(system_memory, &s->soc[0].harts[0].env,
&s->soc[0].harts[0].env, serial_hd(0), serial_hd(0), memmap[SPIKE_HTIF].base);
memmap[SPIKE_HTIF].base);
} }
static void spike_machine_instance_init(Object *obj) static void spike_machine_instance_init(Object *obj)

7
include/hw/char/riscv_htif.h
View File

@ -34,9 +34,6 @@ typedef struct HTIFState {
hwaddr tohost_offset; hwaddr tohost_offset;
hwaddr fromhost_offset; hwaddr fromhost_offset;
MemoryRegion mmio; MemoryRegion mmio;
MemoryRegion *address_space;
MemoryRegion *main_mem;
void *main_mem_ram_ptr;
CPURISCVState *env; CPURISCVState *env;
CharBackend chr; CharBackend chr;
@ -54,7 +51,7 @@ void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value,
bool htif_uses_elf_symbols(void); bool htif_uses_elf_symbols(void);
/* legacy pre qom */ /* legacy pre qom */
HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, HTIFState *htif_mm_init(MemoryRegion *address_space, CPURISCVState *env,
CPURISCVState *env, Chardev *chr, uint64_t nonelf_base); Chardev *chr, uint64_t nonelf_base);
#endif #endif