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_eth.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_eth.c')
| -rw-r--r-- | hw/etraxfs_eth.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c index 96cec8ad21..9ef610fd19 100644 --- a/hw/etraxfs_eth.c +++ b/hw/etraxfs_eth.c @@ -330,15 +330,14 @@ static uint32_t eth_rinvalid (void *opaque, target_phys_addr_t addr) { struct fs_eth *eth = opaque; CPUState *env = eth->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 eth_readl (void *opaque, target_phys_addr_t addr) { struct fs_eth *eth = opaque; - D(CPUState *env = eth->env); uint32_t r = 0; /* Make addr relative to this instances base. */ @@ -350,7 +349,7 @@ static uint32_t eth_readl (void *opaque, target_phys_addr_t addr) break; default: r = eth->regs[addr]; - D(printf ("%s %x p=%x\n", __func__, addr, env->pc)); + D(printf ("%s %x\n", __func__, addr)); break; } return r; @@ -361,8 +360,8 @@ eth_winvalid (void *opaque, target_phys_addr_t addr, uint32_t value) { struct fs_eth *eth = opaque; CPUState *env = eth->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); } static void eth_update_ma(struct fs_eth *eth, int ma) |