From d89d77f1c29a80d75e26c2683265e8891f5ac33e Mon Sep 17 00:00:00 2001 From: Yu-hsin Wang Date: Wed, 12 Oct 2022 11:20:44 +0800 Subject: [PATCH] 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 Tested-by: kokoro Maintainer: Bobby Bruce --- src/arch/arm/fastmodel/iris/thread_context.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc b/src/arch/arm/fastmodel/iris/thread_context.cc index b12536dbdd..45e020d832 100644 --- a/src/arch/arm/fastmodel/iris/thread_context.cc +++ b/src/arch/arm/fastmodel/iris/thread_context.cc @@ -441,9 +441,9 @@ void 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 @@ ThreadContext::writeMem( 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