summaryrefslogtreecommitdiff
path: root/src/cpu/base.hh
diff options
context:
space:
mode:
authorLisa Hsu <Lisa.Hsu@amd.com>2010-01-18 14:33:02 -0800
committerLisa Hsu <Lisa.Hsu@amd.com>2010-01-18 14:33:02 -0800
commit0484432a7ca177d52fa98746b16c92805df73189 (patch)
tree2ef87808c118539c446b3c5f09e342bf1b434af8 /src/cpu/base.hh
parentde904a6d396f01a42da5399b2798568c61abeeea (diff)
parent4a40ac71f8679ea7c15efb45afd522bf4d3b3e73 (diff)
downloadgem5-0484432a7ca177d52fa98746b16c92805df73189.tar.xz
Automated merge with ssh://hsul@localhost:4444//repo/m5
Diffstat (limited to 'src/cpu/base.hh')
-rw-r--r--src/cpu/base.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/base.hh b/src/cpu/base.hh
index bfeec0870..b229ddd38 100644
--- a/src/cpu/base.hh
+++ b/src/cpu/base.hh
@@ -274,7 +274,7 @@ class BaseCPU : public MemObject
*/
virtual BranchPred *getBranchPred() { return NULL; };
- virtual Counter totalInstructions() const { return 0; }
+ virtual Counter totalInstructions() const = 0;
// Function tracing
private: