Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33527 )
Change subject: arch-riscv: Update instances of masterId
......................................................................
arch-riscv: Update instances of masterId
Change-Id: I0f90e0ddb231dd5c592fc3821d0cf3771857c6ac
---
M src/arch/riscv/pagetable_walker.cc
M src/arch/riscv/pagetable_walker.hh
M src/arch/x86/pagetable_walker.cc
M src/arch/x86/pagetable_walker.hh
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/arch/riscv/pagetable_walker.cc
b/src/arch/riscv/pagetable_walker.cc
index 786cb81..39d3ed2 100644
--- a/src/arch/riscv/pagetable_walker.cc
+++ b/src/arch/riscv/pagetable_walker.cc
@@ -396,7 +396,7 @@
else {
//If we didn't return, we're setting up another read.
RequestPtr request = std::make_shared<Request>(
- nextRead, oldRead->getSize(), flags, walker->masterId);
+ nextRead, oldRead->getSize(), flags, walker->_id);
read = new Packet(request, MemCmd::ReadReq);
read->allocate();
@@ -435,7 +435,7 @@
Request::Flags flags = Request::PHYSICAL;
RequestPtr request = std::make_shared<Request>(
- topAddr, sizeof(PTESv39), flags, walker->masterId);
+ topAddr, sizeof(PTESv39), flags, walker->_id);
read = new Packet(request, MemCmd::ReadReq);
read->allocate();
diff --git a/src/arch/riscv/pagetable_walker.hh
b/src/arch/riscv/pagetable_walker.hh
index d9ab569..9b564e2 100644
--- a/src/arch/riscv/pagetable_walker.hh
+++ b/src/arch/riscv/pagetable_walker.hh
@@ -166,7 +166,7 @@
// The TLB we're supposed to load.
TLB * tlb;
System * sys;
- MasterID masterId;
+ MasterID _id;
// The number of outstanding walks that can be squashed per cycle.
unsigned numSquashable;
@@ -202,7 +202,7 @@
Walker(const Params *params) :
ClockedObject(params), port(name() + ".port", this),
funcState(this, NULL, NULL, true), tlb(NULL),
sys(params->system),
- masterId(sys->getMasterId(this)),
+ _id(sys->getMasterId(this)),
numSquashable(params->num_squash_per_cycle),
startWalkWrapperEvent([this]{ startWalkWrapper(); }, name())
{
diff --git a/src/arch/x86/pagetable_walker.cc
b/src/arch/x86/pagetable_walker.cc
index b540be3..940a96f 100644
--- a/src/arch/x86/pagetable_walker.cc
+++ b/src/arch/x86/pagetable_walker.cc
@@ -519,7 +519,7 @@
Request::Flags flags = oldRead->req->getFlags();
flags.set(Request::UNCACHEABLE, uncacheable);
RequestPtr request = std::make_shared<Request>(
- nextRead, oldRead->getSize(), flags, walker->masterId);
+ nextRead, oldRead->getSize(), flags, walker->_id);
read = new Packet(request, MemCmd::ReadReq);
read->allocate();
// If we need to write, adjust the read packet to write the
modified
@@ -588,7 +588,7 @@
flags.set(Request::UNCACHEABLE);
RequestPtr request = std::make_shared<Request>(
- topAddr, dataSize, flags, walker->masterId);
+ topAddr, dataSize, flags, walker->_id);
read = new Packet(request, MemCmd::ReadReq);
read->allocate();
diff --git a/src/arch/x86/pagetable_walker.hh
b/src/arch/x86/pagetable_walker.hh
index 55bb098..237950c 100644
--- a/src/arch/x86/pagetable_walker.hh
+++ b/src/arch/x86/pagetable_walker.hh
@@ -168,7 +168,7 @@
// The TLB we're supposed to load.
TLB * tlb;
System * sys;
- MasterID masterId;
+ MasterID _id;
// The number of outstanding walks that can be squashed per cycle.
unsigned numSquashable;
@@ -204,7 +204,7 @@
Walker(const Params *params) :
ClockedObject(params), port(name() + ".port", this),
funcState(this, NULL, NULL, true), tlb(NULL),
sys(params->system),
- masterId(sys->getMasterId(this)),
+ _id(sys->getMasterId(this)),
numSquashable(params->num_squash_per_cycle),
startWalkWrapperEvent([this]{ startWalkWrapper(); }, name())
{
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33527
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I0f90e0ddb231dd5c592fc3821d0cf3771857c6ac
Gerrit-Change-Number: 33527
Gerrit-PatchSet: 1
Gerrit-Owner: Shivani Parekh <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
