OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

g364fb: use trace framework

Browse Source 
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Hervé Poussineau 2011-08-26 21:20:11 +02:00 committed by Blue Swirl
parent 01c4330b58
commit b213b37072
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/g364fb.c
View File

@ -21,17 +21,7 @@
#include "mips.h" #include "mips.h"
#include "console.h" #include "console.h"
#include "pixel_ops.h" #include "pixel_ops.h"
#include "trace.h"
//#define DEBUG_G364
#ifdef DEBUG_G364
#define DPRINTF(fmt, ...) \
do { printf("g364: " fmt , ## __VA_ARGS__); } while (0)
#else
#define DPRINTF(fmt, ...) do {} while (0)
#endif
#define BADF(fmt, ...) \
do { fprintf(stderr, "g364 ERROR: " fmt , ## __VA_ARGS__);} while (0)
typedef struct G364State { typedef struct G364State {
/* hardware */ /* hardware */
@ -110,7 +100,8 @@ static void g364fb_draw_graphic8(G364State *s)
w = 4; w = 4;
break; break;
default: default:
BADF("unknown host depth %d\n", ds_get_bits_per_pixel(s->ds)); hw_error("g364: unknown host depth %d",
ds_get_bits_per_pixel(s->ds));
return; return;
} }
@ -262,7 +253,7 @@ static void g364fb_update_display(void *opaque)
} else if (s->depth == 8) { } else if (s->depth == 8) {
g364fb_draw_graphic8(s); g364fb_draw_graphic8(s);
} else { } else {
BADF("unknown guest depth %d\n", s->depth); error_report("g364: unknown guest depth %d", s->depth);
} }
qemu_irq_raise(s->irq); qemu_irq_raise(s->irq);
@ -304,7 +295,7 @@ static void g364fb_screen_dump(void *opaque, const char *filename)
FILE *f; FILE *f;
if (s->depth != 8) { if (s->depth != 8) {
BADF("unknown guest depth %d\n", s->depth); error_report("g364: unknown guest depth %d", s->depth);
return; return;
} }
@ -367,14 +358,15 @@ static uint32_t g364fb_ctrl_readl(void *opaque, target_phys_addr_t addr)
break; break;
default: default:
{ {
BADF("invalid read at [" TARGET_FMT_plx "]\n", addr); error_report("g364: invalid read at [" TARGET_FMT_plx "]",
addr);
val = 0; val = 0;
break; break;
} }
} }
} }
DPRINTF("read 0x%08x at [" TARGET_FMT_plx "]\n", val, addr); trace_g364fb_read(addr, val);
return val; return val;
} }
@ -419,7 +411,7 @@ static void g364fb_ctrl_writel(void *opaque, target_phys_addr_t addr, uint32_t v
{ {
G364State *s = opaque; G364State *s = opaque;
DPRINTF("write 0x%08x at [" TARGET_FMT_plx "]\n", val, addr); trace_g364fb_write(addr, val);
if (addr >= REG_CLR_PAL && addr < REG_CLR_PAL + 0x800) { if (addr >= REG_CLR_PAL && addr < REG_CLR_PAL + 0x800) {
/* color palette */ /* color palette */
@ -483,7 +475,8 @@ static void g364fb_ctrl_writel(void *opaque, target_phys_addr_t addr, uint32_t v
g364fb_reset(s); g364fb_reset(s);
break; break;
default: default:
BADF("invalid write of 0x%08x at [" TARGET_FMT_plx "]\n", val, addr); error_report("g364: invalid write of 0x%" PRIx64
" at [" TARGET_FMT_plx "]", val, addr);
break; break;
} }
} }

4
trace-events
View File

@ -284,6 +284,10 @@ disable qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, ui
disable qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64"" disable qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64""
disable qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu" disable qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"
# hw/g364fb.c
disable g364fb_read(uint64_t addr, uint32_t val) "read addr=0x%"PRIx64": 0x%x"
disable g364fb_write(uint64_t addr, uint32_t new) "write addr=0x%"PRIx64": 0x%x"
# hw/grlib_gptimer.c # hw/grlib_gptimer.c
disable grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and run" disable grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and run"
disable grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable config 0x%x" disable grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable config 0x%x"