[gem5-dev] changeset in gem5: ruby: SubBlock: refactor code

[Nilay Vaish]

changeset ec668f8466eb in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ec668f8466eb
description:
        ruby: SubBlock: refactor code

diffstat:

 src/mem/ruby/common/SubBlock.cc |  7 ++-----
 src/mem/ruby/common/SubBlock.hh |  7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r fe230bcf3f38 -r ec668f8466eb src/mem/ruby/common/SubBlock.cc
--- a/src/mem/ruby/common/SubBlock.cc   Fri Aug 14 19:28:44 2015 -0500
+++ b/src/mem/ruby/common/SubBlock.cc   Fri Aug 14 19:28:44 2015 -0500
@@ -41,7 +41,7 @@
 }
 
 void
-SubBlock::internalMergeFrom(const DataBlock& data)
+SubBlock::mergeFrom(const DataBlock& data)
 {
     int size = getSize();
     assert(size > 0);
@@ -52,7 +52,7 @@
 }
 
 void
-SubBlock::internalMergeTo(DataBlock& data) const
+SubBlock::mergeTo(DataBlock& data) const
 {
     int size = getSize();
     assert(size > 0);
@@ -68,6 +68,3 @@
 {
     out << "[" << m_address << ", " << getSize() << ", " << m_data << "]";
 }
-
-
-
diff -r fe230bcf3f38 -r ec668f8466eb src/mem/ruby/common/SubBlock.hh
--- a/src/mem/ruby/common/SubBlock.hh   Fri Aug 14 19:28:44 2015 -0500
+++ b/src/mem/ruby/common/SubBlock.hh   Fri Aug 14 19:28:44 2015 -0500
@@ -56,15 +56,12 @@
 
     // 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;
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev