summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common/SubBlock.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2015-08-14 19:28:44 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2015-08-14 19:28:44 -0500
commitca368765a1ea846697621c6eac0ad8a0b6aa5a3a (patch)
treef1da14d5c6e91e9d6075e0f770714b0efb86c965 /src/mem/ruby/common/SubBlock.cc
parent514f18cdda0abafdb3769ae4863ff03e57eeaed4 (diff)
downloadgem5-ca368765a1ea846697621c6eac0ad8a0b6aa5a3a.tar.xz
ruby: SubBlock: refactor code
Diffstat (limited to 'src/mem/ruby/common/SubBlock.cc')
-rw-r--r--src/mem/ruby/common/SubBlock.cc7
1 files changed, 2 insertions, 5 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 << "]";
}
-
-
-