diff options
author | Nathan Binkert <nate@binkert.org> | 2010-03-22 18:43:53 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-03-22 18:43:53 -0700 |
commit | 5ab13e2deb8f904ef2a233749193fa09ea7013c4 (patch) | |
tree | 07f5f02902f9e719fe58d1a9419b5a1d51f7a2ce /src/mem/ruby/slicc_interface/NetworkMessage.hh | |
parent | 2620e08722b38660658d46cdb76c337db18e877c (diff) | |
download | gem5-5ab13e2deb8f904ef2a233749193fa09ea7013c4.tar.xz |
ruby: style pass
Diffstat (limited to 'src/mem/ruby/slicc_interface/NetworkMessage.hh')
-rw-r--r-- | src/mem/ruby/slicc_interface/NetworkMessage.hh | 99 |
1 files changed, 39 insertions, 60 deletions
diff --git a/src/mem/ruby/slicc_interface/NetworkMessage.hh b/src/mem/ruby/slicc_interface/NetworkMessage.hh index 150fd70fc..8a7c00094 100644 --- a/src/mem/ruby/slicc_interface/NetworkMessage.hh +++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood * All rights reserved. @@ -27,89 +26,69 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * NetworkMessage.hh - * - * Description: - * - * $Id$ - * - */ - -#ifndef NetworkMessage_H -#define NetworkMessage_H +#ifndef __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__ +#define __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__ -#include "mem/ruby/common/Global.hh" #include "mem/gems_common/RefCnt.hh" #include "mem/gems_common/RefCountable.hh" -#include "mem/ruby/slicc_interface/Message.hh" #include "mem/protocol/MessageSizeType.hh" +#include "mem/ruby/common/Global.hh" #include "mem/ruby/common/NetDest.hh" +#include "mem/ruby/slicc_interface/Message.hh" class Address; class NetworkMessage; typedef RefCnt<NetworkMessage> NetMsgPtr; -class NetworkMessage : public Message { -public: - // Constructors - NetworkMessage() - :Message() +class NetworkMessage : public Message +{ + public: + NetworkMessage() + : Message() { - m_internal_dest_valid = false; + m_internal_dest_valid = false; } - // Destructor - virtual ~NetworkMessage() { } + virtual ~NetworkMessage() { } - // Public Methods + virtual const NetDest& getDestination() const = 0; + virtual NetDest& getDestination() = 0; + virtual const MessageSizeType& getMessageSize() const = 0; + virtual MessageSizeType& getMessageSize() = 0; - virtual const NetDest& getDestination() const = 0; - virtual NetDest& getDestination() = 0; - virtual const MessageSizeType& getMessageSize() const = 0; - virtual MessageSizeType& getMessageSize() = 0; - // virtual const Address& getAddress() const = 0; - // virtual Address& getAddress() = 0; + const NetDest& + getInternalDestination() const + { + if (m_internal_dest_valid == false) + return getDestination(); - const NetDest& getInternalDestination() const { - if (m_internal_dest_valid == false) { - return getDestination(); - } else { - return m_internal_dest; + return m_internal_dest; } - } - NetDest& getInternalDestination() { - if (m_internal_dest_valid == false) { - m_internal_dest = getDestination(); - m_internal_dest_valid = true; + NetDest& + getInternalDestination() + { + if (m_internal_dest_valid == false) { + m_internal_dest = getDestination(); + m_internal_dest_valid = true; + } + return m_internal_dest; } - return m_internal_dest; - } - - virtual void print(ostream& out) const = 0; -private: - // Private Methods + virtual void print(ostream& out) const = 0; - // Data Members (m_ prefix) - NetDest m_internal_dest; - bool m_internal_dest_valid; + private: + NetDest m_internal_dest; + bool m_internal_dest_valid; }; -// Output operator declaration -ostream& operator<<(ostream& out, const NetworkMessage& obj); - -// ******************* Definitions ******************* - -// Output operator definition -extern inline -ostream& operator<<(ostream& out, const NetworkMessage& obj) +inline ostream& +operator<<(ostream& out, const NetworkMessage& obj) { - obj.print(out); - out << flush; - return out; + obj.print(out); + out << flush; + return out; } -#endif //NetworkMessage_H +#endif // __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__ |