Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : 9ac1a3bcbfce79300da3f1cb174239897275d8b4
This commit is contained in:
Steve Reinhardt 2005-03-14 11:34:50 -05:00
commit 076e1ebac2

View file

@ -98,11 +98,12 @@ PciConfigAll::startup()
Fault
PciConfigAll::read(MemReqPtr &req, uint8_t *data)
{
DPRINTF(PciConfigAll, "read va=%#x size=%d\n",
req->vaddr, req->size);
Addr daddr = (req->paddr - (addr & EV5::PAddrImplMask));
DPRINTF(PciConfigAll, "read va=%#x da=%#x size=%d\n",
req->vaddr, daddr, req->size);
int device = (daddr >> 11) & 0x1F;
int func = (daddr >> 8) & 0x7;
int reg = daddr & 0xFF;