ruby: Removed g_SIMULATING flag

1. removed checks from tester files
2. removed else clause in Sequencer and DirectoryMemory else clause is
needed by the tester, it is up to Derek to revive it elsewhere when he
gets to it

Also:
1. Changed m_entries in DirectoryMemory to a map
2. And replaced SIMICS_read_physical_memory with a call to now-dummy
Derek's-to-be readPhysMem function

5 files changed, 0 insertions, 21 deletions

diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index bc27c2a35..7b7d0c9d2 100644
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -45,10 +45,6 @@
 
 DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
 {
-  if (g_SIMULATING) {
-    ERROR_MSG("g_SIMULATING should not be defined.");
-  }
-
   m_finish_time = 0;
   m_last_issue = -11;
   m_done_counter = 0;
diff --git a/src/mem/ruby/tester/RaceyDriver.cc b/src/mem/ruby/tester/RaceyDriver.cc
index 6ea9ec795..c56557645 100644
--- a/src/mem/ruby/tester/RaceyDriver.cc
+++ b/src/mem/ruby/tester/RaceyDriver.cc
@@ -41,10 +41,6 @@
 
 RaceyDriver::RaceyDriver()
 {
-  if (g_SIMULATING) {
-    ERROR_MSG("g_SIMULATING should not be defined.");
-  }
-
   // debug transition?
   if(false) {
     assert(g_debug_ptr);
diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc
index 1d8dcb80a..081fc9d5e 100644
--- a/src/mem/ruby/tester/SyntheticDriver.cc
+++ b/src/mem/ruby/tester/SyntheticDriver.cc
@@ -42,11 +42,6 @@
 
 SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
 {
-  cout << "SyntheticDriver::SyntheticDriver" << endl;
-  if (g_SIMULATING) {
-    ERROR_MSG("g_SIMULATING should not be defined.");
-  }
-
   m_finish_time = 0;
   m_done_counter = 0;
 
diff --git a/src/mem/ruby/tester/Tester.cc b/src/mem/ruby/tester/Tester.cc
index 53d6bc670..eafc04a92 100644
--- a/src/mem/ruby/tester/Tester.cc
+++ b/src/mem/ruby/tester/Tester.cc
@@ -42,10 +42,6 @@
 
 Tester::Tester(RubySystem* sys_ptr)
 {
-  if (g_SIMULATING) {
-    ERROR_MSG("g_SIMULATING should not be defined.");
-  }
-
   g_callback_counter = 0;
 
   // add the tester consumer to the global event queue
diff --git a/src/mem/ruby/tester/main.cc b/src/mem/ruby/tester/main.cc
index f36168c8e..5e77488e9 100644
--- a/src/mem/ruby/tester/main.cc
+++ b/src/mem/ruby/tester/main.cc
@@ -43,9 +43,5 @@
 
 int main(int argc, char *argv[])
 {
-  if (g_SIMULATING) {
-    ERROR_MSG("g_SIMULATING should not be defined.");
-  }
-
   tester_main(argc, argv);
 }