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/cpu/base.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/base.cc b/src/cpu/base.cc index 30f6baf20..09de64646 100644 --- a/src/cpu/base.cc +++ b/src/cpu/base.cc @@ -621,10 +621,14 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU) ThreadContext::compare(oldTC, newTC); */ - BaseMasterPort *old_itb_port = oldTC->getITBPtr()->getMasterPort(); - BaseMasterPort *old_dtb_port = oldTC->getDTBPtr()->getMasterPort(); - BaseMasterPort *new_itb_port = newTC->getITBPtr()->getMasterPort(); - BaseMasterPort *new_dtb_port = newTC->getDTBPtr()->getMasterPort(); + BaseMasterPort *old_itb_port = + oldTC->getITBPtr()->getTableWalkerMasterPort(); + BaseMasterPort *old_dtb_port = + oldTC->getDTBPtr()->getTableWalkerMasterPort(); + BaseMasterPort *new_itb_port = + newTC->getITBPtr()->getTableWalkerMasterPort(); + BaseMasterPort *new_dtb_port = + newTC->getDTBPtr()->getTableWalkerMasterPort(); // Move over any table walker ports if they exist if (new_itb_port) { @@ -652,13 +656,13 @@ BaseCPU::takeOverFrom(BaseCPU *oldCPU) CheckerCPU *newChecker = newTC->getCheckerCpuPtr(); if (oldChecker && newChecker) { BaseMasterPort *old_checker_itb_port = - oldChecker->getITBPtr()->getMasterPort(); + oldChecker->getITBPtr()->getTableWalkerMasterPort(); BaseMasterPort *old_checker_dtb_port = - oldChecker->getDTBPtr()->getMasterPort(); + oldChecker->getDTBPtr()->getTableWalkerMasterPort(); BaseMasterPort *new_checker_itb_port = - newChecker->getITBPtr()->getMasterPort(); + newChecker->getITBPtr()->getTableWalkerMasterPort(); BaseMasterPort *new_checker_dtb_port = - newChecker->getDTBPtr()->getMasterPort(); + newChecker->getDTBPtr()->getTableWalkerMasterPort(); newChecker->getITBPtr()->takeOverFrom(oldChecker->getITBPtr()); newChecker->getDTBPtr()->takeOverFrom(oldChecker->getDTBPtr()); -- cgit v1.2.3