| Message ID | 1565020823-24223-24-git-send-email-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: sifive_u: Improve the emulation fidelity of sifive_u machine | expand |
On Mon, Aug 5, 2019 at 9:08 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > sifive_mmio_emulate() is currently only used in the sifive_e machine > codes. It can be helpful for other machines as well. > > Change it to an inline routine and move it to sifive_cpu.h, so that > other machines like sifive_u can use it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> I don't like this. I don't think we should use this function. This seems like we can use create_unimplemented_device() instead. Alistair > --- > > hw/riscv/sifive_e.c | 8 -------- > include/hw/riscv/sifive_cpu.h | 10 +++++++++- > 2 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c > index 2d67670..7e0fe7b 100644 > --- a/hw/riscv/sifive_e.c > +++ b/hw/riscv/sifive_e.c > @@ -74,14 +74,6 @@ static const struct MemmapEntry { > [SIFIVE_E_DTIM] = { 0x80000000, 0x4000 } > }; > > -static void sifive_mmio_emulate(MemoryRegion *parent, const char *name, > - uintptr_t offset, uintptr_t length) > -{ > - MemoryRegion *mock_mmio = g_new(MemoryRegion, 1); > - memory_region_init_ram(mock_mmio, NULL, name, length, &error_fatal); > - memory_region_add_subregion(parent, offset, mock_mmio); > -} > - > static void riscv_sifive_e_init(MachineState *machine) > { > const struct MemmapEntry *memmap = sifive_e_memmap; > diff --git a/include/hw/riscv/sifive_cpu.h b/include/hw/riscv/sifive_cpu.h > index 1367996..897b8f8 100644 > --- a/include/hw/riscv/sifive_cpu.h > +++ b/include/hw/riscv/sifive_cpu.h > @@ -1,5 +1,5 @@ > /* > - * SiFive CPU types > + * SiFive CPU types and common utilities > * > * Copyright (c) 2017 SiFive, Inc. > * Copyright (c) 2019 Bin Meng <bmeng.cn@gmail.com> > @@ -28,4 +28,12 @@ > #define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 > #endif > > +static inline void sifive_mmio_emulate(MemoryRegion *parent, const char *name, > + uintptr_t offset, uintptr_t length) > +{ > + MemoryRegion *mock_mmio = g_new(MemoryRegion, 1); > + memory_region_init_ram(mock_mmio, NULL, name, length, &error_fatal); > + memory_region_add_subregion(parent, offset, mock_mmio); > +} > + > #endif /* HW_SIFIVE_CPU_H */ > -- > 2.7.4 > >
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 2d67670..7e0fe7b 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -74,14 +74,6 @@ static const struct MemmapEntry { [SIFIVE_E_DTIM] = { 0x80000000, 0x4000 } }; -static void sifive_mmio_emulate(MemoryRegion *parent, const char *name, - uintptr_t offset, uintptr_t length) -{ - MemoryRegion *mock_mmio = g_new(MemoryRegion, 1); - memory_region_init_ram(mock_mmio, NULL, name, length, &error_fatal); - memory_region_add_subregion(parent, offset, mock_mmio); -} - static void riscv_sifive_e_init(MachineState *machine) { const struct MemmapEntry *memmap = sifive_e_memmap; diff --git a/include/hw/riscv/sifive_cpu.h b/include/hw/riscv/sifive_cpu.h index 1367996..897b8f8 100644 --- a/include/hw/riscv/sifive_cpu.h +++ b/include/hw/riscv/sifive_cpu.h @@ -1,5 +1,5 @@ /* - * SiFive CPU types + * SiFive CPU types and common utilities * * Copyright (c) 2017 SiFive, Inc. * Copyright (c) 2019 Bin Meng <bmeng.cn@gmail.com> @@ -28,4 +28,12 @@ #define SIFIVE_U_CPU TYPE_RISCV_CPU_SIFIVE_U54 #endif +static inline void sifive_mmio_emulate(MemoryRegion *parent, const char *name, + uintptr_t offset, uintptr_t length) +{ + MemoryRegion *mock_mmio = g_new(MemoryRegion, 1); + memory_region_init_ram(mock_mmio, NULL, name, length, &error_fatal); + memory_region_add_subregion(parent, offset, mock_mmio); +} + #endif /* HW_SIFIVE_CPU_H */
sifive_mmio_emulate() is currently only used in the sifive_e machine codes. It can be helpful for other machines as well. Change it to an inline routine and move it to sifive_cpu.h, so that other machines like sifive_u can use it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- hw/riscv/sifive_e.c | 8 -------- include/hw/riscv/sifive_cpu.h | 10 +++++++++- 2 files changed, 9 insertions(+), 9 deletions(-)