diff options
| author | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-30 11:51:12 +0000 |
|---|---|---|
| committer | edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-06-30 11:51:12 +0000 |
| commit | d27b2e5044b143f9e522d6c3e80f498eb083a618 (patch) | |
| tree | bc31ec480e2fb9fe1ee1b0160ea8e07da791eb96 /hw/etraxfs_timer.c | |
| parent | d077b6f759d6758e0d2a80f053448f152ca2ba6d (diff) | |
Avoid refering to CRIS specific cpu-state to be able to use these blocks with other cores.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4806 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/etraxfs_timer.c')
| -rw-r--r-- | hw/etraxfs_timer.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c index 789992a2d..8d4505192 100644 --- a/hw/etraxfs_timer.c +++ b/hw/etraxfs_timer.c @@ -80,15 +80,14 @@ static uint32_t timer_rinvalid (void *opaque, target_phys_addr_t addr) { struct fs_timer_t *t = opaque; CPUState *env = t->env; - cpu_abort(env, "Unsupported short access. reg=" TARGET_FMT_plx - " pc=%x.\n", addr, env->pc); + cpu_abort(env, "Unsupported short access. reg=" TARGET_FMT_plx "\n", + addr); return 0; } static uint32_t timer_readl (void *opaque, target_phys_addr_t addr) { struct fs_timer_t *t = opaque; - D(CPUState *env = t->env); uint32_t r = 0; /* Make addr relative to this instances base. */ @@ -109,7 +108,7 @@ static uint32_t timer_readl (void *opaque, target_phys_addr_t addr) r = t->r_intr & t->rw_intr_mask; break; default: - D(printf ("%s %x p=%x\n", __func__, addr, env->pc)); + D(printf ("%s %x\n", __func__, addr)); break; } return r; @@ -120,8 +119,8 @@ timer_winvalid (void *opaque, target_phys_addr_t addr, uint32_t value) { struct fs_timer_t *t = opaque; CPUState *env = t->env; - cpu_abort(env, "Unsupported short access. reg=" TARGET_FMT_plx - " pc=%x.\n", addr, env->pc); + cpu_abort(env, "Unsupported short access. reg=" TARGET_FMT_plx "\n", + addr); } #define TIMER_SLOWDOWN 1 @@ -273,7 +272,6 @@ static void timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) { struct fs_timer_t *t = opaque; - CPUState *env = t->env; /* Make addr relative to this instances base. */ addr -= t->base; @@ -309,8 +307,8 @@ timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) t->rw_ack_intr = 0; break; default: - printf ("%s " TARGET_FMT_plx " %x pc=%x\n", - __func__, addr, value, env->pc); + printf ("%s " TARGET_FMT_plx " %x\n", + __func__, addr, value); break; } } |