projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base, sim: Add missing destructors
[gem5.git]
/
src
/
sim
/
core.hh
diff --git
a/src/sim/core.hh
b/src/sim/core.hh
index a529ff17b429a6c5b9b148523668746a405a4abd..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) 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
* 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 <string>
#include "base/types.hh"
+#include "sim/eventq.hh"
/// The universal simulation clock.
/// 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;
const Tick retryTime = 1000;
@@
-72,7
+72,7
@@
extern double ps; ///< picosecond
extern double Hz; ///< Hz
extern double kHz; ///< kHz
extern double MHz; ///< MHz
extern double Hz; ///< Hz
extern double kHz; ///< kHz
extern double MHz; ///< MHz
-extern double GH
Z
; ///< GHz
+extern double GH
z
; ///< GHz
/** @}*/
} // namespace Float
/** @}*/
} // namespace Float
@@
-91,11
+91,16
@@
extern Tick ps; ///< picosecond
} // namespace Int
} // namespace SimClock
/** @} */
} // namespace Int
} // namespace SimClock
/** @} */
+
+void fixClockFrequency();
+bool clockFrequencyFixed();
+
void setClockFrequency(Tick ticksPerSecond);
void setClockFrequency(Tick ticksPerSecond);
+Tick getClockFrequency(); // Ticks per second.
void setOutputDir(const std::string &dir);
void setOutputDir(const std::string &dir);
-
struct
Callback;
+
class
Callback;
void registerExitCallback(Callback *callback);
void doExitCleanup();
void registerExitCallback(Callback *callback);
void doExitCleanup();