diff options
| -rw-r--r-- | src/mem/ruby/common/SubBlock.cc | 7 | ||||
| -rw-r--r-- | src/mem/ruby/common/SubBlock.hh | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc index 5175cb950..f1839df72 100644 --- a/src/mem/ruby/common/SubBlock.cc +++ b/src/mem/ruby/common/SubBlock.cc @@ -41,7 +41,7 @@ SubBlock::SubBlock(Addr addr, int size) } void -SubBlock::internalMergeFrom(const DataBlock& data) +SubBlock::mergeFrom(const DataBlock& data) { int size = getSize(); assert(size > 0); @@ -52,7 +52,7 @@ SubBlock::internalMergeFrom(const DataBlock& data) } void -SubBlock::internalMergeTo(DataBlock& data) const +SubBlock::mergeTo(DataBlock& data) const { int size = getSize(); assert(size > 0); @@ -68,6 +68,3 @@ SubBlock::print(std::ostream& out) const { out << "[" << m_address << ", " << getSize() << ", " << m_data << "]"; } - - - diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh index ad1d68ae1..f336328fa 100644 --- a/src/mem/ruby/common/SubBlock.hh +++ b/src/mem/ruby/common/SubBlock.hh @@ -56,15 +56,12 @@ class SubBlock // Merging to and from DataBlocks - We only need to worry about // updates when we are using DataBlocks - void mergeTo(DataBlock& data) const { internalMergeTo(data); } - void mergeFrom(const DataBlock& data) { internalMergeFrom(data); } + void mergeTo(DataBlock& data) const; + void mergeFrom(const DataBlock& data); void print(std::ostream& out) const; private: - void internalMergeTo(DataBlock& data) const; - void internalMergeFrom(const DataBlock& data); - // Data Members (m_ prefix) Addr m_address; std::vector<uint8_t> m_data; |