| Message ID | 20230110084942.299460-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | mips: always include nanomips disassembler | expand |
On Tue, Jan 10, 2023 at 09:49:42AM +0100, Paolo Bonzini wrote: > Since the nanomips disassembler is not C++ code anymore, it need not > depend on link_language == cpp. Always include it and remove the > CONFIG_NANOMIPS_DIS symbol. > > Cc: Philippe Mathieu-Daud?? <f4bug@amsat.org> The accent in Philippe's name got mangled by something > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > disas/meson.build | 3 +-- > include/exec/poison.h | 1 - > meson.build | 7 +------ > target/mips/cpu.c | 2 -- > 4 files changed, 2 insertions(+), 11 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 10/1/23 09:49, Paolo Bonzini wrote: > Since the nanomips disassembler is not C++ code anymore, it need not > depend on link_language == cpp. Always include it and remove the > CONFIG_NANOMIPS_DIS symbol. > > Cc: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > disas/meson.build | 3 +-- > include/exec/poison.h | 1 - > meson.build | 7 +------ > target/mips/cpu.c | 2 -- > 4 files changed, 2 insertions(+), 11 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > diff --git a/meson.build b/meson.build > index 175517eafde8..bfb461d1efac 100644 > --- a/meson.build > +++ b/meson.build > @@ -2478,7 +2478,7 @@ disassemblers = { > 'x86_64' : ['CONFIG_I386_DIS'], > 'm68k' : ['CONFIG_M68K_DIS'], > 'microblaze' : ['CONFIG_MICROBLAZE_DIS'], > - 'mips' : ['CONFIG_MIPS_DIS'], > + 'mips' : [ 'CONFIG_MIPS_DIS'], Queue to mips-next (dropping this one-space change). > 'nios2' : ['CONFIG_NIOS2_DIS'], > 'or1k' : ['CONFIG_OPENRISC_DIS'], > 'ppc' : ['CONFIG_PPC_DIS'], > @@ -2490,11 +2490,6 @@ disassemblers = { > 'xtensa' : ['CONFIG_XTENSA_DIS'], > 'loongarch' : ['CONFIG_LOONGARCH_DIS'], > }
diff --git a/disas/meson.build b/disas/meson.build index 1977f5cd92ef..c865bdd8827f 100644 --- a/disas/meson.build +++ b/disas/meson.build @@ -4,8 +4,7 @@ common_ss.add(when: 'CONFIG_HEXAGON_DIS', if_true: files('hexagon.c')) common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c')) common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c')) common_ss.add(when: 'CONFIG_MICROBLAZE_DIS', if_true: files('microblaze.c')) -common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c')) -common_ss.add(when: 'CONFIG_NANOMIPS_DIS', if_true: files('nanomips.c')) +common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c', 'nanomips.c')) common_ss.add(when: 'CONFIG_NIOS2_DIS', if_true: files('nios2.c')) common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c')) common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c')) diff --git a/include/exec/poison.h b/include/exec/poison.h index f0959bc84ef5..140daa4a85a4 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -74,7 +74,6 @@ #pragma GCC poison CONFIG_M68K_DIS #pragma GCC poison CONFIG_MICROBLAZE_DIS #pragma GCC poison CONFIG_MIPS_DIS -#pragma GCC poison CONFIG_NANOMIPS_DIS #pragma GCC poison CONFIG_NIOS2_DIS #pragma GCC poison CONFIG_PPC_DIS #pragma GCC poison CONFIG_RISCV_DIS diff --git a/meson.build b/meson.build index 175517eafde8..bfb461d1efac 100644 --- a/meson.build +++ b/meson.build @@ -2478,7 +2478,7 @@ disassemblers = { 'x86_64' : ['CONFIG_I386_DIS'], 'm68k' : ['CONFIG_M68K_DIS'], 'microblaze' : ['CONFIG_MICROBLAZE_DIS'], - 'mips' : ['CONFIG_MIPS_DIS'], + 'mips' : [ 'CONFIG_MIPS_DIS'], 'nios2' : ['CONFIG_NIOS2_DIS'], 'or1k' : ['CONFIG_OPENRISC_DIS'], 'ppc' : ['CONFIG_PPC_DIS'], @@ -2490,11 +2490,6 @@ disassemblers = { 'xtensa' : ['CONFIG_XTENSA_DIS'], 'loongarch' : ['CONFIG_LOONGARCH_DIS'], } -if link_language == 'cpp' - disassemblers += { - 'mips' : [ 'CONFIG_MIPS_DIS', 'CONFIG_NANOMIPS_DIS'], - } -endif have_ivshmem = config_host_data.get('CONFIG_EVENTFD') host_kconfig = \ diff --git a/target/mips/cpu.c b/target/mips/cpu.c index c614b04607a2..a216cb0df072 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -439,9 +439,7 @@ static void mips_cpu_disas_set_info(CPUState *s, disassemble_info *info) info->print_insn = print_insn_little_mips; #endif } else { -#if defined(CONFIG_NANOMIPS_DIS) info->print_insn = print_insn_nanomips; -#endif } }
Since the nanomips disassembler is not C++ code anymore, it need not depend on link_language == cpp. Always include it and remove the CONFIG_NANOMIPS_DIS symbol. Cc: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- disas/meson.build | 3 +-- include/exec/poison.h | 1 - meson.build | 7 +------ target/mips/cpu.c | 2 -- 4 files changed, 2 insertions(+), 11 deletions(-)