Yu-hsin Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/66071?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: fastmodel: correct the Iris namespace for FastModel 11.19
......................................................................
fastmodel: correct the Iris namespace for FastModel 11.19
Change-Id: I3f899699ce27ffdc5bbed311fec9f38c62027a80
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66071
Reviewed-by: Earl Ou <shunhsin...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
---
M src/arch/arm/fastmodel/iris/thread_context.cc
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
Earl Ou: Looks good to me, approved
kokoro: Regressions pass
Bobby Bruce: Looks good to me, approved
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index b12536d..45e020d 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -441,9 +441,9 @@
ThreadContext::readMem(
iris::MemorySpaceId space, Addr addr, void *p, size_t size)
{
- iris::r0master::MemoryReadResult r;
+ iris::MemoryReadResult r;
auto err = call().memory_read(_instId, r, space, addr, 1, size);
- panic_if(err != iris::r0master::E_ok, "readMem failed.");
+ panic_if(err != iris::E_ok, "readMem failed.");
std::memcpy(p, r.data.data(), size);
}
@@ -455,7 +455,7 @@
std::memcpy(data.data(), p, size);
iris::MemoryWriteResult r;
auto err = call().memory_write(_instId, r, space, addr, 1, size, data);
- panic_if(err != iris::r0master::E_ok, "writeMem failed.");
+ panic_if(err != iris::E_ok, "writeMem failed.");
}
bool
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66071?usp=email
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: I3f899699ce27ffdc5bbed311fec9f38c62027a80
Gerrit-Change-Number: 66071
Gerrit-PatchSet: 3
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Wei-Han Chen <weihanc...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
