| Message ID | 20240319062855.8025-7-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/microblaze: Sprint housekeeping | expand |
On 19/03/24, Philippe Mathieu-Daudé wrote: > helper.c only contains system emulation helpers, > rename it as sys_helper.c. > Adapt meson and remove pointless #ifdef'ry. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/microblaze/{helper.c => sys_helper.c} | 5 +---- > target/microblaze/meson.build | 2 +- > 2 files changed, 2 insertions(+), 5 deletions(-) > rename target/microblaze/{helper.c => sys_helper.c} (99%) > > diff --git a/target/microblaze/helper.c b/target/microblaze/sys_helper.c > similarity index 99% > rename from target/microblaze/helper.c > rename to target/microblaze/sys_helper.c > index 3f410fc7b5..5180500354 100644 > --- a/target/microblaze/helper.c > +++ b/target/microblaze/sys_helper.c > @@ -1,5 +1,5 @@ > /* > - * MicroBlaze helper routines. > + * MicroBlaze system helper routines. > * > * Copyright (c) 2009 Edgar E. Iglesias <edgar.iglesias@gmail.com> > * Copyright (c) 2009-2012 PetaLogix Qld Pty Ltd. > @@ -24,7 +24,6 @@ > #include "qemu/host-utils.h" > #include "exec/log.h" > > -#ifndef CONFIG_USER_ONLY > static bool mb_cpu_access_is_secure(MicroBlazeCPU *cpu, > MMUAccessType access_type) > { > @@ -266,8 +265,6 @@ bool mb_cpu_exec_interrupt(CPUState *cs, int interrupt_request) > return false; > } > > -#endif /* !CONFIG_USER_ONLY */ > - > void mb_cpu_do_unaligned_access(CPUState *cs, vaddr addr, > MMUAccessType access_type, > int mmu_idx, uintptr_t retaddr) > diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build > index 3ed4fbb67a..013ea542be 100644 > --- a/target/microblaze/meson.build > +++ b/target/microblaze/meson.build > @@ -5,7 +5,6 @@ microblaze_ss.add(gen) > microblaze_ss.add(files( > 'cpu.c', > 'gdbstub.c', > - 'helper.c', > 'op_helper.c', > 'translate.c', > )) > @@ -14,6 +13,7 @@ microblaze_system_ss = ss.source_set() > microblaze_system_ss.add(files( > 'mmu.c', > 'machine.c', > + 'sys_helper.c', > )) > > target_arch += {'microblaze': microblaze_ss} > -- > 2.41.0 > Reviewed-by: Anton Johansson <anjo@rev.ng>
On Tue, Mar 19, 2024 at 07:28:53AM +0100, Philippe Mathieu-Daudé wrote: > helper.c only contains system emulation helpers, > rename it as sys_helper.c. > Adapt meson and remove pointless #ifdef'ry. Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/microblaze/{helper.c => sys_helper.c} | 5 +---- > target/microblaze/meson.build | 2 +- > 2 files changed, 2 insertions(+), 5 deletions(-) > rename target/microblaze/{helper.c => sys_helper.c} (99%) > > diff --git a/target/microblaze/helper.c b/target/microblaze/sys_helper.c > similarity index 99% > rename from target/microblaze/helper.c > rename to target/microblaze/sys_helper.c > index 3f410fc7b5..5180500354 100644 > --- a/target/microblaze/helper.c > +++ b/target/microblaze/sys_helper.c > @@ -1,5 +1,5 @@ > /* > - * MicroBlaze helper routines. > + * MicroBlaze system helper routines. > * > * Copyright (c) 2009 Edgar E. Iglesias <edgar.iglesias@gmail.com> > * Copyright (c) 2009-2012 PetaLogix Qld Pty Ltd. > @@ -24,7 +24,6 @@ > #include "qemu/host-utils.h" > #include "exec/log.h" > > -#ifndef CONFIG_USER_ONLY > static bool mb_cpu_access_is_secure(MicroBlazeCPU *cpu, > MMUAccessType access_type) > { > @@ -266,8 +265,6 @@ bool mb_cpu_exec_interrupt(CPUState *cs, int interrupt_request) > return false; > } > > -#endif /* !CONFIG_USER_ONLY */ > - > void mb_cpu_do_unaligned_access(CPUState *cs, vaddr addr, > MMUAccessType access_type, > int mmu_idx, uintptr_t retaddr) > diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build > index 3ed4fbb67a..013ea542be 100644 > --- a/target/microblaze/meson.build > +++ b/target/microblaze/meson.build > @@ -5,7 +5,6 @@ microblaze_ss.add(gen) > microblaze_ss.add(files( > 'cpu.c', > 'gdbstub.c', > - 'helper.c', > 'op_helper.c', > 'translate.c', > )) > @@ -14,6 +13,7 @@ microblaze_system_ss = ss.source_set() > microblaze_system_ss.add(files( > 'mmu.c', > 'machine.c', > + 'sys_helper.c', > )) > > target_arch += {'microblaze': microblaze_ss} > -- > 2.41.0 >
diff --git a/target/microblaze/helper.c b/target/microblaze/sys_helper.c similarity index 99% rename from target/microblaze/helper.c rename to target/microblaze/sys_helper.c index 3f410fc7b5..5180500354 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/sys_helper.c @@ -1,5 +1,5 @@ /* - * MicroBlaze helper routines. + * MicroBlaze system helper routines. * * Copyright (c) 2009 Edgar E. Iglesias <edgar.iglesias@gmail.com> * Copyright (c) 2009-2012 PetaLogix Qld Pty Ltd. @@ -24,7 +24,6 @@ #include "qemu/host-utils.h" #include "exec/log.h" -#ifndef CONFIG_USER_ONLY static bool mb_cpu_access_is_secure(MicroBlazeCPU *cpu, MMUAccessType access_type) { @@ -266,8 +265,6 @@ bool mb_cpu_exec_interrupt(CPUState *cs, int interrupt_request) return false; } -#endif /* !CONFIG_USER_ONLY */ - void mb_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index 3ed4fbb67a..013ea542be 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -5,7 +5,6 @@ microblaze_ss.add(gen) microblaze_ss.add(files( 'cpu.c', 'gdbstub.c', - 'helper.c', 'op_helper.c', 'translate.c', )) @@ -14,6 +13,7 @@ microblaze_system_ss = ss.source_set() microblaze_system_ss.add(files( 'mmu.c', 'machine.c', + 'sys_helper.c', )) target_arch += {'microblaze': microblaze_ss}
helper.c only contains system emulation helpers, rename it as sys_helper.c. Adapt meson and remove pointless #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/microblaze/{helper.c => sys_helper.c} | 5 +---- target/microblaze/meson.build | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) rename target/microblaze/{helper.c => sys_helper.c} (99%)