summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2009-02-01 00:11:49 -0800
committerGabe Black <gblack@eecs.umich.edu>2009-02-01 00:11:49 -0800
commit06cdbe5ea7138d0f340448438d64e98c72936e1b (patch)
treeea76d71c923b25f0498ff1126080187a65c33829 /src
parent483c3e96b7e30d3bd788f32c5b421133e71ec476 (diff)
downloadgem5-06cdbe5ea7138d0f340448438d64e98c72936e1b.tar.xz
X86: Compute PCI config addresses correctly.
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/tlb.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 6f1c1a03c..1009386d7 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -547,7 +547,8 @@ TLB::translate(RequestPtr &req, ThreadContext *tc, bool write, bool execute)
tc->readMiscRegNoEffect(MISCREG_PCI_CONFIG_ADDRESS);
if (bits(configAddress, 31, 31)) {
req->setPaddr(PhysAddrPrefixPciConfig |
- bits(configAddress, 30, 0));
+ mbits(configAddress, 30, 2) |
+ (IOPort & mask(2)));
}
} else {
req->setPaddr(PhysAddrPrefixIO | IOPort);