Re: [Qemu-devel] [PATCH] target/m68k: add monitor.c

["Philippe Mathieu-Daudé" <f4bug@amsat.org>]

On Wed, Dec 20, 2017 at 5:35 PM, Laurent Vivier <laurent@vivier.eu> wrote:
> This allows to use registers content in the monitor.
>
> Example:
>
>  BEFORE:
>   (qemu) print $d0
>   unknown register
>
>  AFTER:
>   (qemu) print $d0
>   0
>   (qemu) print $sr
>   0x2000
>   (qemu) x/10i $pc
>   0x40010a2a:  movew %sr,%d0
>   0x40010a2c:  oril #1792,%d0
>   0x40010a32:  movew %d0,%sr
>   0x40010a34:  movel %a0@,%d0
>   0x40010a36:  btst #3,%d0
>   0x40010a3a:  beqs 0x40010a26
>   0x40010a3c:  movew %sr,%d0
>   0x40010a3e:  andil #63743,%d0
>   0x40010a44:  movew %d0,%sr
>   0x40010a46:  rts
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  target/m68k/Makefile.objs |  1 +
>  target/m68k/monitor.c     | 55 +++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 56 insertions(+)
>  create mode 100644 target/m68k/monitor.c
>
> diff --git a/target/m68k/Makefile.objs b/target/m68k/Makefile.objs
> index 39141ab93d..d143f20270 100644
> --- a/target/m68k/Makefile.objs
> +++ b/target/m68k/Makefile.objs
> @@ -1,3 +1,4 @@
>  obj-y += m68k-semi.o
>  obj-y += translate.o op_helper.o helper.o cpu.o fpu_helper.o
>  obj-y += gdbstub.o
> +obj-$(CONFIG_SOFTMMU) += monitor.o
> diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c
> new file mode 100644
> index 0000000000..03d037ccab
> --- /dev/null
> +++ b/target/m68k/monitor.c
> @@ -0,0 +1,55 @@
> +/*
> + * QEMU monitor
> + *
> + * Copyright (c) 2003-2004 Fabrice Bellard
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a copy
> + * of this software and associated documentation files (the "Software"), to deal
> + * in the Software without restriction, including without limitation the rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +#include "qemu/osdep.h"
> +#include "cpu.h"
> +#include "monitor/hmp-target.h"
> +
> +const MonitorDef monitor_defs[] = {

adding 'static':
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> +    { "d0", offsetof(CPUM68KState, dregs[0]) },
> +    { "d1", offsetof(CPUM68KState, dregs[1]) },
> +    { "d2", offsetof(CPUM68KState, dregs[2]) },
> +    { "d3", offsetof(CPUM68KState, dregs[3]) },
> +    { "d4", offsetof(CPUM68KState, dregs[4]) },
> +    { "d5", offsetof(CPUM68KState, dregs[5]) },
> +    { "d6", offsetof(CPUM68KState, dregs[6]) },
> +    { "d7", offsetof(CPUM68KState, dregs[7]) },
> +    { "a0", offsetof(CPUM68KState, aregs[0]) },
> +    { "a1", offsetof(CPUM68KState, aregs[1]) },
> +    { "a2", offsetof(CPUM68KState, aregs[2]) },
> +    { "a3", offsetof(CPUM68KState, aregs[3]) },
> +    { "a4", offsetof(CPUM68KState, aregs[4]) },
> +    { "a5", offsetof(CPUM68KState, aregs[5]) },
> +    { "a6", offsetof(CPUM68KState, aregs[6]) },
> +    { "a7", offsetof(CPUM68KState, aregs[7]) },
> +    { "pc", offsetof(CPUM68KState, pc) },
> +    { "sr", offsetof(CPUM68KState, sr) },
> +    { "ssp", offsetof(CPUM68KState, sp[0]) },
> +    { "usp", offsetof(CPUM68KState, sp[1]) },
> +    { NULL },
> +};
> +
> +const MonitorDef *target_monitor_defs(void)
> +{
> +    return monitor_defs;
> +}
> --
> 2.14.3
>