mem-ruby: fix include dependency
authorTiago Mück <tiago.muck@arm.com>
Wed, 17 Jun 2020 01:06:49 +0000 (20:06 -0500)
committerTiago Mück <tiago.muck@arm.com>
Fri, 9 Oct 2020 00:07:27 +0000 (00:07 +0000)
Removed include dependency between WriteMask and RubySystem.

Change-Id: I3e81267341e3875b1bb0fc3cb39f1a308e383dfd
Signed-off-by: Tiago Mück <tiago.muck@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31258
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/mem/ruby/common/WriteMask.cc
src/mem/ruby/common/WriteMask.hh
src/mem/ruby/slicc_interface/RubySlicc_Util.hh

index 4585077a654cd0951a3382087f6d812567991276..54ba8fff002c67ad42a7f25e42c20841588911b1 100644 (file)
 
 #include "mem/ruby/system/RubySystem.hh"
 
+WriteMask::WriteMask()
+    : mSize(RubySystem::getBlockSizeBytes()), mMask(mSize, false),
+      mAtomic(false)
+{}
+
 void
 WriteMask::print(std::ostream& out) const
 {
index 6e3ea2982150b5b284f2050e6b269bfd50a08e59..f1e5f371de569543e8b4095eec7fb6220526e827 100644 (file)
 #include <iostream>
 #include <vector>
 
+#include "base/amo.hh"
+#include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/TypeDefines.hh"
-#include "mem/ruby/system/RubySystem.hh"
 
 class WriteMask
 {
   public:
     typedef std::vector<std::pair<int, AtomicOpFunctor* >> AtomicOpVector;
 
-    WriteMask()
-      : mSize(RubySystem::getBlockSizeBytes()), mMask(mSize, false),
-        mAtomic(false)
-    {}
+    WriteMask();
 
     WriteMask(int size)
       : mSize(size), mMask(size, false), mAtomic(false)
index 155d134dff1eaf877942c4484b3eda25e5694e28..a5a18ff6d826e5b6f1660b7f69904248c316ea2f 100644 (file)
@@ -55,6 +55,7 @@
 #include "mem/ruby/common/DataBlock.hh"
 #include "mem/ruby/common/TypeDefines.hh"
 #include "mem/ruby/common/WriteMask.hh"
+#include "mem/ruby/protocol/RubyRequestType.hh"
 
 inline Cycles zero_time() { return Cycles(0); }