From: Tiago Mück <tiago.muck@arm.com>
Date: Wed, 17 Jun 2020 01:06:49 +0000 (-0500)
Subject: mem-ruby: fix include dependency
X-Git-Tag: develop-gem5-snapshot~662
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa232e2e0edb4c72d8fb9a1dc13f8031724184bc;p=gem5.git

mem-ruby: fix include dependency

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>
---

diff --git a/src/mem/ruby/common/WriteMask.cc b/src/mem/ruby/common/WriteMask.cc
index 4585077a6..54ba8fff0 100644
--- a/src/mem/ruby/common/WriteMask.cc
+++ b/src/mem/ruby/common/WriteMask.cc
@@ -32,6 +32,11 @@
 
 #include "mem/ruby/system/RubySystem.hh"
 
+WriteMask::WriteMask()
+    : mSize(RubySystem::getBlockSizeBytes()), mMask(mSize, false),
+      mAtomic(false)
+{}
+
 void
 WriteMask::print(std::ostream& out) const
 {
diff --git a/src/mem/ruby/common/WriteMask.hh b/src/mem/ruby/common/WriteMask.hh
index 6e3ea2982..f1e5f371d 100644
--- a/src/mem/ruby/common/WriteMask.hh
+++ b/src/mem/ruby/common/WriteMask.hh
@@ -46,18 +46,16 @@
 #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)
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 155d134df..a5a18ff6d 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -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); }