mirror of https://gitee.com/openkylin/qemu.git
hw/sh4: Change debug printfs to traces
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <b776043e811ab3caf200515e1350bdcccd1cc47b.1635541329.git.balaton@eik.bme.hu> [PMD: Fixed format strings for 32-bit hosts] Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
BALATON Zoltan
Philippe Mathieu-Daudé
parent
3b885dabd0
commit
ad52cfc137
|
|
@ -31,8 +31,7 @@
|
|||
#include "chardev/char-fe.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/timer.h"
|
||||
|
||||
//#define DEBUG_SERIAL
|
||||
#include "trace.h"
|
||||
|
||||
#define SH_SERIAL_FLAG_TEND (1 << 0)
|
||||
#define SH_SERIAL_FLAG_TDE (1 << 1)
|
||||
|
|
@ -89,10 +88,7 @@ static void sh_serial_write(void *opaque, hwaddr offs,
|
|||
sh_serial_state *s = opaque;
|
||||
unsigned char ch;
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
printf("sh_serial: write offs=0x%02x val=0x%02x\n",
|
||||
offs, val);
|
||||
#endif
|
||||
trace_sh_serial_write(size, offs, val);
|
||||
switch (offs) {
|
||||
case 0x00: /* SMR */
|
||||
s->smr = val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0x7b : 0xff);
|
||||
|
|
@ -301,10 +297,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
|
|||
break;
|
||||
}
|
||||
}
|
||||
#ifdef DEBUG_SERIAL
|
||||
printf("sh_serial: read offs=0x%02x val=0x%x\n",
|
||||
offs, ret);
|
||||
#endif
|
||||
trace_sh_serial_read(size, offs, ret);
|
||||
|
||||
if (ret & ~((1 << 16) - 1)) {
|
||||
fprintf(stderr, "sh_serial: unsupported read from 0x%02"
|
||||
|
|
|
|||
|
|
@ -101,3 +101,7 @@ exynos_uart_rx_timeout(uint32_t channel, uint32_t stat, uint32_t intsp) "UART%d:
|
|||
|
||||
# cadence_uart.c
|
||||
cadence_uart_baudrate(unsigned baudrate) "baudrate %u"
|
||||
|
||||
# sh_serial.c
|
||||
sh_serial_read(unsigned size, uint64_t offs, uint64_t val) " size %d offs 0x%02" PRIx64 " -> 0x%02" PRIx64
|
||||
sh_serial_write(unsigned size, uint64_t offs, uint64_t val) "size %d offs 0x%02" PRIx64 " <- 0x%02" PRIx64
|
||||
|
|
|
|||
|
|
@ -9,13 +9,12 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/log.h"
|
||||
#include "cpu.h"
|
||||
#include "hw/sh4/sh_intc.h"
|
||||
#include "hw/irq.h"
|
||||
#include "hw/sh4/sh.h"
|
||||
|
||||
//#define DEBUG_INTC
|
||||
//#define DEBUG_INTC_SOURCES
|
||||
#include "trace.h"
|
||||
|
||||
#define INTC_A7(x) ((x) & 0x1fffffff)
|
||||
|
||||
|
|
@ -57,20 +56,14 @@ void sh_intc_toggle_source(struct intc_source *source,
|
|||
}
|
||||
}
|
||||
|
||||
if (enable_changed || assert_adj || pending_changed) {
|
||||
#ifdef DEBUG_INTC_SOURCES
|
||||
printf("sh_intc: (%d/%d/%d/%d) interrupt source 0x%x %s%s%s\n",
|
||||
source->parent->pending,
|
||||
source->asserted,
|
||||
source->enable_count,
|
||||
source->enable_max,
|
||||
source->vect,
|
||||
source->asserted ? "asserted " :
|
||||
assert_adj ? "deasserted" : "",
|
||||
enable_changed == 1 ? "enabled " :
|
||||
enable_changed == -1 ? "disabled " : "",
|
||||
source->pending ? "pending" : "");
|
||||
#endif
|
||||
if (enable_changed || assert_adj || pending_changed) {
|
||||
trace_sh_intc_sources(source->parent->pending, source->asserted,
|
||||
source->enable_count, source->enable_max,
|
||||
source->vect, source->asserted ? "asserted " :
|
||||
assert_adj ? "deasserted" : "",
|
||||
enable_changed == 1 ? "enabled " :
|
||||
enable_changed == -1 ? "disabled " : "",
|
||||
source->pending ? "pending" : "");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -101,10 +94,7 @@ int sh_intc_get_pending_vector(struct intc_desc *desc, int imask)
|
|||
struct intc_source *source = desc->sources + i;
|
||||
|
||||
if (source->pending) {
|
||||
#ifdef DEBUG_INTC_SOURCES
|
||||
printf("sh_intc: (%d) returning interrupt source 0x%x\n",
|
||||
desc->pending, source->vect);
|
||||
#endif
|
||||
trace_sh_intc_pending(desc->pending, source->vect);
|
||||
return source->vect;
|
||||
}
|
||||
}
|
||||
|
|
@ -199,30 +189,22 @@ static void sh_intc_toggle_mask(struct intc_desc *desc, intc_enum id,
|
|||
return;
|
||||
}
|
||||
if (!source->next_enum_id && (!source->enable_max || !source->vect)) {
|
||||
#ifdef DEBUG_INTC_SOURCES
|
||||
printf("sh_intc: reserved interrupt source %d modified\n", id);
|
||||
#endif
|
||||
qemu_log_mask(LOG_UNIMP,
|
||||
"sh_intc: reserved interrupt source %d modified\n", id);
|
||||
return;
|
||||
}
|
||||
|
||||
if (source->vect) {
|
||||
sh_intc_toggle_source(source, enable ? 1 : -1, 0);
|
||||
}
|
||||
#ifdef DEBUG_INTC
|
||||
else {
|
||||
printf("setting interrupt group %d to %d\n", id, !!enable);
|
||||
}
|
||||
#endif
|
||||
|
||||
if ((is_group || !source->vect) && source->next_enum_id) {
|
||||
sh_intc_toggle_mask(desc, source->next_enum_id, enable, 1);
|
||||
}
|
||||
|
||||
#ifdef DEBUG_INTC
|
||||
if (!source->vect) {
|
||||
printf("setting interrupt group %d to %d - done\n", id, !!enable);
|
||||
trace_sh_intc_set(id, !!enable);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static uint64_t sh_intc_read(void *opaque, hwaddr offset,
|
||||
|
|
@ -235,12 +217,9 @@ static uint64_t sh_intc_read(void *opaque, hwaddr offset,
|
|||
unsigned int mode = 0;
|
||||
unsigned long *valuep;
|
||||
|
||||
#ifdef DEBUG_INTC
|
||||
printf("sh_intc_read 0x%lx\n", (unsigned long) offset);
|
||||
#endif
|
||||
|
||||
sh_intc_locate(desc, (unsigned long)offset, &valuep,
|
||||
&enum_ids, &first, &width, &mode);
|
||||
trace_sh_intc_read(size, (uint64_t)offset, *valuep);
|
||||
return *valuep;
|
||||
}
|
||||
|
||||
|
|
@ -256,13 +235,9 @@ static void sh_intc_write(void *opaque, hwaddr offset,
|
|||
unsigned long *valuep;
|
||||
unsigned long mask;
|
||||
|
||||
#ifdef DEBUG_INTC
|
||||
printf("sh_intc_write 0x%lx 0x%08x\n", (unsigned long) offset, value);
|
||||
#endif
|
||||
|
||||
trace_sh_intc_write(size, (uint64_t)offset, value);
|
||||
sh_intc_locate(desc, (unsigned long)offset, &valuep,
|
||||
&enum_ids, &first, &width, &mode);
|
||||
|
||||
switch (mode) {
|
||||
case INTC_MODE_ENABLE_REG | INTC_MODE_IS_PRIO:
|
||||
break;
|
||||
|
|
@ -282,18 +257,10 @@ static void sh_intc_write(void *opaque, hwaddr offset,
|
|||
if ((*valuep & mask) == (value & mask)) {
|
||||
continue;
|
||||
}
|
||||
#if 0
|
||||
printf("k = %d, first = %d, enum = %d, mask = 0x%08x\n",
|
||||
k, first, enum_ids[k], (unsigned int)mask);
|
||||
#endif
|
||||
sh_intc_toggle_mask(desc, enum_ids[k], value & mask, 0);
|
||||
}
|
||||
|
||||
*valuep = value;
|
||||
|
||||
#ifdef DEBUG_INTC
|
||||
printf("sh_intc_write 0x%lx -> 0x%08x\n", (unsigned long) offset, value);
|
||||
#endif
|
||||
}
|
||||
|
||||
static const MemoryRegionOps sh_intc_ops = {
|
||||
|
|
@ -416,11 +383,8 @@ void sh_intc_register_sources(struct intc_desc *desc,
|
|||
s = sh_intc_source(desc, vect->enum_id);
|
||||
if (s) {
|
||||
s->vect = vect->vect;
|
||||
|
||||
#ifdef DEBUG_INTC_SOURCES
|
||||
printf("sh_intc: registered source %d -> 0x%04x (%d/%d)\n",
|
||||
vect->enum_id, s->vect, s->enable_count, s->enable_max);
|
||||
#endif
|
||||
trace_sh_intc_register("source", vect->enum_id, s->vect,
|
||||
s->enable_count, s->enable_max);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -438,11 +402,8 @@ void sh_intc_register_sources(struct intc_desc *desc,
|
|||
s = sh_intc_source(desc, gr->enum_ids[k - 1]);
|
||||
s->next_enum_id = gr->enum_ids[k];
|
||||
}
|
||||
|
||||
#ifdef DEBUG_INTC_SOURCES
|
||||
printf("sh_intc: registered group %d (%d/%d)\n",
|
||||
gr->enum_id, s->enable_count, s->enable_max);
|
||||
#endif
|
||||
trace_sh_intc_register("group", gr->enum_id, 0xffff,
|
||||
s->enable_count, s->enable_max);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,3 +238,11 @@ goldfish_pic_write(void *dev, int idx, unsigned int addr, unsigned int size, uin
|
|||
goldfish_pic_reset(void *dev, int idx) "pic: %p goldfish-irq.%d"
|
||||
goldfish_pic_realize(void *dev, int idx) "pic: %p goldfish-irq.%d"
|
||||
goldfish_pic_instance_init(void *dev) "pic: %p goldfish-irq"
|
||||
|
||||
# sh_intc.c
|
||||
sh_intc_sources(int p, int a, int c, int m, unsigned short v, const char *s1, const char *s2, const char *s3) "(%d/%d/%d/%d) interrupt source 0x%x %s%s%s"
|
||||
sh_intc_pending(int p, unsigned short v) "(%d) returning interrupt source 0x%x"
|
||||
sh_intc_register(const char *s, int id, unsigned short v, int c, int m) "%s %u -> 0x%04x (%d/%d)"
|
||||
sh_intc_read(unsigned size, uint64_t offset, unsigned long val) "size %u 0x%" PRIx64 " -> 0x%lx"
|
||||
sh_intc_write(unsigned size, uint64_t offset, unsigned long val) "size %u 0x%" PRIx64 " <- 0x%lx"
|
||||
sh_intc_set(int id, int enable) "setting interrupt group %d to %d"
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include "hw/sh4/sh_intc.h"
|
||||
#include "hw/timer/tmu012.h"
|
||||
#include "exec/exec-all.h"
|
||||
#include "trace.h"
|
||||
|
||||
#define NB_DEVICES 4
|
||||
|
||||
|
|
@ -147,15 +148,11 @@ static void porta_changed(SH7750State *s, uint16_t prev)
|
|||
uint16_t currenta, changes;
|
||||
int i, r = 0;
|
||||
|
||||
#if 0
|
||||
fprintf(stderr, "porta changed from 0x%04x to 0x%04x\n",
|
||||
prev, porta_lines(s));
|
||||
fprintf(stderr, "pdtra=0x%04x, pctra=0x%08x\n", s->pdtra, s->pctra);
|
||||
#endif
|
||||
currenta = porta_lines(s);
|
||||
if (currenta == prev) {
|
||||
return;
|
||||
}
|
||||
trace_sh7750_porta(prev, currenta, s->pdtra, s->pctra);
|
||||
changes = currenta ^ prev;
|
||||
|
||||
for (i = 0; i < NB_DEVICES; i++) {
|
||||
|
|
@ -182,6 +179,7 @@ static void portb_changed(SH7750State *s, uint16_t prev)
|
|||
if (currentb == prev) {
|
||||
return;
|
||||
}
|
||||
trace_sh7750_portb(prev, currentb, s->pdtrb, s->pctrb);
|
||||
changes = currentb ^ prev;
|
||||
|
||||
for (i = 0; i < NB_DEVICES; i++) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
# sh7750.c
|
||||
sh7750_porta(uint16_t prev, uint16_t cur, uint16_t pdtr, uint16_t pctr) "porta changed from 0x%04x to 0x%04x\npdtra=0x%04x, pctra=0x%08x"
|
||||
sh7750_portb(uint16_t prev, uint16_t cur, uint16_t pdtr, uint16_t pctr) "portb changed from 0x%04x to 0x%04x\npdtrb=0x%04x, pctrb=0x%08x"
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include "trace/trace-hw_sh4.h"
|
||||
|
|
@ -15,8 +15,7 @@
|
|||
#include "hw/sh4/sh.h"
|
||||
#include "hw/timer/tmu012.h"
|
||||
#include "hw/ptimer.h"
|
||||
|
||||
//#define DEBUG_TIMER
|
||||
#include "trace.h"
|
||||
|
||||
#define TIMER_TCR_TPSC (7 << 0)
|
||||
#define TIMER_TCR_CKEG (3 << 3)
|
||||
|
|
@ -203,10 +202,7 @@ static void sh_timer_start_stop(void *opaque, int enable)
|
|||
{
|
||||
sh_timer_state *s = (sh_timer_state *)opaque;
|
||||
|
||||
#ifdef DEBUG_TIMER
|
||||
printf("sh_timer_start_stop %d (%d)\n", enable, s->enabled);
|
||||
#endif
|
||||
|
||||
trace_sh_timer_start_stop(enable, s->enabled);
|
||||
ptimer_transaction_begin(s->timer);
|
||||
if (s->enabled && !enable) {
|
||||
ptimer_stop(s->timer);
|
||||
|
|
@ -216,10 +212,6 @@ static void sh_timer_start_stop(void *opaque, int enable)
|
|||
}
|
||||
ptimer_transaction_commit(s->timer);
|
||||
s->enabled = !!enable;
|
||||
|
||||
#ifdef DEBUG_TIMER
|
||||
printf("sh_timer_start_stop done %d\n", s->enabled);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void sh_timer_tick(void *opaque)
|
||||
|
|
@ -269,10 +261,7 @@ static uint64_t tmu012_read(void *opaque, hwaddr offset,
|
|||
{
|
||||
tmu012_state *s = (tmu012_state *)opaque;
|
||||
|
||||
#ifdef DEBUG_TIMER
|
||||
printf("tmu012_read 0x%lx\n", (unsigned long) offset);
|
||||
#endif
|
||||
|
||||
trace_sh_timer_read(offset);
|
||||
if (offset >= 0x20) {
|
||||
if (!(s->feat & TMU012_FEAT_3CHAN)) {
|
||||
hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
|
||||
|
|
@ -302,10 +291,7 @@ static void tmu012_write(void *opaque, hwaddr offset,
|
|||
{
|
||||
tmu012_state *s = (tmu012_state *)opaque;
|
||||
|
||||
#ifdef DEBUG_TIMER
|
||||
printf("tmu012_write 0x%lx 0x%08x\n", (unsigned long) offset, value);
|
||||
#endif
|
||||
|
||||
trace_sh_timer_write(offset, value);
|
||||
if (offset >= 0x20) {
|
||||
if (!(s->feat & TMU012_FEAT_3CHAN)) {
|
||||
hw_error("tmu012_write: Bad channel offset %x\n", (int)offset);
|
||||
|
|
|
|||
|
|
@ -94,3 +94,8 @@ sifive_pwm_set_alarm(uint64_t alarm, uint64_t now) "Setting alarm to: 0x%" PRIx6
|
|||
sifive_pwm_interrupt(int num) "Interrupt %d"
|
||||
sifive_pwm_read(uint64_t offset) "Read at address: 0x%" PRIx64
|
||||
sifive_pwm_write(uint64_t data, uint64_t offset) "Write 0x%" PRIx64 " at address: 0x%" PRIx64
|
||||
|
||||
# sh_timer.c
|
||||
sh_timer_start_stop(int enable, int current) "%d (%d)"
|
||||
sh_timer_read(uint64_t offset) "tmu012_read 0x%" PRIx64
|
||||
sh_timer_write(uint64_t offset, uint64_t value) "tmu012_write 0x%" PRIx64 " 0x%08" PRIx64
|
||||
|
|
|
|||
|
|
@ -2459,6 +2459,7 @@ if have_system
|
|||
'hw/s390x',
|
||||
'hw/scsi',
|
||||
'hw/sd',
|
||||
'hw/sh4',
|
||||
'hw/sparc',
|
||||
'hw/sparc64',
|
||||
'hw/ssi',
|
||||
|
|
|
|||
Loading…
Reference in New Issue