[m5-dev] [PATCH 18 of 30] ruby: hit callback fix with the new config system

[Brad Beckmann]

# HG changeset patch
# User Brad Beckmann <brad.beckm...@amd.com>
# Date 1260657436 28800
# Node ID 20d225368dfe44492bde8b187f898311fb9b924e
# Parent  23ea85c0fc27eaa31f042bdc37238856ffc7769e
ruby: hit callback fix with the new config system
Made the static hit callback function public so that the sequencer can
call it.

diff -r 23ea85c0fc27 -r 20d225368dfe src/mem/ruby/system/RubyPort.hh
--- a/src/mem/ruby/system/RubyPort.hh   Sat Dec 12 14:37:16 2009 -0800
+++ b/src/mem/ruby/system/RubyPort.hh   Sat Dec 12 14:37:16 2009 -0800
@@ -63,6 +63,7 @@
 protected:
   const string m_name;
   void (*m_hit_callback)(int64_t);
+  static void ruby_hit_callback(int64_t req_id);
 
   int64_t makeUniqueRequestID() {
     // The request ID is generated by combining the port ID with a request 
count
@@ -104,7 +105,6 @@
 
     typedef std::map<int64_t, RequestCookie*> RequestMap;
     static RequestMap pending_requests;
-    static void ruby_hit_callback(int64_t req_id);
 
     FunctionalPort funcMemPort;
 };
diff -r 23ea85c0fc27 -r 20d225368dfe src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc  Sat Dec 12 14:37:16 2009 -0800
+++ b/src/mem/ruby/system/Sequencer.cc  Sat Dec 12 14:37:16 2009 -0800
@@ -342,7 +342,7 @@
     }
   }
 
-  m_hit_callback(srequest->id);
+  ruby_hit_callback(srequest->id);
   delete srequest;
 }
 

_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev