diff options
author | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:33 -0800 |
---|---|---|
committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:33 -0800 |
commit | 1feae85017d8db5d3bf39065fd95724f89b3fd18 (patch) | |
tree | 1a1564d28a9a6b0db34e2a4244a27c9473b5241b /src/mem/ruby/libruby.hh | |
parent | a579d3e43c7036456413d4868f2d513215ad20f0 (diff) | |
download | gem5-1feae85017d8db5d3bf39065fd95724f89b3fd18.tar.xz |
ruby: Removed static members in RubyPort including hitcallback
Removed static members in RubyPort and removed the ruby request unique id.
Diffstat (limited to 'src/mem/ruby/libruby.hh')
-rw-r--r-- | src/mem/ruby/libruby.hh | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/mem/ruby/libruby.hh b/src/mem/ruby/libruby.hh index 4c50611c1..60f37da3f 100644 --- a/src/mem/ruby/libruby.hh +++ b/src/mem/ruby/libruby.hh @@ -4,6 +4,7 @@ #include <stdint.h> #include <ostream> +#include "mem/packet.hh" typedef void* RubyPortHandle; enum RubyRequestType { @@ -31,11 +32,26 @@ struct RubyRequest { uint64_t pc; RubyRequestType type; RubyAccessMode access_mode; + PacketPtr pkt; unsigned proc_id; RubyRequest() {} - RubyRequest(uint64_t _paddr, uint8_t* _data, int _len, uint64_t _pc, RubyRequestType _type, RubyAccessMode _access_mode, unsigned _proc_id = 100) - : paddr(_paddr), data(_data), len(_len), pc(_pc), type(_type), access_mode(_access_mode), proc_id(_proc_id) + RubyRequest(uint64_t _paddr, + uint8_t* _data, + int _len, + uint64_t _pc, + RubyRequestType _type, + RubyAccessMode _access_mode, + PacketPtr _pkt, + unsigned _proc_id = 100) + : paddr(_paddr), + data(_data), + len(_len), + pc(_pc), + type(_type), + access_mode(_access_mode), + pkt(_pkt), + proc_id(_proc_id) {} }; @@ -71,12 +87,6 @@ RubyPortHandle libruby_get_port(const char* name, void (*hit_callback)(int64_t a RubyPortHandle libruby_get_port_by_name(const char* name); -/** - * libruby_issue_request error return codes - */ -#define LIBRUBY_BUFFER_FULL -2 -#define LIBRUBY_ALIASED_REQUEST -3 - /** * issue_request returns a unique access_id to identify the ruby * transaction. This access_id is later returned to the caller via |