ARM: Implement WFE/WFI/SEV semantics.

[gem5.git] / src / sim / core.cc

diff --git a/src/sim/core.cc b/src/sim/core.cc
index 75f1f384c6a49be90ce6f2f52760810a5a077432..ab75e1d9a1783de9d14f197bb53200f3a648b854 100644 (file)
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -38,10 +38,10 @@
 
 using namespace std;
 
-Tick curTick = 0;
+Tick _curTick = 0;
 
-namespace Clock {
-/// The simulated frequency of curTick. (In ticks per second)
+namespace SimClock {
+/// The simulated frequency of curTick(). (In ticks per second)
 Tick Frequency;
 
 namespace Float {
@@ -55,7 +55,7 @@ double Hz;
 double kHz;
 double MHz;
 double GHZ;
-/* namespace Float */ }
+} // namespace Float
 
 namespace Int {
 Tick s;
@@ -63,14 +63,14 @@ Tick ms;
 Tick us;
 Tick ns;
 Tick ps;
-/* namespace Float */ }
+} // namespace Float
 
-/* namespace Clock */ }
+} // namespace SimClock
 
 void
 setClockFrequency(Tick ticksPerSecond)
 {
-    using namespace Clock;
+    using namespace SimClock;
     Frequency = ticksPerSecond;
     Float::s = static_cast<double>(Frequency);
     Float::ms = Float::s / 1.0e3;
@@ -97,14 +97,6 @@ setOutputDir(const string &dir)
     simout.setDirectory(dir);
 }
 
-ostream *outputStream;
-
-void
-setOutputFile(const string &file)
-{
-    outputStream = simout.find(file);
-}
-
 /**
  * Queue of C++ callbacks to invoke on simulator exit.
  */