From 96cc03f90db82fa8f84248ef478362267dba292c Mon Sep 17 00:00:00 2001 From: Andrea Mondelli Date: Fri, 22 Feb 2019 11:29:10 -0500 Subject: 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 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg --- src/arch/x86/tlb.cc | 2 +- src/arch/x86/tlb.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arch/x86') 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; }; } -- cgit v1.2.3