[v3,5/7] disas: microblaze: QOMify target specific disas setup

Move the target_disas() MB specifics to the QOM disas_set_info hook
and delete the MB specific code in disas.c.

This also now adds support for monitor disas to Microblaze.

E.g.
(qemu) xp 0x90000000
0000000090000000: 0x94208001

And before this patch:
(qemu) xp/i 0x90000000
0x90000000: Asm output not supported on this arch

After:
(qemu) xp/i 0x90000000
0x90000000:  mfs    r1, rmsr

Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
---
 disas.c                 | 3 ---
 target-microblaze/cpu.c | 8 ++++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

Ping!

On Sun, May 24, 2015 at 3:47 PM, Peter Crosthwaite
<crosthwaitepeter@gmail.com> wrote:
> Move the target_disas() MB specifics to the QOM disas_set_info hook
> and delete the MB specific code in disas.c.
>
> This also now adds support for monitor disas to Microblaze.
>
> E.g.
> (qemu) xp 0x90000000
> 0000000090000000: 0x94208001
>
> And before this patch:
> (qemu) xp/i 0x90000000
> 0x90000000: Asm output not supported on this arch
>
> After:
> (qemu) xp/i 0x90000000
> 0x90000000:  mfs    r1, rmsr
>
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  disas.c                 | 3 ---
>  target-microblaze/cpu.c | 8 ++++++++
>  2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/disas.c b/disas.c
> index fde5029..937e08b 100644
> --- a/disas.c
> +++ b/disas.c
> @@ -268,9 +268,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,
>  #elif defined(TARGET_S390X)
>      s.info.mach = bfd_mach_s390_64;
>      s.info.print_insn = print_insn_s390;
> -#elif defined(TARGET_MICROBLAZE)
> -    s.info.mach = bfd_arch_microblaze;
> -    s.info.print_insn = print_insn_microblaze;
>  #elif defined(TARGET_MOXIE)
>      s.info.mach = bfd_arch_moxie;
>      s.info.print_insn = print_insn_moxie;
> diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
> index 67e3182..89b8363 100644
> --- a/target-microblaze/cpu.c
> +++ b/target-microblaze/cpu.c
> @@ -111,6 +111,12 @@ static void mb_cpu_reset(CPUState *s)
>  #endif
>  }
>
> +static void mb_disas_set_info(CPUState *cpu, disassemble_info *info)
> +{
> +    info->mach = bfd_arch_microblaze;
> +    info->print_insn = print_insn_microblaze;
> +}
> +
>  static void mb_cpu_realizefn(DeviceState *dev, Error **errp)
>  {
>      CPUState *cs = CPU(dev);
> @@ -183,6 +189,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
>      dc->vmsd = &vmstate_mb_cpu;
>      dc->props = mb_properties;
>      cc->gdb_num_core_regs = 32 + 5;
> +
> +    cc->disas_set_info = mb_disas_set_info;
>  }
>
>  static const TypeInfo mb_cpu_type_info = {
> --
> 1.9.1
>
>

Looks good:
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


On Sun, May 24, 2015 at 03:47:18PM -0700, Peter Crosthwaite wrote:
> Move the target_disas() MB specifics to the QOM disas_set_info hook
> and delete the MB specific code in disas.c.
> 
> This also now adds support for monitor disas to Microblaze.
> 
> E.g.
> (qemu) xp 0x90000000
> 0000000090000000: 0x94208001
> 
> And before this patch:
> (qemu) xp/i 0x90000000
> 0x90000000: Asm output not supported on this arch
> 
> After:
> (qemu) xp/i 0x90000000
> 0x90000000:  mfs    r1, rmsr
> 
> Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
> ---
>  disas.c                 | 3 ---
>  target-microblaze/cpu.c | 8 ++++++++
>  2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/disas.c b/disas.c
> index fde5029..937e08b 100644
> --- a/disas.c
> +++ b/disas.c
> @@ -268,9 +268,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,
>  #elif defined(TARGET_S390X)
>      s.info.mach = bfd_mach_s390_64;
>      s.info.print_insn = print_insn_s390;
> -#elif defined(TARGET_MICROBLAZE)
> -    s.info.mach = bfd_arch_microblaze;
> -    s.info.print_insn = print_insn_microblaze;
>  #elif defined(TARGET_MOXIE)
>      s.info.mach = bfd_arch_moxie;
>      s.info.print_insn = print_insn_moxie;
> diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
> index 67e3182..89b8363 100644
> --- a/target-microblaze/cpu.c
> +++ b/target-microblaze/cpu.c
> @@ -111,6 +111,12 @@ static void mb_cpu_reset(CPUState *s)
>  #endif
>  }
>  
> +static void mb_disas_set_info(CPUState *cpu, disassemble_info *info)
> +{
> +    info->mach = bfd_arch_microblaze;
> +    info->print_insn = print_insn_microblaze;
> +}
> +
>  static void mb_cpu_realizefn(DeviceState *dev, Error **errp)
>  {
>      CPUState *cs = CPU(dev);
> @@ -183,6 +189,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
>      dc->vmsd = &vmstate_mb_cpu;
>      dc->props = mb_properties;
>      cc->gdb_num_core_regs = 32 + 5;
> +
> +    cc->disas_set_info = mb_disas_set_info;
>  }
>  
>  static const TypeInfo mb_cpu_type_info = {
> -- 
> 1.9.1
> 
>