Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52486 )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: arch: Rename PCStateCommon to PCStateWithNext.
......................................................................
arch: Rename PCStateCommon to PCStateWithNext.
This intermediate class has a fairly vague name. This new name more
specifically describes what this PCState class adds to its base class.
Change-Id: I6d19383f3eb2895d924187ddbf8185352db71542
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52486
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Daniel Carvalho <oda...@yahoo.com.br>
Maintainer: Daniel Carvalho <oda...@yahoo.com.br>
---
M src/arch/generic/pcstate.hh
1 file changed, 24 insertions(+), 8 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/generic/pcstate.hh b/src/arch/generic/pcstate.hh
index f2501e6..f1df6e7 100644
--- a/src/arch/generic/pcstate.hh
+++ b/src/arch/generic/pcstate.hh
@@ -246,18 +246,18 @@
namespace GenericISA
{
-class PCStateCommon : public PCStateBase
+class PCStateWithNext : public PCStateBase
{
protected:
Addr _npc = 0;
MicroPC _nupc = 1;
- PCStateCommon(const PCStateCommon &other) : PCStateBase(other),
+ PCStateWithNext(const PCStateWithNext &other) : PCStateBase(other),
_npc(other._npc), _nupc(other._nupc)
{}
- PCStateCommon &operator=(const PCStateCommon &other) = default;
- PCStateCommon() {}
+ PCStateWithNext &operator=(const PCStateWithNext &other) = default;
+ PCStateWithNext() {}
public:
Addr pc() const { return _pc; }
@@ -296,7 +296,7 @@
update(const PCStateBase &other) override
{
PCStateBase::update(other);
- auto &pcstate = other.as<PCStateCommon>();
+ auto &pcstate = other.as<PCStateWithNext>();
_npc = pcstate._npc;
_nupc = pcstate._nupc;
}
@@ -304,7 +304,7 @@
bool
equals(const PCStateBase &other) const override
{
- auto &ps = other.as<PCStateCommon>();
+ auto &ps = other.as<PCStateWithNext>();
return PCStateBase::equals(other) &&
_npc == ps._npc && _nupc == ps._nupc;
}
@@ -335,10 +335,10 @@
// The most basic type of PC.
template <int InstWidth>
-class SimplePCState : public PCStateCommon
+class SimplePCState : public PCStateWithNext
{
protected:
- typedef PCStateCommon Base;
+ typedef PCStateWithNext Base;
public:
SimplePCState(const SimplePCState &other) : Base(other) {}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52486
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: I6d19383f3eb2895d924187ddbf8185352db71542
Gerrit-Change-Number: 52486
Gerrit-PatchSet: 10
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
