From d25b722e4a9500f2d4b2ca937900bf093242ddfa Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Thu, 6 Nov 2014 05:42:20 -0600 Subject: ruby: coherence protocols: remove data block from dirctory entry This patch removes the data block present in the directory entry structure of each protocol in gem5's mainline. Firstly, this is required for moving towards common set of memory controllers for classic and ruby memory systems. Secondly, the data block was being misused in several places. It was being used for having free access to the physical memory instead of calling on the memory controller. From now on, the directory controller will not have a direct visibility into the physical memory. The Memory Vector object now resides in the Memory Controller class. This also means that some significant changes are being made to the functional accesses in ruby. --- src/mem/protocol/Network_test-dir.sm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/mem/protocol/Network_test-dir.sm') diff --git a/src/mem/protocol/Network_test-dir.sm b/src/mem/protocol/Network_test-dir.sm index 4d6472c54..81feffde0 100644 --- a/src/mem/protocol/Network_test-dir.sm +++ b/src/mem/protocol/Network_test-dir.sm @@ -76,8 +76,12 @@ machine(Directory, "Network_test Directory") void setAccessPermission(Address addr, State state) { } - DataBlock getDataBlock(Address addr), return_by_ref="yes" { - error("Network Test does not support get data block."); + void functionalRead(Address addr, Packet *pkt) { + error("Network test does not support functional read."); + } + + int functionalWrite(Address addr, Packet *pkt) { + error("Network test does not support functional write."); } // ** IN_PORTS ** -- cgit v1.2.3