arch-arm: Do not check MustBeOne flag for TLB requests from the prefetcher

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

diff --git a/src/sim/core.hh b/src/sim/core.hh
index b5a082bcb8650e44d111b84b3f96045b1c220a9a..8e464548fe138120209f020286dfe0b914e7d04b 100644 (file)
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2006 The Regents of The University of Michigan
+ * Copyright (c) 2013 Advanced Micro Devices, Inc.
+ * Copyright (c) 2013 Mark D. Hill and David A. Wood
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +44,7 @@
 #include "sim/eventq.hh"
 
 /// The universal simulation clock.
-inline Tick curTick() { return mainEventQueue.getCurTick(); }
+inline Tick curTick() { return _curEventQueue->getCurTick(); }
 
 const Tick retryTime = 1000;
 
@@ -70,7 +72,7 @@ extern double ps; ///< picosecond
 extern double Hz;  ///< Hz
 extern double kHz; ///< kHz
 extern double MHz; ///< MHz
-extern double GHZ; ///< GHz
+extern double GHz; ///< GHz
 /** @}*/
 } // namespace Float
 
@@ -89,7 +91,12 @@ extern Tick ps; ///< picosecond
 } // namespace Int
 } // namespace SimClock
 /** @} */
+
+void fixClockFrequency();
+bool clockFrequencyFixed();
+
 void setClockFrequency(Tick ticksPerSecond);
+Tick getClockFrequency(); // Ticks per second.
 
 void setOutputDir(const std::string &dir);