base: Transition CP annotate to use shared_ptr

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

diff --git a/src/sim/core.cc b/src/sim/core.cc
index 32642c8a4c801f3145fe5d611287b0c2e5deb0de..1333c8b22c87e235ce621ee1c9bb7421a06a4f7d 100644 (file)
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -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
@@ -35,13 +37,12 @@
 #include "base/callback.hh"
 #include "base/output.hh"
 #include "sim/core.hh"
+#include "sim/eventq.hh"
 
 using namespace std;
 
-Tick curTick = 0;
-
 namespace SimClock {
-/// The simulated frequency of curTick. (In ticks per second)
+/// The simulated frequency of curTick(). (In ticks per second)
 Tick Frequency;
 
 namespace Float {
@@ -55,7 +56,7 @@ double Hz;
 double kHz;
 double MHz;
 double GHZ;
-/* namespace Float */ }
+} // namespace Float
 
 namespace Int {
 Tick s;
@@ -63,9 +64,9 @@ Tick ms;
 Tick us;
 Tick ns;
 Tick ps;
-/* namespace Float */ }
+} // namespace Float
 
-/* namespace SimClock */ }
+} // namespace SimClock
 
 void
 setClockFrequency(Tick ticksPerSecond)