diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-03-14 11:34:50 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-03-14 11:34:50 -0500 |
commit | 076e1ebac2db58ae89e21041288f8c277a54a137 (patch) | |
tree | 9e8900dc83481fb9206d3f67c4d1859dab78e620 | |
parent | de4aa841546daa41da88bb8a427c05ff6cd4df4d (diff) | |
parent | 81169916aa2fb37536c8ae841424ac8640e1e0e1 (diff) | |
download | gem5-076e1ebac2db58ae89e21041288f8c277a54a137.tar.xz |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision : 9ac1a3bcbfce79300da3f1cb174239897275d8b4
-rw-r--r-- | dev/pciconfigall.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dev/pciconfigall.cc b/dev/pciconfigall.cc index 1a9804f79..2cbd5adc0 100644 --- a/dev/pciconfigall.cc +++ b/dev/pciconfigall.cc @@ -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; |