summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-28 06:28:09 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-28 06:28:09 -0500
commit3a362d04b7aed0fa728af9373bad175a096a7de8 (patch)
tree6e6681245b754c5d4ded244c87f737f5d5823144 /dev
parent8e6b8cb212ba79978056b57dd60c60a39f6428e9 (diff)
downloadgem5-3a362d04b7aed0fa728af9373bad175a096a7de8.tar.xz
Corrected some mistakes in the hand merge
--HG-- extra : convert_revision : 84d852e625f754c4414403e8c3e26bda80500d4f
Diffstat (limited to 'dev')
-rw-r--r--dev/sinic.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/dev/sinic.cc b/dev/sinic.cc
index 1c0e59e0a..31d651249 100644
--- a/dev/sinic.cc
+++ b/dev/sinic.cc
@@ -489,18 +489,13 @@ 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);
- //These are commmented out because when the DPRINTF below isn't used,
- //these values aren't used and gcc issues a warning. With -Werror,
- //this prevents compilation.
- //uint32_t reg32 = *(uint32_t *)data;
- //uint64_t reg64 = *(uint64_t *)data;
+ uint32_t reg32 = *(uint32_t *)data;
+ uint64_t reg64 = *(uint64_t *)data;
VirtualReg &vnic = virtualRegs[index];
DPRINTF(EthernetPIO,
"write %s: cpu=%d val=%#x da=%#x pa=%#x va=%#x size=%d\n",
- info.name, cpu, info.size == 4 ?
- (*(uint32_t *)data) :
- (*(uint64_t *)data),
+ info.name, cpu, info.size == 4 ? reg32 : reg64,
daddr, req->paddr, req->vaddr, req->size);
prepareWrite(cpu, index);