diff options
author | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:23 -0800 |
---|---|---|
committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:23 -0800 |
commit | 45230a4f6b82af61c05fcf93b6e1a9319fcb0a2e (patch) | |
tree | be5514d8ae75df903599758fa2fa86834e9142b1 /src/mem/ruby/system/RubyPort.hh | |
parent | 4eb3bfc31b66a6835a398ba2f0a11ea9b78d525d (diff) | |
download | gem5-45230a4f6b82af61c05fcf93b6e1a9319fcb0a2e.tar.xz |
ruby: added the GEMS ruby tester
Diffstat (limited to 'src/mem/ruby/system/RubyPort.hh')
-rw-r--r-- | src/mem/ruby/system/RubyPort.hh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh index e57f663c9..267b557ec 100644 --- a/src/mem/ruby/system/RubyPort.hh +++ b/src/mem/ruby/system/RubyPort.hh @@ -152,11 +152,10 @@ protected: MessageBuffer* m_mandatory_q_ptr; PioPort* pio_port; -private: - static uint16_t m_num_ports; - uint16_t m_port_id; - uint64_t m_request_cnt; - + // + // The pending request map is protected so that the Sequencer can access it. + // This is a temporary fix until the libruby inteface is cleaned + // struct RequestCookie { Packet *pkt; M5Port *m5Port; @@ -167,6 +166,12 @@ private: typedef std::map<int64_t, RequestCookie*> RequestMap; static RequestMap pending_cpu_requests; + +private: + static uint16_t m_num_ports; + uint16_t m_port_id; + uint64_t m_request_cnt; + static void ruby_hit_callback(int64_t req_id); M5Port* physMemPort; |