diff options
Diffstat (limited to 'src/mem/ruby/slicc_interface/RubyRequest.hh')
-rw-r--r-- | src/mem/ruby/slicc_interface/RubyRequest.hh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh index cdb04bceb..b17269a78 100644 --- a/src/mem/ruby/slicc_interface/RubyRequest.hh +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh @@ -40,10 +40,10 @@ class RubyRequest : public Message { public: - Address m_PhysicalAddress; - Address m_LineAddress; + Addr m_PhysicalAddress; + Addr m_LineAddress; RubyRequestType m_Type; - Address m_ProgramCounter; + Addr m_ProgramCounter; RubyAccessMode m_AccessMode; int m_Size; PrefetchBit m_Prefetch; @@ -66,18 +66,17 @@ class RubyRequest : public Message pkt(_pkt), m_contextId(_proc_id) { - m_LineAddress = m_PhysicalAddress; - m_LineAddress.makeLineAddress(); + m_LineAddress = makeLineAddress(m_PhysicalAddress); } RubyRequest(Tick curTime) : Message(curTime) {} MsgPtr clone() const { return std::shared_ptr<Message>(new RubyRequest(*this)); } - const Address& getLineAddress() const { return m_LineAddress; } - const Address& getPhysicalAddress() const { return m_PhysicalAddress; } + Addr getLineAddress() const { return m_LineAddress; } + Addr getPhysicalAddress() const { return m_PhysicalAddress; } const RubyRequestType& getType() const { return m_Type; } - const Address& getProgramCounter() const { return m_ProgramCounter; } + Addr getProgramCounter() const { return m_ProgramCounter; } const RubyAccessMode& getAccessMode() const { return m_AccessMode; } const int& getSize() const { return m_Size; } const PrefetchBit& getPrefetch() const { return m_Prefetch; } @@ -95,4 +94,4 @@ operator<<(std::ostream& out, const RubyRequest& obj) return out; } -#endif +#endif // __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__ |