derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastmodel: correct memory access space id

Browse Source 
Change-Id: Ie513c44c362baddc0690cd97a2657f9ccdd06e96
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48823
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Yu-hsin Wang
2021-07-29 16:06:52 +08:00
parent 32db3b4042
commit 43c6225da3
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/arch/arm/fastmodel/iris/thread_context.cc
View File

@@ -437,21 +437,23 @@ ThreadContext::remove(PCEvent *e)
}
void
ThreadContext::readMem(Addr addr, void *p, size_t size)
ThreadContext::readMem(
iris::MemorySpaceId space, Addr addr, void *p, size_t size)
{
iris::r0master::MemoryReadResult r;
auto err = call().memory_read(_instId, r, 0, addr, 1, size);
auto err = call().memory_read(_instId, r, space, addr, 1, size);
panic_if(err != iris::r0master::E_ok, "readMem failed.");
std::memcpy(p, r.data.data(), size);
}
void
ThreadContext::writeMem(Addr addr, const void *p, size_t size)
ThreadContext::writeMem(
iris::MemorySpaceId space, Addr addr, const void *p, size_t size)
{
std::vector<uint64_t> data((size + 7) / 8);
std::memcpy(data.data(), p, size);
iris::MemoryWriteResult r;
auto err = call().memory_write(_instId, r, 0, addr, 1, size, data);
auto err = call().memory_write(_instId, r, space, addr, 1, size, data);
panic_if(err != iris::r0master::E_ok, "writeMem failed.");
}
@@ -515,15 +517,19 @@ ThreadContext::getCurrentInstCount()
void
ThreadContext::sendFunctional(PacketPtr pkt)
{
auto msn = ArmISA::isSecure(this) ?
Iris::PhysicalMemorySecureMsn : Iris::PhysicalMemoryNonSecureMsn;
auto id = getMemorySpaceId(msn);
auto addr = pkt->getAddr();
auto size = pkt->getSize();
auto data = pkt->getPtr<uint8_t>();
pkt->makeResponse();
if (pkt->isRead())
readMem(addr, data, size);
readMem(id, addr, data, size);
else
writeMem(addr, data, size);
writeMem(id, addr, data, size);
}
ThreadContext::Status

6
src/arch/arm/fastmodel/iris/thread_context.hh
View File

@@ -169,8 +169,10 @@ class ThreadContext : public gem5::ThreadContext
iris::IrisCppAdapter &call() const { return client.irisCall(); }
iris::IrisCppAdapter &noThrow() const { return client.irisCallNoThrow(); }
void readMem(Addr addr, void *p, size_t size);
void writeMem(Addr addr, const void *p, size_t size);
void readMem(iris::MemorySpaceId space,
Addr addr, void *p, size_t size);
void writeMem(iris::MemorySpaceId space,
Addr addr, const void *p, size_t size);
bool translateAddress(Addr &paddr, iris::MemorySpaceId p_space,
Addr vaddr, iris::MemorySpaceId v_space);