summaryrefslogtreecommitdiff
path: root/src/mem/ruby/libruby.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mem/ruby/libruby.cc')
-rw-r--r--src/mem/ruby/libruby.cc275
1 files changed, 149 insertions, 126 deletions
diff --git a/src/mem/ruby/libruby.cc b/src/mem/ruby/libruby.cc
index 16b2bf346..de120036b 100644
--- a/src/mem/ruby/libruby.cc
+++ b/src/mem/ruby/libruby.cc
@@ -30,97 +30,101 @@
#include <algorithm>
#include "config/gems_root.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/libruby_internal.hh"
+#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/system/MemoryVector.hh"
#include "mem/ruby/system/RubyPort.hh"
#include "mem/ruby/system/System.hh"
-#include "mem/ruby/eventqueue/RubyEventQueue.hh"
-#include "mem/ruby/system/MemoryVector.hh"
-#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/recorder/Tracer.hh"
-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_Locked_Read:
- return "Locked_Read";
- case RubyRequestType_Locked_Write:
- return "Locked_Write";
- case RubyRequestType_RMW_Read:
- return "RMW_Read";
- case RubyRequestType_RMW_Write:
- return "RMW_Write";
- case RubyRequestType_NULL:
- default:
- assert(0);
- return "";
- }
+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_Locked_Read:
+ return "Locked_Read";
+ case RubyRequestType_Locked_Write:
+ return "Locked_Write";
+ case RubyRequestType_RMW_Read:
+ return "RMW_Read";
+ case RubyRequestType_RMW_Write:
+ return "RMW_Write";
+ case RubyRequestType_NULL:
+ default:
+ assert(0);
+ return "";
+ }
}
-RubyRequestType string_to_RubyRequestType(std::string str)
+RubyRequestType
+string_to_RubyRequestType(std::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_Locked_Read;
- else if (str == "Locked_Write")
- return RubyRequestType_Locked_Write;
- else if (str == "RMW_Read")
- return RubyRequestType_RMW_Read;
- else if (str == "RMW_Write")
- return RubyRequestType_RMW_Write;
- else
- assert(0);
- return RubyRequestType_NULL;
+ 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_Locked_Read;
+ else if (str == "Locked_Write")
+ return RubyRequestType_Locked_Write;
+ else if (str == "RMW_Read")
+ return RubyRequestType_RMW_Read;
+ else if (str == "RMW_Write")
+ return RubyRequestType_RMW_Write;
+ else
+ assert(0);
+ return RubyRequestType_NULL;
}
-ostream& operator<<(ostream& out, const RubyRequestType& obj)
+ostream&
+operator<<(ostream& out, const RubyRequestType& obj)
{
- out << RubyRequestType_to_string(obj);
- out << flush;
- return out;
+ out << RubyRequestType_to_string(obj);
+ out << flush;
+ return out;
}
-ostream& operator<<(std::ostream& out, const RubyRequest& obj)
+ostream&
+operator<<(std::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;
+ 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>
+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);
+ 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;
+ pch = strtok(NULL, c_delims);
+ }
+ delete [] tmp;
+ return tokens;
}
-
/*
* The current state of M5/Ruby integration breaks the libruby
* interface. This code is ifdef'd out for now so that we can move
@@ -129,41 +133,44 @@ vector<string> tokenizeString(string str, string delims)
* later date.
*/
#if 0
-void libruby_init(const char* cfg_filename)
-{
- ifstream cfg_output(cfg_filename);
-
- vector<RubyObjConf> * sys_conf = new vector<RubyObjConf>;
-
- string line;
- getline(cfg_output, line) ;
- while ( !cfg_output.eof() ) {
- vector<string> tokens = tokenizeString(line, " ");
- assert(tokens.size() >= 2);
- vector<string> argv;
- for (size_t i=2; i<tokens.size(); i++) {
- std::replace(tokens[i].begin(), tokens[i].end(), '%', ' ');
- std::replace(tokens[i].begin(), tokens[i].end(), '#', '\n');
- argv.push_back(tokens[i]);
+void
+libruby_init(const char* cfg_filename)
+{
+ ifstream cfg_output(cfg_filename);
+
+ vector<RubyObjConf> * sys_conf = new vector<RubyObjConf>;
+
+ string line;
+ getline(cfg_output, line) ;
+ while ( !cfg_output.eof() ) {
+ vector<string> tokens = tokenizeString(line, " ");
+ assert(tokens.size() >= 2);
+ vector<string> argv;
+ for (size_t i=2; i<tokens.size(); i++) {
+ std::replace(tokens[i].begin(), tokens[i].end(), '%', ' ');
+ std::replace(tokens[i].begin(), tokens[i].end(), '#', '\n');
+ argv.push_back(tokens[i]);
+ }
+ sys_conf->push_back(RubyObjConf(tokens[0], tokens[1], argv));
+ tokens.clear();
+ argv.clear();
+ getline(cfg_output, line);
}
- sys_conf->push_back(RubyObjConf(tokens[0], tokens[1], argv));
- tokens.clear();
- argv.clear();
- getline(cfg_output, line);
- }
- RubySystem::create(*sys_conf);
- delete sys_conf;
+ RubySystem::create(*sys_conf);
+ delete sys_conf;
}
#endif
-RubyPortHandle libruby_get_port(const char* port_name, void (*hit_callback)(int64_t access_id))
+RubyPortHandle
+libruby_get_port(const char* port_name,
+ void (*hit_callback)(int64_t access_id))
{
- //
- // Fix me: Hit callback is now a non-static member function pointer of
- // RubyPort and cannot be set to an arbitrary global function
- //
- return NULL;//static_cast<RubyPortHandle>(RubySystem::getPort(port_name, hit_callback));
+ //
+ // Fix me: Hit callback is now a non-static member function pointer of
+ // RubyPort and cannot be set to an arbitrary global function
+ //
+ return NULL;//static_cast<RubyPortHandle>(RubySystem::getPort(port_name, hit_callback));
}
RubyPortHandle libruby_get_port_by_name(const char* port_name)
@@ -175,17 +182,20 @@ RubyPortHandle libruby_get_port_by_name(const char* port_name)
return NULL;//static_cast<RubyPortHandle>(RubySystem::getPortOnly(port_name));
}
-void libruby_write_ram(uint64_t paddr, uint8_t* data, int len)
+void
+libruby_write_ram(uint64_t paddr, uint8_t* data, int len)
{
- RubySystem::getMemoryVector()->write(Address(paddr), data, len);
+ RubySystem::getMemoryVector()->write(Address(paddr), data, len);
}
-void libruby_read_ram(uint64_t paddr, uint8_t* data, int len)
+void
+libruby_read_ram(uint64_t paddr, uint8_t* data, int len)
{
- RubySystem::getMemoryVector()->read(Address(paddr), data, len);
+ RubySystem::getMemoryVector()->read(Address(paddr), data, len);
}
-int64_t libruby_issue_request(RubyPortHandle p, struct RubyRequest request)
+int64_t
+libruby_issue_request(RubyPortHandle p, struct RubyRequest request)
{
//
// Fix me: Ports should now be accessed using the python configuration
@@ -194,45 +204,58 @@ int64_t libruby_issue_request(RubyPortHandle p, struct RubyRequest request)
return 0;//return static_cast<RubyPort*>(p)->makeRequest(request);
}
-int libruby_tick(int n)
+int
+libruby_tick(int n)
{
- RubySystem::getEventQueue()->triggerEvents(RubySystem::getEventQueue()->getTime() + n);
- return 0;
+ RubyEventQueue *eventq = RubySystem::getEventQueue();
+ eventq->triggerEvents(eventq->getTime() + n);
+ return 0;
}
-void libruby_destroy()
+void
+libruby_destroy()
{
}
-const char* libruby_last_error()
+const char*
+libruby_last_error()
{
- return "";
+ return "";
}
-void libruby_print_config(std::ostream & out)
+void
+libruby_print_config(std::ostream & out)
{
- RubySystem::printConfig(out);
+ RubySystem::printConfig(out);
}
-void libruby_print_stats(std::ostream & out)
+void
+libruby_print_stats(std::ostream & out)
{
- RubySystem::printStats(out);
+ RubySystem::printStats(out);
}
-void libruby_playback_trace(char * trace_filename)
+void
+libruby_playback_trace(char * trace_filename)
{
- RubySystem::getTracer()->playbackTrace(trace_filename);
+ RubySystem::getTracer()->playbackTrace(trace_filename);
}
-void libruby_start_tracing(char * record_filename) {
- // start the trace
- RubySystem::getTracer()->startTrace(record_filename);
+void
+libruby_start_tracing(char * record_filename)
+{
+ // start the trace
+ RubySystem::getTracer()->startTrace(record_filename);
}
-void libruby_stop_tracing() {
- // start the trace
- RubySystem::getTracer()->stopTrace();
+void
+libruby_stop_tracing()
+{
+ // start the trace
+ RubySystem::getTracer()->stopTrace();
}
-uint64_t libruby_get_time() {
- return RubySystem::getCycleCount(0);
+uint64_t
+libruby_get_time()
+{
+ return RubySystem::getCycleCount(0);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 13:32:54 +0000