cpu: remove unnecessary data ptr from O3 internal read() funcs

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

diff --git a/src/sim/core.hh b/src/sim/core.hh
index a529ff17b429a6c5b9b148523668746a405a4abd..e0a6af91cc3ef31f78ce55cc83d450d353742fce 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
@@ -39,12 +41,10 @@
 #include <string>
 
 #include "base/types.hh"
+#include "sim/eventq.hh"
 
 /// The universal simulation clock.
-extern Tick _curTick;
-
-inline Tick curTick() { return _curTick; }
-inline void curTick(Tick newVal) { _curTick = newVal; }
+inline Tick curTick() { return _curEventQueue->getCurTick(); }
 
 const Tick retryTime = 1000;
 
@@ -95,7 +95,7 @@ void setClockFrequency(Tick ticksPerSecond);
 
 void setOutputDir(const std::string &dir);
 
-struct Callback;
+class Callback;
 void registerExitCallback(Callback *callback);
 void doExitCleanup();