david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monitor: Use TARGET_PRI*PHYS to avoid TARGET_PHYS_ADDR_BITS ifdef

Browse Source 
Now we have TARGET_PRI*PHYS for printing target_phys_addr_t values,
we can use them in monitor.c rather than having duplicate code
in two arms of a TARGET_PHYS_ADDR_BITS ifdef.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Peter Maydell 2012-06-25 16:52:24 +01:00 committed by Blue Swirl
parent c1950a4e95
commit 66f27e63ae
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
monitor.c
View File

@ -1262,45 +1262,24 @@ static void do_print(Monitor *mon, const QDict *qdict)
int format = qdict_get_int(qdict, "format");
target_phys_addr_t val = qdict_get_int(qdict, "val");
#if TARGET_PHYS_ADDR_BITS == 32
switch(format) {
case 'o':
monitor_printf(mon, "%#o", val);
monitor_printf(mon, "%#" TARGET_PRIoPHYS, val);
break;
case 'x':
monitor_printf(mon, "%#x", val);
monitor_printf(mon, "%#" TARGET_PRIxPHYS, val);
break;
case 'u':
monitor_printf(mon, "%u", val);
monitor_printf(mon, "%" TARGET_PRIuPHYS, val);
break;
default:
case 'd':
monitor_printf(mon, "%d", val);
monitor_printf(mon, "%" TARGET_PRIdPHYS, val);
break;
case 'c':
monitor_printc(mon, val);
break;
}
#else
switch(format) {
case 'o':
monitor_printf(mon, "%#" PRIo64, val);
break;
case 'x':
monitor_printf(mon, "%#" PRIx64, val);
break;
case 'u':
monitor_printf(mon, "%" PRIu64, val);
break;
default:
case 'd':
monitor_printf(mon, "%" PRId64, val);
break;
case 'c':
monitor_printc(mon, val);
break;
}
#endif
monitor_printf(mon, "\n");
}