| Message ID | 20240321154838.95771-6-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/monitor: Cleanup around hmp_info_tlb() | expand |
On 3/21/24 05:48, Philippe Mathieu-Daudé wrote: > Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > target/m68k/cpu.h | 2 +- > target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- > target/m68k/monitor.c | 4 +- > 3 files changed, 67 insertions(+), 65 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
* Philippe Mathieu-Daudé (philmd@linaro.org) wrote: > Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/m68k/cpu.h | 2 +- > target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- > target/m68k/monitor.c | 4 +- > 3 files changed, 67 insertions(+), 65 deletions(-) > > diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h > index 346427e144..4e4307956d 100644 > --- a/target/m68k/cpu.h > +++ b/target/m68k/cpu.h > @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, > } > } > > -void dump_mmu(CPUM68KState *env); > +void dump_mmu(Monitor *mon, CPUM68KState *env); > > #endif > diff --git a/target/m68k/helper.c b/target/m68k/helper.c > index 1a475f082a..310e26dfa1 100644 > --- a/target/m68k/helper.c > +++ b/target/m68k/helper.c > @@ -25,7 +25,7 @@ > #include "exec/helper-proto.h" > #include "gdbstub/helpers.h" > #include "fpu/softfloat.h" > -#include "qemu/qemu-print.h" > +#include "monitor/monitor.h" > > #define SIGNBIT (1u << 31) > > @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) > #if !defined(CONFIG_USER_ONLY) > /* MMU: 68040 only */ > > -static void print_address_zone(uint32_t logical, uint32_t physical, > +static void print_address_zone(Monitor *mon, > + uint32_t logical, uint32_t physical, > uint32_t size, int attr) > { > - qemu_printf("%08x - %08x -> %08x - %08x %c ", > - logical, logical + size - 1, > - physical, physical + size - 1, > - attr & 4 ? 'W' : '-'); > + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", > + logical, logical + size - 1, > + physical, physical + size - 1, > + attr & 4 ? 'W' : '-'); > size >>= 10; > if (size < 1024) { > - qemu_printf("(%d KiB)\n", size); > + monitor_printf(mon, "(%d KiB)\n", size); > } else { > size >>= 10; > if (size < 1024) { > - qemu_printf("(%d MiB)\n", size); > + monitor_printf(mon, "(%d MiB)\n", size); > } else { > size >>= 10; > - qemu_printf("(%d GiB)\n", size); > + monitor_printf(mon, "(%d GiB)\n", size); > } > } > } > > -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > +static void dump_address_map(Monitor *mon, CPUM68KState *env, > + uint32_t root_pointer) > { > int i, j, k; > int tic_size, tic_shift; > @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > if (first_logical != 0xffffffff) { > size = last_logical + (1 << tic_shift) - > first_logical; > - print_address_zone(first_logical, > + print_address_zone(mon, first_logical, > first_physical, size, last_attr); > } > first_logical = logical; > @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > } > if (first_logical != logical || (attr & 4) != (last_attr & 4)) { > size = logical + (1 << tic_shift) - first_logical; > - print_address_zone(first_logical, first_physical, size, last_attr); > + print_address_zone(mon, first_logical, first_physical, size, last_attr); > } > } > > #define DUMP_CACHEFLAGS(a) \ > switch (a & M68K_DESC_CACHEMODE) { \ > case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ > - qemu_printf("T"); \ > + monitor_puts(mon, "T"); \ > break; \ > case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ > - qemu_printf("C"); \ > + monitor_puts(mon, "C"); \ > break; \ > case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ > - qemu_printf("S"); \ > + monitor_puts(mon, "S"); \ > break; \ > case M68K_DESC_CM_NCACHE: /* noncachable */ \ > - qemu_printf("N"); \ > + monitor_puts(mon, "N"); \ > break; \ > } > > -static void dump_ttr(uint32_t ttr) > +static void dump_ttr(Monitor *mon, uint32_t ttr) > { > if ((ttr & M68K_TTR_ENABLED) == 0) { > - qemu_printf("disabled\n"); > + monitor_puts(mon, "disabled\n"); > return; > } > - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", > - ttr & M68K_TTR_ADDR_BASE, > - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", > + ttr & M68K_TTR_ADDR_BASE, > + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > switch (ttr & M68K_TTR_SFIELD) { > case M68K_TTR_SFIELD_USER: > - qemu_printf("U"); > + monitor_puts(mon, "U"); > break; > case M68K_TTR_SFIELD_SUPER: > - qemu_printf("S"); > + monitor_puts(mon, "S"); > break; > default: > - qemu_printf("*"); > + monitor_puts(mon, "*"); > break; > } > DUMP_CACHEFLAGS(ttr); > if (ttr & M68K_DESC_WRITEPROT) { > - qemu_printf("R"); > + monitor_puts(mon, "R"); > } else { > - qemu_printf("W"); > + monitor_puts(mon, "W"); > } > - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> > + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> > M68K_DESC_USERATTR_SHIFT); > } > > -void dump_mmu(CPUM68KState *env) > +void dump_mmu(Monitor *mon, CPUM68KState *env) > { > if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { > - qemu_printf("Translation disabled\n"); > + monitor_puts(mon, "Translation disabled\n"); > return; > } > - qemu_printf("Page Size: "); > + monitor_puts(mon, "Page Size: "); > if (env->mmu.tcr & M68K_TCR_PAGE_8K) { > - qemu_printf("8kB\n"); > + monitor_puts(mon, "8kB\n"); > } else { > - qemu_printf("4kB\n"); > + monitor_puts(mon, "4kB\n"); > } > > - qemu_printf("MMUSR: "); > + monitor_puts(mon, "MMUSR: "); > if (env->mmu.mmusr & M68K_MMU_B_040) { > - qemu_printf("BUS ERROR\n"); > + monitor_puts(mon, "BUS ERROR\n"); > } else { > - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > /* flags found on the page descriptor */ > if (env->mmu.mmusr & M68K_MMU_G_040) { > - qemu_printf("G"); /* Global */ > + monitor_puts(mon, "G"); /* Global */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_S_040) { > - qemu_printf("S"); /* Supervisor */ > + monitor_puts(mon, "S"); /* Supervisor */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_M_040) { > - qemu_printf("M"); /* Modified */ > + monitor_puts(mon, "M"); /* Modified */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_WP_040) { > - qemu_printf("W"); /* Write protect */ > + monitor_puts(mon, "W"); /* Write protect */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_T_040) { > - qemu_printf("T"); /* Transparent */ > + monitor_puts(mon, "T"); /* Transparent */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_R_040) { > - qemu_printf("R"); /* Resident */ > + monitor_puts(mon, "R"); /* Resident */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > - qemu_printf(" Cache: "); > + monitor_puts(mon, " Cache: "); > DUMP_CACHEFLAGS(env->mmu.mmusr); > - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); > - qemu_printf("\n"); > + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); > + monitor_puts(mon, "\n"); That one is a little odd isn't it; still, generally Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org> > } > > - qemu_printf("ITTR0: "); > - dump_ttr(env->mmu.ttr[M68K_ITTR0]); > - qemu_printf("ITTR1: "); > - dump_ttr(env->mmu.ttr[M68K_ITTR1]); > - qemu_printf("DTTR0: "); > - dump_ttr(env->mmu.ttr[M68K_DTTR0]); > - qemu_printf("DTTR1: "); > - dump_ttr(env->mmu.ttr[M68K_DTTR1]); > + monitor_puts(mon, "ITTR0: "); > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); > + monitor_puts(mon, "ITTR1: "); > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); > + monitor_puts(mon, "DTTR0: "); > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); > + monitor_puts(mon, "DTTR1: "); > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); > > - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); > - dump_address_map(env, env->mmu.srp); > + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); > + dump_address_map(mon, env, env->mmu.srp); > > - qemu_printf("URP: 0x%08x\n", env->mmu.urp); > - dump_address_map(env, env->mmu.urp); > + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); > + dump_address_map(mon, env, env->mmu.urp); > } > > static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, > diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c > index 2bdf6acae0..623c6ab635 100644 > --- a/target/m68k/monitor.c > +++ b/target/m68k/monitor.c > @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) > CPUArchState *env1 = mon_get_cpu_env(mon); > > if (!env1) { > - monitor_printf(mon, "No CPU available\n"); > + monitor_puts(mon, "No CPU available\n"); > return; > } > > - dump_mmu(env1); > + dump_mmu(mon, env1); > } > > static const MonitorDef monitor_defs[] = { > -- > 2.41.0 >
On Sun, 24 Mar 2024, Dr. David Alan Gilbert wrote: > * Philippe Mathieu-Daudé (philmd@linaro.org) wrote: >> Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> target/m68k/cpu.h | 2 +- >> target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- >> target/m68k/monitor.c | 4 +- >> 3 files changed, 67 insertions(+), 65 deletions(-) >> >> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h >> index 346427e144..4e4307956d 100644 >> --- a/target/m68k/cpu.h >> +++ b/target/m68k/cpu.h >> @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, >> } >> } >> >> -void dump_mmu(CPUM68KState *env); >> +void dump_mmu(Monitor *mon, CPUM68KState *env); >> >> #endif >> diff --git a/target/m68k/helper.c b/target/m68k/helper.c >> index 1a475f082a..310e26dfa1 100644 >> --- a/target/m68k/helper.c >> +++ b/target/m68k/helper.c >> @@ -25,7 +25,7 @@ >> #include "exec/helper-proto.h" >> #include "gdbstub/helpers.h" >> #include "fpu/softfloat.h" >> -#include "qemu/qemu-print.h" >> +#include "monitor/monitor.h" >> >> #define SIGNBIT (1u << 31) >> >> @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) >> #if !defined(CONFIG_USER_ONLY) >> /* MMU: 68040 only */ >> >> -static void print_address_zone(uint32_t logical, uint32_t physical, >> +static void print_address_zone(Monitor *mon, >> + uint32_t logical, uint32_t physical, >> uint32_t size, int attr) >> { >> - qemu_printf("%08x - %08x -> %08x - %08x %c ", >> - logical, logical + size - 1, >> - physical, physical + size - 1, >> - attr & 4 ? 'W' : '-'); >> + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", >> + logical, logical + size - 1, >> + physical, physical + size - 1, >> + attr & 4 ? 'W' : '-'); >> size >>= 10; >> if (size < 1024) { >> - qemu_printf("(%d KiB)\n", size); >> + monitor_printf(mon, "(%d KiB)\n", size); >> } else { >> size >>= 10; >> if (size < 1024) { >> - qemu_printf("(%d MiB)\n", size); >> + monitor_printf(mon, "(%d MiB)\n", size); >> } else { >> size >>= 10; >> - qemu_printf("(%d GiB)\n", size); >> + monitor_printf(mon, "(%d GiB)\n", size); >> } >> } >> } >> >> -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >> +static void dump_address_map(Monitor *mon, CPUM68KState *env, >> + uint32_t root_pointer) >> { >> int i, j, k; >> int tic_size, tic_shift; >> @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >> if (first_logical != 0xffffffff) { >> size = last_logical + (1 << tic_shift) - >> first_logical; >> - print_address_zone(first_logical, >> + print_address_zone(mon, first_logical, >> first_physical, size, last_attr); >> } >> first_logical = logical; >> @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >> } >> if (first_logical != logical || (attr & 4) != (last_attr & 4)) { >> size = logical + (1 << tic_shift) - first_logical; >> - print_address_zone(first_logical, first_physical, size, last_attr); >> + print_address_zone(mon, first_logical, first_physical, size, last_attr); >> } >> } >> >> #define DUMP_CACHEFLAGS(a) \ >> switch (a & M68K_DESC_CACHEMODE) { \ >> case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ >> - qemu_printf("T"); \ >> + monitor_puts(mon, "T"); \ >> break; \ >> case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ >> - qemu_printf("C"); \ >> + monitor_puts(mon, "C"); \ >> break; \ >> case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ >> - qemu_printf("S"); \ >> + monitor_puts(mon, "S"); \ >> break; \ >> case M68K_DESC_CM_NCACHE: /* noncachable */ \ >> - qemu_printf("N"); \ >> + monitor_puts(mon, "N"); \ >> break; \ >> } >> >> -static void dump_ttr(uint32_t ttr) >> +static void dump_ttr(Monitor *mon, uint32_t ttr) >> { >> if ((ttr & M68K_TTR_ENABLED) == 0) { >> - qemu_printf("disabled\n"); >> + monitor_puts(mon, "disabled\n"); >> return; >> } >> - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", >> - ttr & M68K_TTR_ADDR_BASE, >> - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); >> + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", >> + ttr & M68K_TTR_ADDR_BASE, >> + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); >> switch (ttr & M68K_TTR_SFIELD) { >> case M68K_TTR_SFIELD_USER: >> - qemu_printf("U"); >> + monitor_puts(mon, "U"); >> break; >> case M68K_TTR_SFIELD_SUPER: >> - qemu_printf("S"); >> + monitor_puts(mon, "S"); >> break; >> default: >> - qemu_printf("*"); >> + monitor_puts(mon, "*"); >> break; >> } >> DUMP_CACHEFLAGS(ttr); >> if (ttr & M68K_DESC_WRITEPROT) { >> - qemu_printf("R"); >> + monitor_puts(mon, "R"); >> } else { >> - qemu_printf("W"); >> + monitor_puts(mon, "W"); >> } >> - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> >> + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> >> M68K_DESC_USERATTR_SHIFT); >> } >> >> -void dump_mmu(CPUM68KState *env) >> +void dump_mmu(Monitor *mon, CPUM68KState *env) >> { >> if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { >> - qemu_printf("Translation disabled\n"); >> + monitor_puts(mon, "Translation disabled\n"); >> return; >> } >> - qemu_printf("Page Size: "); >> + monitor_puts(mon, "Page Size: "); >> if (env->mmu.tcr & M68K_TCR_PAGE_8K) { >> - qemu_printf("8kB\n"); >> + monitor_puts(mon, "8kB\n"); >> } else { >> - qemu_printf("4kB\n"); >> + monitor_puts(mon, "4kB\n"); >> } >> >> - qemu_printf("MMUSR: "); >> + monitor_puts(mon, "MMUSR: "); >> if (env->mmu.mmusr & M68K_MMU_B_040) { >> - qemu_printf("BUS ERROR\n"); >> + monitor_puts(mon, "BUS ERROR\n"); >> } else { >> - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); >> + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); >> /* flags found on the page descriptor */ >> if (env->mmu.mmusr & M68K_MMU_G_040) { >> - qemu_printf("G"); /* Global */ >> + monitor_puts(mon, "G"); /* Global */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> if (env->mmu.mmusr & M68K_MMU_S_040) { >> - qemu_printf("S"); /* Supervisor */ >> + monitor_puts(mon, "S"); /* Supervisor */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> if (env->mmu.mmusr & M68K_MMU_M_040) { >> - qemu_printf("M"); /* Modified */ >> + monitor_puts(mon, "M"); /* Modified */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> if (env->mmu.mmusr & M68K_MMU_WP_040) { >> - qemu_printf("W"); /* Write protect */ >> + monitor_puts(mon, "W"); /* Write protect */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> if (env->mmu.mmusr & M68K_MMU_T_040) { >> - qemu_printf("T"); /* Transparent */ >> + monitor_puts(mon, "T"); /* Transparent */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> if (env->mmu.mmusr & M68K_MMU_R_040) { >> - qemu_printf("R"); /* Resident */ >> + monitor_puts(mon, "R"); /* Resident */ >> } else { >> - qemu_printf("."); >> + monitor_puts(mon, "."); >> } >> - qemu_printf(" Cache: "); >> + monitor_puts(mon, " Cache: "); >> DUMP_CACHEFLAGS(env->mmu.mmusr); >> - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); >> - qemu_printf("\n"); >> + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); >> + monitor_puts(mon, "\n"); > > That one is a little odd isn't it; still, generally Doesn't puts append a newline? Then this would add an extra empty line. Regards, BALATON Zoltan > Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org> > >> } >> >> - qemu_printf("ITTR0: "); >> - dump_ttr(env->mmu.ttr[M68K_ITTR0]); >> - qemu_printf("ITTR1: "); >> - dump_ttr(env->mmu.ttr[M68K_ITTR1]); >> - qemu_printf("DTTR0: "); >> - dump_ttr(env->mmu.ttr[M68K_DTTR0]); >> - qemu_printf("DTTR1: "); >> - dump_ttr(env->mmu.ttr[M68K_DTTR1]); >> + monitor_puts(mon, "ITTR0: "); >> + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); >> + monitor_puts(mon, "ITTR1: "); >> + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); >> + monitor_puts(mon, "DTTR0: "); >> + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); >> + monitor_puts(mon, "DTTR1: "); >> + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); >> >> - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); >> - dump_address_map(env, env->mmu.srp); >> + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); >> + dump_address_map(mon, env, env->mmu.srp); >> >> - qemu_printf("URP: 0x%08x\n", env->mmu.urp); >> - dump_address_map(env, env->mmu.urp); >> + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); >> + dump_address_map(mon, env, env->mmu.urp); >> } >> >> static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, >> diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c >> index 2bdf6acae0..623c6ab635 100644 >> --- a/target/m68k/monitor.c >> +++ b/target/m68k/monitor.c >> @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) >> CPUArchState *env1 = mon_get_cpu_env(mon); >> >> if (!env1) { >> - monitor_printf(mon, "No CPU available\n"); >> + monitor_puts(mon, "No CPU available\n"); >> return; >> } >> >> - dump_mmu(env1); >> + dump_mmu(mon, env1); >> } >> >> static const MonitorDef monitor_defs[] = { >> -- >> 2.41.0 >> >
* BALATON Zoltan (balaton@eik.bme.hu) wrote: > On Sun, 24 Mar 2024, Dr. David Alan Gilbert wrote: > > * Philippe Mathieu-Daudé (philmd@linaro.org) wrote: > > > Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. > > > > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > > --- > > > target/m68k/cpu.h | 2 +- > > > target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- > > > target/m68k/monitor.c | 4 +- > > > 3 files changed, 67 insertions(+), 65 deletions(-) > > > > > > diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h > > > index 346427e144..4e4307956d 100644 > > > --- a/target/m68k/cpu.h > > > +++ b/target/m68k/cpu.h > > > @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, > > > } > > > } > > > > > > -void dump_mmu(CPUM68KState *env); > > > +void dump_mmu(Monitor *mon, CPUM68KState *env); > > > > > > #endif > > > diff --git a/target/m68k/helper.c b/target/m68k/helper.c > > > index 1a475f082a..310e26dfa1 100644 > > > --- a/target/m68k/helper.c > > > +++ b/target/m68k/helper.c > > > @@ -25,7 +25,7 @@ > > > #include "exec/helper-proto.h" > > > #include "gdbstub/helpers.h" > > > #include "fpu/softfloat.h" > > > -#include "qemu/qemu-print.h" > > > +#include "monitor/monitor.h" > > > > > > #define SIGNBIT (1u << 31) > > > > > > @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) > > > #if !defined(CONFIG_USER_ONLY) > > > /* MMU: 68040 only */ > > > > > > -static void print_address_zone(uint32_t logical, uint32_t physical, > > > +static void print_address_zone(Monitor *mon, > > > + uint32_t logical, uint32_t physical, > > > uint32_t size, int attr) > > > { > > > - qemu_printf("%08x - %08x -> %08x - %08x %c ", > > > - logical, logical + size - 1, > > > - physical, physical + size - 1, > > > - attr & 4 ? 'W' : '-'); > > > + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", > > > + logical, logical + size - 1, > > > + physical, physical + size - 1, > > > + attr & 4 ? 'W' : '-'); > > > size >>= 10; > > > if (size < 1024) { > > > - qemu_printf("(%d KiB)\n", size); > > > + monitor_printf(mon, "(%d KiB)\n", size); > > > } else { > > > size >>= 10; > > > if (size < 1024) { > > > - qemu_printf("(%d MiB)\n", size); > > > + monitor_printf(mon, "(%d MiB)\n", size); > > > } else { > > > size >>= 10; > > > - qemu_printf("(%d GiB)\n", size); > > > + monitor_printf(mon, "(%d GiB)\n", size); > > > } > > > } > > > } > > > > > > -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > > > +static void dump_address_map(Monitor *mon, CPUM68KState *env, > > > + uint32_t root_pointer) > > > { > > > int i, j, k; > > > int tic_size, tic_shift; > > > @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > > > if (first_logical != 0xffffffff) { > > > size = last_logical + (1 << tic_shift) - > > > first_logical; > > > - print_address_zone(first_logical, > > > + print_address_zone(mon, first_logical, > > > first_physical, size, last_attr); > > > } > > > first_logical = logical; > > > @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > > > } > > > if (first_logical != logical || (attr & 4) != (last_attr & 4)) { > > > size = logical + (1 << tic_shift) - first_logical; > > > - print_address_zone(first_logical, first_physical, size, last_attr); > > > + print_address_zone(mon, first_logical, first_physical, size, last_attr); > > > } > > > } > > > > > > #define DUMP_CACHEFLAGS(a) \ > > > switch (a & M68K_DESC_CACHEMODE) { \ > > > case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ > > > - qemu_printf("T"); \ > > > + monitor_puts(mon, "T"); \ > > > break; \ > > > case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ > > > - qemu_printf("C"); \ > > > + monitor_puts(mon, "C"); \ > > > break; \ > > > case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ > > > - qemu_printf("S"); \ > > > + monitor_puts(mon, "S"); \ > > > break; \ > > > case M68K_DESC_CM_NCACHE: /* noncachable */ \ > > > - qemu_printf("N"); \ > > > + monitor_puts(mon, "N"); \ > > > break; \ > > > } > > > > > > -static void dump_ttr(uint32_t ttr) > > > +static void dump_ttr(Monitor *mon, uint32_t ttr) > > > { > > > if ((ttr & M68K_TTR_ENABLED) == 0) { > > > - qemu_printf("disabled\n"); > > > + monitor_puts(mon, "disabled\n"); > > > return; > > > } > > > - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", > > > - ttr & M68K_TTR_ADDR_BASE, > > > - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > > > + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", > > > + ttr & M68K_TTR_ADDR_BASE, > > > + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > > > switch (ttr & M68K_TTR_SFIELD) { > > > case M68K_TTR_SFIELD_USER: > > > - qemu_printf("U"); > > > + monitor_puts(mon, "U"); > > > break; > > > case M68K_TTR_SFIELD_SUPER: > > > - qemu_printf("S"); > > > + monitor_puts(mon, "S"); > > > break; > > > default: > > > - qemu_printf("*"); > > > + monitor_puts(mon, "*"); > > > break; > > > } > > > DUMP_CACHEFLAGS(ttr); > > > if (ttr & M68K_DESC_WRITEPROT) { > > > - qemu_printf("R"); > > > + monitor_puts(mon, "R"); > > > } else { > > > - qemu_printf("W"); > > > + monitor_puts(mon, "W"); > > > } > > > - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> > > > + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> > > > M68K_DESC_USERATTR_SHIFT); > > > } > > > > > > -void dump_mmu(CPUM68KState *env) > > > +void dump_mmu(Monitor *mon, CPUM68KState *env) > > > { > > > if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { > > > - qemu_printf("Translation disabled\n"); > > > + monitor_puts(mon, "Translation disabled\n"); > > > return; > > > } > > > - qemu_printf("Page Size: "); > > > + monitor_puts(mon, "Page Size: "); > > > if (env->mmu.tcr & M68K_TCR_PAGE_8K) { > > > - qemu_printf("8kB\n"); > > > + monitor_puts(mon, "8kB\n"); > > > } else { > > > - qemu_printf("4kB\n"); > > > + monitor_puts(mon, "4kB\n"); > > > } > > > > > > - qemu_printf("MMUSR: "); > > > + monitor_puts(mon, "MMUSR: "); > > > if (env->mmu.mmusr & M68K_MMU_B_040) { > > > - qemu_printf("BUS ERROR\n"); > > > + monitor_puts(mon, "BUS ERROR\n"); > > > } else { > > > - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > > > + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > > > /* flags found on the page descriptor */ > > > if (env->mmu.mmusr & M68K_MMU_G_040) { > > > - qemu_printf("G"); /* Global */ > > > + monitor_puts(mon, "G"); /* Global */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > if (env->mmu.mmusr & M68K_MMU_S_040) { > > > - qemu_printf("S"); /* Supervisor */ > > > + monitor_puts(mon, "S"); /* Supervisor */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > if (env->mmu.mmusr & M68K_MMU_M_040) { > > > - qemu_printf("M"); /* Modified */ > > > + monitor_puts(mon, "M"); /* Modified */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > if (env->mmu.mmusr & M68K_MMU_WP_040) { > > > - qemu_printf("W"); /* Write protect */ > > > + monitor_puts(mon, "W"); /* Write protect */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > if (env->mmu.mmusr & M68K_MMU_T_040) { > > > - qemu_printf("T"); /* Transparent */ > > > + monitor_puts(mon, "T"); /* Transparent */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > if (env->mmu.mmusr & M68K_MMU_R_040) { > > > - qemu_printf("R"); /* Resident */ > > > + monitor_puts(mon, "R"); /* Resident */ > > > } else { > > > - qemu_printf("."); > > > + monitor_puts(mon, "."); > > > } > > > - qemu_printf(" Cache: "); > > > + monitor_puts(mon, " Cache: "); > > > DUMP_CACHEFLAGS(env->mmu.mmusr); > > > - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); > > > - qemu_printf("\n"); > > > + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); > > > + monitor_puts(mon, "\n"); > > > > That one is a little odd isn't it; still, generally > > Doesn't puts append a newline? Then this would add an extra empty line. As rth said, apparently not. But what made me more curious in this case is why not just flatten it down so that the printf has a second \n rather than needing the second call to puts. Dave > Regards, > BALATON Zoltan > > > Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org> > > > > > } > > > > > > - qemu_printf("ITTR0: "); > > > - dump_ttr(env->mmu.ttr[M68K_ITTR0]); > > > - qemu_printf("ITTR1: "); > > > - dump_ttr(env->mmu.ttr[M68K_ITTR1]); > > > - qemu_printf("DTTR0: "); > > > - dump_ttr(env->mmu.ttr[M68K_DTTR0]); > > > - qemu_printf("DTTR1: "); > > > - dump_ttr(env->mmu.ttr[M68K_DTTR1]); > > > + monitor_puts(mon, "ITTR0: "); > > > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); > > > + monitor_puts(mon, "ITTR1: "); > > > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); > > > + monitor_puts(mon, "DTTR0: "); > > > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); > > > + monitor_puts(mon, "DTTR1: "); > > > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); > > > > > > - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); > > > - dump_address_map(env, env->mmu.srp); > > > + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); > > > + dump_address_map(mon, env, env->mmu.srp); > > > > > > - qemu_printf("URP: 0x%08x\n", env->mmu.urp); > > > - dump_address_map(env, env->mmu.urp); > > > + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); > > > + dump_address_map(mon, env, env->mmu.urp); > > > } > > > > > > static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, > > > diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c > > > index 2bdf6acae0..623c6ab635 100644 > > > --- a/target/m68k/monitor.c > > > +++ b/target/m68k/monitor.c > > > @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) > > > CPUArchState *env1 = mon_get_cpu_env(mon); > > > > > > if (!env1) { > > > - monitor_printf(mon, "No CPU available\n"); > > > + monitor_puts(mon, "No CPU available\n"); > > > return; > > > } > > > > > > - dump_mmu(env1); > > > + dump_mmu(mon, env1); > > > } > > > > > > static const MonitorDef monitor_defs[] = { > > > -- > > > 2.41.0 > > > > >
On Thu, 28 Mar 2024, Dr. David Alan Gilbert wrote: > * BALATON Zoltan (balaton@eik.bme.hu) wrote: >> On Sun, 24 Mar 2024, Dr. David Alan Gilbert wrote: >>> * Philippe Mathieu-Daudé (philmd@linaro.org) wrote: >>>> Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. >>>> >>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>>> --- >>>> target/m68k/cpu.h | 2 +- >>>> target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- >>>> target/m68k/monitor.c | 4 +- >>>> 3 files changed, 67 insertions(+), 65 deletions(-) >>>> >>>> diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h >>>> index 346427e144..4e4307956d 100644 >>>> --- a/target/m68k/cpu.h >>>> +++ b/target/m68k/cpu.h >>>> @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, >>>> } >>>> } >>>> >>>> -void dump_mmu(CPUM68KState *env); >>>> +void dump_mmu(Monitor *mon, CPUM68KState *env); >>>> >>>> #endif >>>> diff --git a/target/m68k/helper.c b/target/m68k/helper.c >>>> index 1a475f082a..310e26dfa1 100644 >>>> --- a/target/m68k/helper.c >>>> +++ b/target/m68k/helper.c >>>> @@ -25,7 +25,7 @@ >>>> #include "exec/helper-proto.h" >>>> #include "gdbstub/helpers.h" >>>> #include "fpu/softfloat.h" >>>> -#include "qemu/qemu-print.h" >>>> +#include "monitor/monitor.h" >>>> >>>> #define SIGNBIT (1u << 31) >>>> >>>> @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) >>>> #if !defined(CONFIG_USER_ONLY) >>>> /* MMU: 68040 only */ >>>> >>>> -static void print_address_zone(uint32_t logical, uint32_t physical, >>>> +static void print_address_zone(Monitor *mon, >>>> + uint32_t logical, uint32_t physical, >>>> uint32_t size, int attr) >>>> { >>>> - qemu_printf("%08x - %08x -> %08x - %08x %c ", >>>> - logical, logical + size - 1, >>>> - physical, physical + size - 1, >>>> - attr & 4 ? 'W' : '-'); >>>> + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", >>>> + logical, logical + size - 1, >>>> + physical, physical + size - 1, >>>> + attr & 4 ? 'W' : '-'); >>>> size >>= 10; >>>> if (size < 1024) { >>>> - qemu_printf("(%d KiB)\n", size); >>>> + monitor_printf(mon, "(%d KiB)\n", size); >>>> } else { >>>> size >>= 10; >>>> if (size < 1024) { >>>> - qemu_printf("(%d MiB)\n", size); >>>> + monitor_printf(mon, "(%d MiB)\n", size); >>>> } else { >>>> size >>= 10; >>>> - qemu_printf("(%d GiB)\n", size); >>>> + monitor_printf(mon, "(%d GiB)\n", size); >>>> } >>>> } >>>> } >>>> >>>> -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >>>> +static void dump_address_map(Monitor *mon, CPUM68KState *env, >>>> + uint32_t root_pointer) >>>> { >>>> int i, j, k; >>>> int tic_size, tic_shift; >>>> @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >>>> if (first_logical != 0xffffffff) { >>>> size = last_logical + (1 << tic_shift) - >>>> first_logical; >>>> - print_address_zone(first_logical, >>>> + print_address_zone(mon, first_logical, >>>> first_physical, size, last_attr); >>>> } >>>> first_logical = logical; >>>> @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) >>>> } >>>> if (first_logical != logical || (attr & 4) != (last_attr & 4)) { >>>> size = logical + (1 << tic_shift) - first_logical; >>>> - print_address_zone(first_logical, first_physical, size, last_attr); >>>> + print_address_zone(mon, first_logical, first_physical, size, last_attr); >>>> } >>>> } >>>> >>>> #define DUMP_CACHEFLAGS(a) \ >>>> switch (a & M68K_DESC_CACHEMODE) { \ >>>> case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ >>>> - qemu_printf("T"); \ >>>> + monitor_puts(mon, "T"); \ >>>> break; \ >>>> case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ >>>> - qemu_printf("C"); \ >>>> + monitor_puts(mon, "C"); \ >>>> break; \ >>>> case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ >>>> - qemu_printf("S"); \ >>>> + monitor_puts(mon, "S"); \ >>>> break; \ >>>> case M68K_DESC_CM_NCACHE: /* noncachable */ \ >>>> - qemu_printf("N"); \ >>>> + monitor_puts(mon, "N"); \ >>>> break; \ >>>> } >>>> >>>> -static void dump_ttr(uint32_t ttr) >>>> +static void dump_ttr(Monitor *mon, uint32_t ttr) >>>> { >>>> if ((ttr & M68K_TTR_ENABLED) == 0) { >>>> - qemu_printf("disabled\n"); >>>> + monitor_puts(mon, "disabled\n"); >>>> return; >>>> } >>>> - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", >>>> - ttr & M68K_TTR_ADDR_BASE, >>>> - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); >>>> + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", >>>> + ttr & M68K_TTR_ADDR_BASE, >>>> + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); >>>> switch (ttr & M68K_TTR_SFIELD) { >>>> case M68K_TTR_SFIELD_USER: >>>> - qemu_printf("U"); >>>> + monitor_puts(mon, "U"); >>>> break; >>>> case M68K_TTR_SFIELD_SUPER: >>>> - qemu_printf("S"); >>>> + monitor_puts(mon, "S"); >>>> break; >>>> default: >>>> - qemu_printf("*"); >>>> + monitor_puts(mon, "*"); >>>> break; >>>> } >>>> DUMP_CACHEFLAGS(ttr); >>>> if (ttr & M68K_DESC_WRITEPROT) { >>>> - qemu_printf("R"); >>>> + monitor_puts(mon, "R"); >>>> } else { >>>> - qemu_printf("W"); >>>> + monitor_puts(mon, "W"); >>>> } >>>> - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> >>>> + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> >>>> M68K_DESC_USERATTR_SHIFT); >>>> } >>>> >>>> -void dump_mmu(CPUM68KState *env) >>>> +void dump_mmu(Monitor *mon, CPUM68KState *env) >>>> { >>>> if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { >>>> - qemu_printf("Translation disabled\n"); >>>> + monitor_puts(mon, "Translation disabled\n"); >>>> return; >>>> } >>>> - qemu_printf("Page Size: "); >>>> + monitor_puts(mon, "Page Size: "); >>>> if (env->mmu.tcr & M68K_TCR_PAGE_8K) { >>>> - qemu_printf("8kB\n"); >>>> + monitor_puts(mon, "8kB\n"); >>>> } else { >>>> - qemu_printf("4kB\n"); >>>> + monitor_puts(mon, "4kB\n"); >>>> } >>>> >>>> - qemu_printf("MMUSR: "); >>>> + monitor_puts(mon, "MMUSR: "); >>>> if (env->mmu.mmusr & M68K_MMU_B_040) { >>>> - qemu_printf("BUS ERROR\n"); >>>> + monitor_puts(mon, "BUS ERROR\n"); >>>> } else { >>>> - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); >>>> + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); >>>> /* flags found on the page descriptor */ >>>> if (env->mmu.mmusr & M68K_MMU_G_040) { >>>> - qemu_printf("G"); /* Global */ >>>> + monitor_puts(mon, "G"); /* Global */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> if (env->mmu.mmusr & M68K_MMU_S_040) { >>>> - qemu_printf("S"); /* Supervisor */ >>>> + monitor_puts(mon, "S"); /* Supervisor */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> if (env->mmu.mmusr & M68K_MMU_M_040) { >>>> - qemu_printf("M"); /* Modified */ >>>> + monitor_puts(mon, "M"); /* Modified */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> if (env->mmu.mmusr & M68K_MMU_WP_040) { >>>> - qemu_printf("W"); /* Write protect */ >>>> + monitor_puts(mon, "W"); /* Write protect */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> if (env->mmu.mmusr & M68K_MMU_T_040) { >>>> - qemu_printf("T"); /* Transparent */ >>>> + monitor_puts(mon, "T"); /* Transparent */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> if (env->mmu.mmusr & M68K_MMU_R_040) { >>>> - qemu_printf("R"); /* Resident */ >>>> + monitor_puts(mon, "R"); /* Resident */ >>>> } else { >>>> - qemu_printf("."); >>>> + monitor_puts(mon, "."); >>>> } >>>> - qemu_printf(" Cache: "); >>>> + monitor_puts(mon, " Cache: "); >>>> DUMP_CACHEFLAGS(env->mmu.mmusr); >>>> - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); >>>> - qemu_printf("\n"); >>>> + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); >>>> + monitor_puts(mon, "\n"); >>> >>> That one is a little odd isn't it; still, generally >> >> Doesn't puts append a newline? Then this would add an extra empty line. > > As rth said, apparently not. > But what made me more curious in this case is why not just flatten it > down so that the printf has a second \n rather than needing the second > call to puts. Maybe because monitor_puts also seems to have a flush so that separate call would do an additional flush to make sure the previously printed lines are displayed? But I have no idea just guessing. Regards, BALATON Zoltan
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. Why? Here's my attempt at an answer: because this runs only within HMP command "info tlb". Using qemu_printf() there isn't wrong, but with monitor_printf(), it's obvious that we print to the monitor. On monitor_printf() vs. monitor_puts(). qemu_printf() behaves like monitor_printf() when monitor_cur() returns non-null, which it certainly does within a monitor command. monitor_printf() prints like monitor_puts() when monitor_is_qmp() returns false, which it certainly does within an HMP command. Note: despite their names, monitor_printf() and monitor_puts() are at different interface layers! We need a low-level function to send to a monitor, be it HMP or QMP: monitor_puts(). We need a high-level function to format JSON and send it to QMP: qmp_send_response(). We need a high-level functions to format text and send it to HMP: monitor_printf(), ... Naming the functions that expect an HMP monitor hmp_FOO() would make more sense. Renaming them now would be quite some churn, though. Discussed at <https://lore.kernel.org/qemu-devel/87y1adm0os.fsf@pond.sub.org/>. HMP code using both two layers to print gives me a slightly queasy feeling. It's not wrong, though. > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/m68k/cpu.h | 2 +- > target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- > target/m68k/monitor.c | 4 +- > 3 files changed, 67 insertions(+), 65 deletions(-) > > diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h > index 346427e144..4e4307956d 100644 > --- a/target/m68k/cpu.h > +++ b/target/m68k/cpu.h > @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, > } > } > > -void dump_mmu(CPUM68KState *env); > +void dump_mmu(Monitor *mon, CPUM68KState *env); > > #endif > diff --git a/target/m68k/helper.c b/target/m68k/helper.c > index 1a475f082a..310e26dfa1 100644 > --- a/target/m68k/helper.c > +++ b/target/m68k/helper.c > @@ -25,7 +25,7 @@ > #include "exec/helper-proto.h" > #include "gdbstub/helpers.h" > #include "fpu/softfloat.h" > -#include "qemu/qemu-print.h" > +#include "monitor/monitor.h" > > #define SIGNBIT (1u << 31) > > @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) > #if !defined(CONFIG_USER_ONLY) > /* MMU: 68040 only */ > > -static void print_address_zone(uint32_t logical, uint32_t physical, > +static void print_address_zone(Monitor *mon, > + uint32_t logical, uint32_t physical, > uint32_t size, int attr) > { > - qemu_printf("%08x - %08x -> %08x - %08x %c ", > - logical, logical + size - 1, > - physical, physical + size - 1, > - attr & 4 ? 'W' : '-'); > + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", > + logical, logical + size - 1, > + physical, physical + size - 1, > + attr & 4 ? 'W' : '-'); > size >>= 10; > if (size < 1024) { > - qemu_printf("(%d KiB)\n", size); > + monitor_printf(mon, "(%d KiB)\n", size); > } else { > size >>= 10; > if (size < 1024) { > - qemu_printf("(%d MiB)\n", size); > + monitor_printf(mon, "(%d MiB)\n", size); > } else { > size >>= 10; > - qemu_printf("(%d GiB)\n", size); > + monitor_printf(mon, "(%d GiB)\n", size); > } > } > } > > -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > +static void dump_address_map(Monitor *mon, CPUM68KState *env, > + uint32_t root_pointer) > { > int i, j, k; > int tic_size, tic_shift; > @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > if (first_logical != 0xffffffff) { > size = last_logical + (1 << tic_shift) - > first_logical; > - print_address_zone(first_logical, > + print_address_zone(mon, first_logical, > first_physical, size, last_attr); > } > first_logical = logical; > @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) > } > if (first_logical != logical || (attr & 4) != (last_attr & 4)) { > size = logical + (1 << tic_shift) - first_logical; > - print_address_zone(first_logical, first_physical, size, last_attr); > + print_address_zone(mon, first_logical, first_physical, size, last_attr); > } > } > > #define DUMP_CACHEFLAGS(a) \ > switch (a & M68K_DESC_CACHEMODE) { \ > case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ > - qemu_printf("T"); \ > + monitor_puts(mon, "T"); \ Not wrong, but I'd stick to monitor_printf() to keep the transformation as simple as possible, and to sidestep the need for explaining the subtleties around monitor_printf() vs. monitor_puts() in the commit message. > break; \ > case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ > - qemu_printf("C"); \ > + monitor_puts(mon, "C"); \ Likewise. Not going to note this again. > break; \ > case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ > - qemu_printf("S"); \ > + monitor_puts(mon, "S"); \ > break; \ > case M68K_DESC_CM_NCACHE: /* noncachable */ \ > - qemu_printf("N"); \ > + monitor_puts(mon, "N"); \ > break; \ > } > > -static void dump_ttr(uint32_t ttr) > +static void dump_ttr(Monitor *mon, uint32_t ttr) > { > if ((ttr & M68K_TTR_ENABLED) == 0) { > - qemu_printf("disabled\n"); > + monitor_puts(mon, "disabled\n"); > return; > } > - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", > - ttr & M68K_TTR_ADDR_BASE, > - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", > + ttr & M68K_TTR_ADDR_BASE, > + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); > switch (ttr & M68K_TTR_SFIELD) { > case M68K_TTR_SFIELD_USER: > - qemu_printf("U"); > + monitor_puts(mon, "U"); > break; > case M68K_TTR_SFIELD_SUPER: > - qemu_printf("S"); > + monitor_puts(mon, "S"); > break; > default: > - qemu_printf("*"); > + monitor_puts(mon, "*"); > break; > } > DUMP_CACHEFLAGS(ttr); > if (ttr & M68K_DESC_WRITEPROT) { > - qemu_printf("R"); > + monitor_puts(mon, "R"); > } else { > - qemu_printf("W"); > + monitor_puts(mon, "W"); > } > - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> > + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> > M68K_DESC_USERATTR_SHIFT); > } > > -void dump_mmu(CPUM68KState *env) > +void dump_mmu(Monitor *mon, CPUM68KState *env) > { > if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { > - qemu_printf("Translation disabled\n"); > + monitor_puts(mon, "Translation disabled\n"); > return; > } > - qemu_printf("Page Size: "); > + monitor_puts(mon, "Page Size: "); > if (env->mmu.tcr & M68K_TCR_PAGE_8K) { > - qemu_printf("8kB\n"); > + monitor_puts(mon, "8kB\n"); > } else { > - qemu_printf("4kB\n"); > + monitor_puts(mon, "4kB\n"); > } > > - qemu_printf("MMUSR: "); > + monitor_puts(mon, "MMUSR: "); > if (env->mmu.mmusr & M68K_MMU_B_040) { > - qemu_printf("BUS ERROR\n"); > + monitor_puts(mon, "BUS ERROR\n"); > } else { > - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); > /* flags found on the page descriptor */ > if (env->mmu.mmusr & M68K_MMU_G_040) { > - qemu_printf("G"); /* Global */ > + monitor_puts(mon, "G"); /* Global */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_S_040) { > - qemu_printf("S"); /* Supervisor */ > + monitor_puts(mon, "S"); /* Supervisor */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_M_040) { > - qemu_printf("M"); /* Modified */ > + monitor_puts(mon, "M"); /* Modified */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_WP_040) { > - qemu_printf("W"); /* Write protect */ > + monitor_puts(mon, "W"); /* Write protect */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_T_040) { > - qemu_printf("T"); /* Transparent */ > + monitor_puts(mon, "T"); /* Transparent */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > if (env->mmu.mmusr & M68K_MMU_R_040) { > - qemu_printf("R"); /* Resident */ > + monitor_puts(mon, "R"); /* Resident */ > } else { > - qemu_printf("."); > + monitor_puts(mon, "."); > } > - qemu_printf(" Cache: "); > + monitor_puts(mon, " Cache: "); > DUMP_CACHEFLAGS(env->mmu.mmusr); > - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); > - qemu_printf("\n"); > + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); > + monitor_puts(mon, "\n"); > } > > - qemu_printf("ITTR0: "); > - dump_ttr(env->mmu.ttr[M68K_ITTR0]); > - qemu_printf("ITTR1: "); > - dump_ttr(env->mmu.ttr[M68K_ITTR1]); > - qemu_printf("DTTR0: "); > - dump_ttr(env->mmu.ttr[M68K_DTTR0]); > - qemu_printf("DTTR1: "); > - dump_ttr(env->mmu.ttr[M68K_DTTR1]); > + monitor_puts(mon, "ITTR0: "); > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); > + monitor_puts(mon, "ITTR1: "); > + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); > + monitor_puts(mon, "DTTR0: "); > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); > + monitor_puts(mon, "DTTR1: "); > + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); > > - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); > - dump_address_map(env, env->mmu.srp); > + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); > + dump_address_map(mon, env, env->mmu.srp); > > - qemu_printf("URP: 0x%08x\n", env->mmu.urp); > - dump_address_map(env, env->mmu.urp); > + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); > + dump_address_map(mon, env, env->mmu.urp); > } > > static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, > diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c > index 2bdf6acae0..623c6ab635 100644 > --- a/target/m68k/monitor.c > +++ b/target/m68k/monitor.c > @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) > CPUArchState *env1 = mon_get_cpu_env(mon); > > if (!env1) { > - monitor_printf(mon, "No CPU available\n"); > + monitor_puts(mon, "No CPU available\n"); > return; > } > > - dump_mmu(env1); > + dump_mmu(mon, env1); > } > > static const MonitorDef monitor_defs[] = { In addition to replacing qemu_printf(), the patch passes the current monitor around. The alternative is monitor_cur(). I guess you pass because you consider it cleaner and/or simpler. No objection, but I suggest to mention it the commit message. The patch is not wrong, so Reviewed-by: Markus Armbruster <armbru@redhat.com>
On Wed, 24 Apr 2024, Markus Armbruster wrote: > Philippe Mathieu-Daudé <philmd@linaro.org> writes: > >> Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. > > Why? Here's my attempt at an answer: because this runs only within HMP > command "info tlb". Using qemu_printf() there isn't wrong, but with > monitor_printf(), it's obvious that we print to the monitor. > > On monitor_printf() vs. monitor_puts(). > > qemu_printf() behaves like monitor_printf() when monitor_cur() returns > non-null, which it certainly does within a monitor command. > > monitor_printf() prints like monitor_puts() when monitor_is_qmp() > returns false, which it certainly does within an HMP command. > > Note: despite their names, monitor_printf() and monitor_puts() are at > different interface layers! > > We need a low-level function to send to a monitor, be it HMP or QMP: > monitor_puts(). > > We need a high-level function to format JSON and send it to QMP: > qmp_send_response(). > > We need a high-level functions to format text and send it to HMP: > monitor_printf(), ... > > Naming the functions that expect an HMP monitor hmp_FOO() would make > more sense. Renaming them now would be quite some churn, though. > Discussed at > <https://lore.kernel.org/qemu-devel/87y1adm0os.fsf@pond.sub.org/>. The hmp_ prefix is more cryptic than monitor_. Without knowing QEMU too much I can guess what monitor_ does but would have to look up what hmp_means so keeping monitor_ is better IMO. The solution to the naming issue mentioned above may be renaming monitor_puts to something that tells it's a low level function (and add a momitor_puts that behaves as expected) but I can't come up with a name either. Maybe the low level function could be called hmp_putt? Or add a comment near monitor_puts to explain this for now. Regards, BALATON Zoltan
On Wed, 24 Apr 2024, BALATON Zoltan wrote: > On Wed, 24 Apr 2024, Markus Armbruster wrote: >> Philippe Mathieu-Daudé <philmd@linaro.org> writes: >> >>> Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. >> >> Why? Here's my attempt at an answer: because this runs only within HMP >> command "info tlb". Using qemu_printf() there isn't wrong, but with >> monitor_printf(), it's obvious that we print to the monitor. >> >> On monitor_printf() vs. monitor_puts(). >> >> qemu_printf() behaves like monitor_printf() when monitor_cur() returns >> non-null, which it certainly does within a monitor command. >> >> monitor_printf() prints like monitor_puts() when monitor_is_qmp() >> returns false, which it certainly does within an HMP command. >> >> Note: despite their names, monitor_printf() and monitor_puts() are at >> different interface layers! >> >> We need a low-level function to send to a monitor, be it HMP or QMP: >> monitor_puts(). >> >> We need a high-level function to format JSON and send it to QMP: >> qmp_send_response(). >> >> We need a high-level functions to format text and send it to HMP: >> monitor_printf(), ... >> >> Naming the functions that expect an HMP monitor hmp_FOO() would make >> more sense. Renaming them now would be quite some churn, though. >> Discussed at >> <https://lore.kernel.org/qemu-devel/87y1adm0os.fsf@pond.sub.org/>. > > The hmp_ prefix is more cryptic than monitor_. Without knowing QEMU too much > I can guess what monitor_ does but would have to look up what hmp_means so > keeping monitor_ is better IMO. The solution to the naming issue mentioned > above may be renaming monitor_puts to something that tells it's a low level > function (and add a momitor_puts that behaves as expected) but I can't come > up with a name either. Maybe the low level function could be called hmp_putt? Meant hmp_puts. > Or add a comment near monitor_puts to explain this for now. > Regards, > BALATON Zoltan
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 346427e144..4e4307956d 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, } } -void dump_mmu(CPUM68KState *env); +void dump_mmu(Monitor *mon, CPUM68KState *env); #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 1a475f082a..310e26dfa1 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -25,7 +25,7 @@ #include "exec/helper-proto.h" #include "gdbstub/helpers.h" #include "fpu/softfloat.h" -#include "qemu/qemu-print.h" +#include "monitor/monitor.h" #define SIGNBIT (1u << 31) @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) #if !defined(CONFIG_USER_ONLY) /* MMU: 68040 only */ -static void print_address_zone(uint32_t logical, uint32_t physical, +static void print_address_zone(Monitor *mon, + uint32_t logical, uint32_t physical, uint32_t size, int attr) { - qemu_printf("%08x - %08x -> %08x - %08x %c ", - logical, logical + size - 1, - physical, physical + size - 1, - attr & 4 ? 'W' : '-'); + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", + logical, logical + size - 1, + physical, physical + size - 1, + attr & 4 ? 'W' : '-'); size >>= 10; if (size < 1024) { - qemu_printf("(%d KiB)\n", size); + monitor_printf(mon, "(%d KiB)\n", size); } else { size >>= 10; if (size < 1024) { - qemu_printf("(%d MiB)\n", size); + monitor_printf(mon, "(%d MiB)\n", size); } else { size >>= 10; - qemu_printf("(%d GiB)\n", size); + monitor_printf(mon, "(%d GiB)\n", size); } } } -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) +static void dump_address_map(Monitor *mon, CPUM68KState *env, + uint32_t root_pointer) { int i, j, k; int tic_size, tic_shift; @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) if (first_logical != 0xffffffff) { size = last_logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, + print_address_zone(mon, first_logical, first_physical, size, last_attr); } first_logical = logical; @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) } if (first_logical != logical || (attr & 4) != (last_attr & 4)) { size = logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, first_physical, size, last_attr); + print_address_zone(mon, first_logical, first_physical, size, last_attr); } } #define DUMP_CACHEFLAGS(a) \ switch (a & M68K_DESC_CACHEMODE) { \ case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ - qemu_printf("T"); \ + monitor_puts(mon, "T"); \ break; \ case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ - qemu_printf("C"); \ + monitor_puts(mon, "C"); \ break; \ case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ - qemu_printf("S"); \ + monitor_puts(mon, "S"); \ break; \ case M68K_DESC_CM_NCACHE: /* noncachable */ \ - qemu_printf("N"); \ + monitor_puts(mon, "N"); \ break; \ } -static void dump_ttr(uint32_t ttr) +static void dump_ttr(Monitor *mon, uint32_t ttr) { if ((ttr & M68K_TTR_ENABLED) == 0) { - qemu_printf("disabled\n"); + monitor_puts(mon, "disabled\n"); return; } - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", - ttr & M68K_TTR_ADDR_BASE, - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); + monitor_printf(mon, "Base: 0x%08x Mask: 0x%08x Control: ", + ttr & M68K_TTR_ADDR_BASE, + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); switch (ttr & M68K_TTR_SFIELD) { case M68K_TTR_SFIELD_USER: - qemu_printf("U"); + monitor_puts(mon, "U"); break; case M68K_TTR_SFIELD_SUPER: - qemu_printf("S"); + monitor_puts(mon, "S"); break; default: - qemu_printf("*"); + monitor_puts(mon, "*"); break; } DUMP_CACHEFLAGS(ttr); if (ttr & M68K_DESC_WRITEPROT) { - qemu_printf("R"); + monitor_puts(mon, "R"); } else { - qemu_printf("W"); + monitor_puts(mon, "W"); } - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> M68K_DESC_USERATTR_SHIFT); } -void dump_mmu(CPUM68KState *env) +void dump_mmu(Monitor *mon, CPUM68KState *env) { if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { - qemu_printf("Translation disabled\n"); + monitor_puts(mon, "Translation disabled\n"); return; } - qemu_printf("Page Size: "); + monitor_puts(mon, "Page Size: "); if (env->mmu.tcr & M68K_TCR_PAGE_8K) { - qemu_printf("8kB\n"); + monitor_puts(mon, "8kB\n"); } else { - qemu_printf("4kB\n"); + monitor_puts(mon, "4kB\n"); } - qemu_printf("MMUSR: "); + monitor_puts(mon, "MMUSR: "); if (env->mmu.mmusr & M68K_MMU_B_040) { - qemu_printf("BUS ERROR\n"); + monitor_puts(mon, "BUS ERROR\n"); } else { - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); /* flags found on the page descriptor */ if (env->mmu.mmusr & M68K_MMU_G_040) { - qemu_printf("G"); /* Global */ + monitor_puts(mon, "G"); /* Global */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_S_040) { - qemu_printf("S"); /* Supervisor */ + monitor_puts(mon, "S"); /* Supervisor */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_M_040) { - qemu_printf("M"); /* Modified */ + monitor_puts(mon, "M"); /* Modified */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_WP_040) { - qemu_printf("W"); /* Write protect */ + monitor_puts(mon, "W"); /* Write protect */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_T_040) { - qemu_printf("T"); /* Transparent */ + monitor_puts(mon, "T"); /* Transparent */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_R_040) { - qemu_printf("R"); /* Resident */ + monitor_puts(mon, "R"); /* Resident */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } - qemu_printf(" Cache: "); + monitor_puts(mon, " Cache: "); DUMP_CACHEFLAGS(env->mmu.mmusr); - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); - qemu_printf("\n"); + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); + monitor_puts(mon, "\n"); } - qemu_printf("ITTR0: "); - dump_ttr(env->mmu.ttr[M68K_ITTR0]); - qemu_printf("ITTR1: "); - dump_ttr(env->mmu.ttr[M68K_ITTR1]); - qemu_printf("DTTR0: "); - dump_ttr(env->mmu.ttr[M68K_DTTR0]); - qemu_printf("DTTR1: "); - dump_ttr(env->mmu.ttr[M68K_DTTR1]); + monitor_puts(mon, "ITTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); + monitor_puts(mon, "ITTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); + monitor_puts(mon, "DTTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); + monitor_puts(mon, "DTTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); - dump_address_map(env, env->mmu.srp); + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); + dump_address_map(mon, env, env->mmu.srp); - qemu_printf("URP: 0x%08x\n", env->mmu.urp); - dump_address_map(env, env->mmu.urp); + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); + dump_address_map(mon, env, env->mmu.urp); } static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 2bdf6acae0..623c6ab635 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) CPUArchState *env1 = mon_get_cpu_env(mon); if (!env1) { - monitor_printf(mon, "No CPU available\n"); + monitor_puts(mon, "No CPU available\n"); return; } - dump_mmu(env1); + dump_mmu(mon, env1); } static const MonitorDef monitor_defs[] = {
Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/m68k/cpu.h | 2 +- target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- target/m68k/monitor.c | 4 +- 3 files changed, 67 insertions(+), 65 deletions(-)