summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorAndrea Mondelli <Andrea.Mondelli@ucf.edu>2019-02-22 11:29:10 -0500
committerAndrea Mondelli <Andrea.Mondelli@ucf.edu>2019-03-01 16:46:47 +0000
commit96cc03f90db82fa8f84248ef478362267dba292c (patch)
tree973f9dad0038300ba7fd761c3ef2cbfb1e56bf67 /src/arch/x86
parenta7eebbfa693e3fa55c0a9c876b97adcf72662c71 (diff)
downloadgem5-96cc03f90db82fa8f84248ef478362267dba292c.tar.xz
mem-cache: alias to mem::getMasterPort in TLB class
TLB:getMasterPort is used to obtain the PageWalkMasterPort if present and hides the BaseTLB::getMasterPort(). The TLB::getMasterPort() is renamed according to the expected behavior. Change-Id: If4f61189094a706d59805cd10f4f814e5830eda8 Reviewed-on: https://gem5-review.googlesource.com/c/16648 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/tlb.cc2
-rw-r--r--src/arch/x86/tlb.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/tlb.cc b/src/arch/x86/tlb.cc
index 829ebce00..59fd3f00a 100644
--- a/src/arch/x86/tlb.cc
+++ b/src/arch/x86/tlb.cc
@@ -512,7 +512,7 @@ TLB::unserialize(CheckpointIn &cp)
}
BaseMasterPort *
-TLB::getMasterPort()
+TLB::getTableWalkerMasterPort()
{
return &walker->getMasterPort("port");
}
diff --git a/src/arch/x86/tlb.hh b/src/arch/x86/tlb.hh
index 827ab8166..8894a1e4a 100644
--- a/src/arch/x86/tlb.hh
+++ b/src/arch/x86/tlb.hh
@@ -165,7 +165,7 @@ namespace X86ISA
*
* @return A pointer to the walker master port
*/
- BaseMasterPort *getMasterPort() override;
+ BaseMasterPort *getTableWalkerMasterPort() override;
};
}