mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/mips/gt64xxx_pci: Convert debug printf()s to trace events

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20190624222844.26584-7-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2019-06-25 00:28:40 +02:00 committed by Aleksandar Markovic
parent 641ca2bfcd
commit ab6bff424f
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -163,6 +163,7 @@ trace-events-subdirs += hw/input
trace-events-subdirs += hw/intc trace-events-subdirs += hw/intc
trace-events-subdirs += hw/isa trace-events-subdirs += hw/isa
trace-events-subdirs += hw/mem trace-events-subdirs += hw/mem
trace-events-subdirs += hw/mips
trace-events-subdirs += hw/misc trace-events-subdirs += hw/misc
trace-events-subdirs += hw/misc/macio trace-events-subdirs += hw/misc/macio
trace-events-subdirs += hw/net trace-events-subdirs += hw/net

29
hw/mips/gt64xxx_pci.c
View File

@ -30,14 +30,7 @@
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "trace.h"
//#define DEBUG
#ifdef DEBUG
#define DPRINTF(fmt, ...) fprintf(stderr, "%s: " fmt, __func__, ##__VA_ARGS__)
#else
#define DPRINTF(fmt, ...)
#endif
#define GT_REGS (0x1000 >> 2) #define GT_REGS (0x1000 >> 2)
@ -294,9 +287,7 @@ static void gt64120_isd_mapping(GT64120State *s)
check_reserved_space(&start, &length); check_reserved_space(&start, &length);
length = 0x1000; length = 0x1000;
/* Map new address */ /* Map new address */
DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx trace_gt64120_isd_remap(s->ISD_length, s->ISD_start, length, start);
" -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n",
s->ISD_length, s->ISD_start, length, start);
s->ISD_start = start; s->ISD_start = start;
s->ISD_length = length; s->ISD_length = length;
memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem); memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem);
@ -648,19 +639,19 @@ static void gt64120_writel(void *opaque, hwaddr addr,
/* not really implemented */ /* not really implemented */
s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe)); s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe); s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
DPRINTF("INTRCAUSE %" PRIx64 "\n", val); trace_gt64120_write("INTRCAUSE", size << 1, val);
break; break;
case GT_INTRMASK: case GT_INTRMASK:
s->regs[saddr] = val & 0x3c3ffffe; s->regs[saddr] = val & 0x3c3ffffe;
DPRINTF("INTRMASK %" PRIx64 "\n", val); trace_gt64120_write("INTRMASK", size << 1, val);
break; break;
case GT_PCI0_ICMASK: case GT_PCI0_ICMASK:
s->regs[saddr] = val & 0x03fffffe; s->regs[saddr] = val & 0x03fffffe;
DPRINTF("ICMASK %" PRIx64 "\n", val); trace_gt64120_write("ICMASK", size << 1, val);
break; break;
case GT_PCI0_SERR0MASK: case GT_PCI0_SERR0MASK:
s->regs[saddr] = val & 0x0000003f; s->regs[saddr] = val & 0x0000003f;
DPRINTF("SERR0MASK %" PRIx64 "\n", val); trace_gt64120_write("SERR0MASK", size << 1, val);
break; break;
/* Reserved when only PCI_0 is configured. */ /* Reserved when only PCI_0 is configured. */
@ -936,19 +927,19 @@ static uint64_t gt64120_readl(void *opaque,
/* Interrupts */ /* Interrupts */
case GT_INTRCAUSE: case GT_INTRCAUSE:
val = s->regs[saddr]; val = s->regs[saddr];
DPRINTF("INTRCAUSE %x\n", val); trace_gt64120_read("INTRCAUSE", size << 1, val);
break; break;
case GT_INTRMASK: case GT_INTRMASK:
val = s->regs[saddr]; val = s->regs[saddr];
DPRINTF("INTRMASK %x\n", val); trace_gt64120_read("INTRMASK", size << 1, val);
break; break;
case GT_PCI0_ICMASK: case GT_PCI0_ICMASK:
val = s->regs[saddr]; val = s->regs[saddr];
DPRINTF("ICMASK %x\n", val); trace_gt64120_read("ICMASK", size << 1, val);
break; break;
case GT_PCI0_SERR0MASK: case GT_PCI0_SERR0MASK:
val = s->regs[saddr]; val = s->regs[saddr];
DPRINTF("SERR0MASK %x\n", val); trace_gt64120_read("SERR0MASK", size << 1, val);
break; break;
/* Reserved when only PCI_0 is configured. */ /* Reserved when only PCI_0 is configured. */

4
hw/mips/trace-events Normal file
View File

@ -0,0 +1,4 @@
# gt64xxx.c
gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64
gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64
gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64