Ruby: Remove libruby

This patch removes libruby_internal.hh, libruby.hh and libruby.cc. It moves
the contents to libruby.hh to RubyRequest.hh and RubyRequest.cc files.

3 files changed, 202 insertions, 0 deletions

diff --git a/src/mem/ruby/slicc_interface/RubyRequest.cc b/src/mem/ruby/slicc_interface/RubyRequest.cc
new file mode 100644
index 000000000..9189bfa7a
--- /dev/null
+++ b/src/mem/ruby/slicc_interface/RubyRequest.cc
@@ -0,0 +1,100 @@
+#include <iostream>
+
+#include "mem/ruby/slicc_interface/RubyRequest.hh"
+
+using namespace std;
+
+string
+RubyRequestType_to_string(const RubyRequestType& obj)
+{
+    switch(obj) {
+      case RubyRequestType_IFETCH:
+        return "IFETCH";
+      case RubyRequestType_LD:
+        return "LD";
+      case RubyRequestType_ST:
+        return "ST";
+      case RubyRequestType_Load_Linked:
+        return "Load_Linked";
+      case RubyRequestType_Store_Conditional:
+        return "Store_Conditional";
+      case RubyRequestType_RMW_Read:
+        return "RMW_Read";
+      case RubyRequestType_RMW_Write:
+        return "RMW_Write";
+      case RubyRequestType_Locked_RMW_Read:
+        return "Locked_RMW_Read";
+      case RubyRequestType_Locked_RMW_Write:
+        return "Locked_RMW_Write";
+      case RubyRequestType_NULL:
+      default:
+        assert(0);
+        return "";
+    }
+}
+
+RubyRequestType
+string_to_RubyRequestType(string str)
+{
+    if (str == "IFETCH")
+        return RubyRequestType_IFETCH;
+    else if (str == "LD")
+        return RubyRequestType_LD;
+    else if (str == "ST")
+        return RubyRequestType_ST;
+    else if (str == "Locked_Read")
+        return RubyRequestType_Load_Linked;
+    else if (str == "Locked_Write")
+        return RubyRequestType_Store_Conditional;
+    else if (str == "RMW_Read")
+        return RubyRequestType_RMW_Read;
+    else if (str == "RMW_Write")
+        return RubyRequestType_RMW_Write;
+    else if (str == "Locked_RMW_Read")
+        return RubyRequestType_Locked_RMW_Read;
+    else if (str == "Locked_RMW_Write")
+        return RubyRequestType_Locked_RMW_Write;
+    else
+        assert(0);
+    return RubyRequestType_NULL;
+}
+
+ostream&
+operator<<(ostream& out, const RubyRequestType& obj)
+{
+    out << RubyRequestType_to_string(obj);
+    out << flush;
+    return out;
+}
+
+ostream&
+operator<<(ostream& out, const RubyRequest& obj)
+{
+    out << hex << "0x" << obj.paddr << " data: 0x" << flush;
+    for (int i = 0; i < obj.len; i++) {
+        out << (int)obj.data[i];
+    }
+    out << dec << " type: " << RubyRequestType_to_string(obj.type) << endl;
+    return out;
+}
+
+vector<string>
+tokenizeString(string str, string delims)
+{
+    vector<string> tokens;
+    char* pch;
+    char* tmp;
+    const char* c_delims = delims.c_str();
+    tmp = new char[str.length()+1];
+    strcpy(tmp, str.c_str());
+    pch = strtok(tmp, c_delims);
+    while (pch != NULL) {
+        string tmp_str(pch);
+        if (tmp_str == "null") tmp_str = "";
+        tokens.push_back(tmp_str);
+
+        pch = strtok(NULL, c_delims);
+    }
+    delete [] tmp;
+    return tokens;
+}
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh
new file mode 100644
index 000000000..b97e8cbbc
--- /dev/null
+++ b/src/mem/ruby/slicc_interface/RubyRequest.hh
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2009 Mark D. Hill and David A. Wood
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__
+#define __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__
+
+#include <ostream>
+
+#include "mem/packet.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/CacheRequestType.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
+};
+
+enum RubyAccessMode {
+  RubyAccessMode_User,
+  RubyAccessMode_Supervisor,
+  RubyAccessMode_Device
+};
+
+class RubyRequest
+{
+  public:
+    uint64_t paddr;
+    uint8_t* data;
+    int len;
+    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,
+                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)
+    {}
+
+    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
diff --git a/src/mem/ruby/slicc_interface/SConscript b/src/mem/ruby/slicc_interface/SConscript
index 111859559..256f8e64e 100644
--- a/src/mem/ruby/slicc_interface/SConscript
+++ b/src/mem/ruby/slicc_interface/SConscript
@@ -37,5 +37,6 @@ SimObject('Controller.py')
 
 Source('AbstractEntry.cc')
 Source('AbstractCacheEntry.cc')
+Source('RubyRequest.cc')
 Source('RubySlicc_Profiler_interface.cc')
 Source('RubySlicc_ComponentMapping.cc')