diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-14 15:38:26 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-14 15:38:26 -0500 |
| commit | 76e6dd01ae4a534adad1d34398fefc819771a781 (patch) | |
| tree | a678ca355625b9199cbb0f64ca42d247e520accb /dev | |
| parent | c1f5b983f0c8cece7a8387b05b40889c9520fb39 (diff) | |
| parent | bc2923f78d739ad5ff42dee402c5ba27c02004f1 (diff) | |
| download | gem5-76e6dd01ae4a534adad1d34398fefc819771a781.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 9eed6f31249ff099464044b32b882b3cc041b57a
Diffstat (limited to 'dev')
| -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; |