Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/50250 )
(
55 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: cpu: Make getIsaPtr const.
......................................................................
cpu: Make getIsaPtr const.
This accessor shouldn't modify the ThreadContext.
Change-Id: I6f2629f950b0379573e51e337626ef6b1429a14d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50250
Reviewed-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/arch/arm/fastmodel/iris/thread_context.hh
M src/cpu/checker/thread_context.hh
M src/cpu/o3/thread_context.hh
M src/cpu/simple_thread.hh
M src/cpu/thread_context.hh
5 files changed, 20 insertions(+), 5 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/iris/thread_context.hh
b/src/arch/arm/fastmodel/iris/thread_context.hh
index 6464019..2feb25e 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.hh
+++ b/src/arch/arm/fastmodel/iris/thread_context.hh
@@ -220,7 +220,7 @@
System *getSystemPtr() override { return _cpu->system; }
BaseISA *
- getIsaPtr() override
+ getIsaPtr() const override
{
return _isa;
}
diff --git a/src/cpu/checker/thread_context.hh
b/src/cpu/checker/thread_context.hh
index acff791..13828f5 100644
--- a/src/cpu/checker/thread_context.hh
+++ b/src/cpu/checker/thread_context.hh
@@ -153,7 +153,7 @@
return checkerCPU;
}
- BaseISA *getIsaPtr() override { return actualTC->getIsaPtr(); }
+ BaseISA *getIsaPtr() const override { return actualTC->getIsaPtr(); }
InstDecoder *
getDecoderPtr() override
diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index 9135e1d..ae37dc9 100644
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -107,7 +107,7 @@
CheckerCPU *getCheckerCpuPtr() override { return NULL; }
BaseISA *
- getIsaPtr() override
+ getIsaPtr() const override
{
return cpu->isa[thread->threadId()];
}
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index c2e620c..2f5805e 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -208,7 +208,7 @@
CheckerCPU *getCheckerCpuPtr() override { return NULL; }
- BaseISA *getIsaPtr() override { return isa; }
+ BaseISA *getIsaPtr() const override { return isa; }
InstDecoder *getDecoderPtr() override { return decoder; }
diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index 093d48c..835ac46 100644
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -142,7 +142,7 @@
virtual CheckerCPU *getCheckerCpuPtr() = 0;
- virtual BaseISA *getIsaPtr() = 0;
+ virtual BaseISA *getIsaPtr() const = 0;
virtual InstDecoder *getDecoderPtr() = 0;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50250
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: I6f2629f950b0379573e51e337626ef6b1429a14d
Gerrit-Change-Number: 50250
Gerrit-PatchSet: 57
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.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
