[gem5-dev] changeset in gem5: Ruby: Simplify tester ports by not using Simp...

[Andreas Hansson]

changeset 04d1736a5098 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=04d1736a5098
description:
        Ruby: Simplify tester ports by not using SimpleTimingPort

        This patch simplfies the master ports used by RubyDirectedTester and
        RubyTester by avoiding the use of SimpleTimingPort. Neither tester
        made any use of the functionality offered by SimpleTimingPort besides
        a trivial implementation of recvFunctional (only snoops) and
        recvRangeChange (not relevant since there is only one master).

        The patch does not change or add any functionality, it merely makes
        the introduction of a master/slave port easier (in a future patch).

diffstat:

 src/cpu/testers/directedtest/RubyDirectedTester.hh |  9 ++++++---
 src/cpu/testers/rubytest/RubyTester.hh             |  6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 0216ed80991b -r 04d1736a5098 
src/cpu/testers/directedtest/RubyDirectedTester.hh
--- a/src/cpu/testers/directedtest/RubyDirectedTester.hh        Fri Feb 24 
11:46:39 2012 -0500
+++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh        Fri Feb 24 
11:48:48 2012 -0500
@@ -47,14 +47,15 @@
 class RubyDirectedTester : public MemObject
 {
   public:
-    class CpuPort : public SimpleTimingPort
+    class CpuPort : public Port
     {
       private:
         RubyDirectedTester *tester;
 
       public:
-        CpuPort(const std::string &_name, RubyDirectedTester *_tester, 
uint32_t _idx)
-            : SimpleTimingPort(_name, _tester), tester(_tester), idx(_idx)
+        CpuPort(const std::string &_name, RubyDirectedTester *_tester,
+                uint32_t _idx)
+            : Port(_name, _tester), tester(_tester), idx(_idx)
         {}
 
         uint32_t idx;
@@ -62,6 +63,8 @@
       protected:
         virtual bool recvTiming(PacketPtr pkt);
         virtual Tick recvAtomic(PacketPtr pkt);
+        virtual void recvFunctional(PacketPtr pkt) { }
+        virtual void recvRangeChange() { }
     };
 
     typedef RubyDirectedTesterParams Params;
diff -r 0216ed80991b -r 04d1736a5098 src/cpu/testers/rubytest/RubyTester.hh
--- a/src/cpu/testers/rubytest/RubyTester.hh    Fri Feb 24 11:46:39 2012 -0500
+++ b/src/cpu/testers/rubytest/RubyTester.hh    Fri Feb 24 11:48:48 2012 -0500
@@ -45,14 +45,14 @@
 class RubyTester : public MemObject
 {
   public:
-    class CpuPort : public SimpleTimingPort
+    class CpuPort : public Port
     {
       private:
         RubyTester *tester;
 
       public:
         CpuPort(const std::string &_name, RubyTester *_tester, int _idx)
-            : SimpleTimingPort(_name, _tester), tester(_tester), idx(_idx)
+            : Port(_name, _tester), tester(_tester), idx(_idx)
         {}
 
         int idx;
@@ -60,6 +60,8 @@
       protected:
         virtual bool recvTiming(PacketPtr pkt);
         virtual Tick recvAtomic(PacketPtr pkt);
+        virtual void recvFunctional(PacketPtr pkt) { }
+        virtual void recvRangeChange() { }
     };
 
     struct SenderState : public Packet::SenderState
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev