diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-20 23:54:38 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-20 23:54:38 -0500 |
| commit | 466284b5d29ad0d44c1b020353cf7521be2b90de (patch) | |
| tree | 6a39222eab62c4b0c8dd184954696d9533b4c7b1 /dev | |
| parent | bdf3fd92ba3ebe1fd300238e8fd9cca4ae5c2614 (diff) | |
| parent | c22664845900727493097e961d2bc17fd9c60372 (diff) | |
| download | gem5-466284b5d29ad0d44c1b020353cf7521be2b90de.tar.xz | |
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision : 9d386beecc6d13625ff19ca72cbc3628dcd59d3c
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/sinic.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/sinic.cc b/dev/sinic.cc index 829d58d32..6ffd0a664 100644 --- a/dev/sinic.cc +++ b/dev/sinic.cc @@ -494,11 +494,11 @@ Device::writeBar0(MemReqPtr &req, Addr daddr, const uint8_t *data) panic("invalid size for %s: cpu=%d da=%#x pa=%#x va=%#x size=%d", info.name, cpu, daddr, req->paddr, req->vaddr, req->size); - uint32_t reg32 = *(uint32_t *)data; + //uint32_t reg32 = *(uint32_t *)data; uint64_t reg64 = *(uint64_t *)data; DPRINTF(EthernetPIO, "write %s: cpu=%d val=%#x da=%#x pa=%#x va=%#x size=%d\n", - info.name, cpu, info.size == 4 ? reg32 : reg64, daddr, + info.name, cpu, info.size == 4 ? (*(uint32_t *)data) : reg64, daddr, req->paddr, req->vaddr, req->size); prepareWrite(cpu, index); |