diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2015-08-19 10:02:01 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2015-08-19 10:02:01 -0500 |
| commit | 2f44dada688ace9c24f085a8422b3054c3edb72e (patch) | |
| tree | 372bb043430552b0f4424eaa5571933883fcaaae /src/mem/ruby/common/SubBlock.cc | |
| parent | 2d9f3f8582e2de60850852c803a8c8ba0d6b91b5 (diff) | |
| download | gem5-2f44dada688ace9c24f085a8422b3054c3edb72e.tar.xz | |
ruby: reverts to changeset: bf82f1f7b040
Diffstat (limited to 'src/mem/ruby/common/SubBlock.cc')
| -rw-r--r-- | src/mem/ruby/common/SubBlock.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc index f1839df72..5175cb950 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::mergeFrom(const DataBlock& data) +SubBlock::internalMergeFrom(const DataBlock& data) { int size = getSize(); assert(size > 0); @@ -52,7 +52,7 @@ SubBlock::mergeFrom(const DataBlock& data) } void -SubBlock::mergeTo(DataBlock& data) const +SubBlock::internalMergeTo(DataBlock& data) const { int size = getSize(); assert(size > 0); @@ -68,3 +68,6 @@ SubBlock::print(std::ostream& out) const { out << "[" << m_address << ", " << getSize() << ", " << m_data << "]"; } + + + |