1. Got rid of unused functions in DirectoryMemory

2. Reintroduced RMW_Read and RMW_Write
3. Defined -2 in the Sequencer as well as made a note about mandatory queue

Did not address the issues in the slicc because remaking the atomics altogether to allow
multiple processors to issue atomic requests at once

1 files changed, 0 insertions, 18 deletions

diff --git a/src/mem/ruby/common/DataBlock.hh b/src/mem/ruby/common/DataBlock.hh
index 01194c0ac..2a0811f76 100644
--- a/src/mem/ruby/common/DataBlock.hh
+++ b/src/mem/ruby/common/DataBlock.hh
@@ -56,9 +56,6 @@ class DataBlock {
   uint8 getByte(int whichByte) const;
   const uint8* getData(int offset, int len) const;
   void setByte(int whichByte, uint8 data);
-  const uint8* getBlock() const;
-  uint8* copyData(uint8* dest, int offset, int size) const;
-  void setBlock(uint8* data) { setData(data, 0, RubySystem::getBlockSizeBytes()); } 
   void setData(uint8* data, int offset, int len);
   void copyPartial(const DataBlock & dblk, int offset, int len);
   bool equal(const DataBlock& obj) const;
@@ -149,21 +146,6 @@ void DataBlock::copyPartial(const DataBlock & dblk, int offset, int len)
   setData(&dblk.m_data[offset], offset, len);
 }
 
-inline
-const uint8* DataBlock::getBlock() const 
-{
-  return m_data;
-}
-
-inline
-uint8* DataBlock::copyData(uint8* dest, int offset, int size) const 
-{
-  assert(offset + size <= RubySystem::getBlockSizeBytes());
-  memcpy(dest, m_data + offset, size);
-  return dest;
-}
-
-
 // ******************* Definitions *******************
 
 // Output operator definition