From 611f052e963b06b4a7e02b2fc6d847cd6d08d038 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Sat, 19 Mar 2011 18:34:59 -0500 Subject: Ruby: Convert CacheRequestType to RubyRequestType This patch converts CacheRequestType to RubyRequestType so that both the protocol dependent and independent code makes use of the same request type. --- src/mem/ruby/slicc_interface/RubyRequest.hh | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/mem/ruby/slicc_interface/RubyRequest.hh') diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh index 6d0e23bfe..d7acfd578 100644 --- a/src/mem/ruby/slicc_interface/RubyRequest.hh +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh @@ -33,25 +33,12 @@ #include "mem/packet.hh" #include "mem/protocol/RubyAccessMode.hh" -#include "mem/protocol/CacheRequestType.hh" +#include "mem/protocol/RubyRequestType.hh" #include "mem/protocol/Message.hh" #include "mem/protocol/PrefetchBit.hh" #include "mem/ruby/common/Address.hh" typedef void* RubyPortHandle; -enum RubyRequestType { - RubyRequestType_NULL, - RubyRequestType_IFETCH, - RubyRequestType_LD, - RubyRequestType_ST, - RubyRequestType_Load_Linked, - RubyRequestType_Store_Conditional, - RubyRequestType_RMW_Read, - RubyRequestType_RMW_Write, - RubyRequestType_Locked_RMW_Read, - RubyRequestType_Locked_RMW_Write, - RubyRequestType_NUM -}; class RubyRequest { @@ -87,9 +74,6 @@ class RubyRequest void print(std::ostream& out) const; }; -std::string RubyRequestType_to_string(const RubyRequestType& obj); -RubyRequestType string_to_RubyRequestType(std::string); -std::ostream& operator<<(std::ostream& out, const RubyRequestType& obj); std::ostream& operator<<(std::ostream& out, const RubyRequest& obj); #endif -- cgit v1.2.3