derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected some mistakes in the hand merge

Browse Source 
--HG--
extra : convert_revision : 84d852e625f754c4414403e8c3e26bda80500d4f
This commit is contained in:
Gabe Black
2006-02-28 06:28:09 -05:00
parent 8e6b8cb212
commit 3a362d04b7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dev/sinic.cc
View File

@@ -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);