summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common/Driver.hh
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-07-06 15:49:47 -0700
committerNathan Binkert <nate@binkert.org>2009-07-06 15:49:47 -0700
commita7904e2cf341d5452c5622adfcbdcd268d4ab7d1 (patch)
tree76c744e731c275b393130b869c2c2944807a77af /src/mem/ruby/common/Driver.hh
parent5b080ae0463c9644eb81bd923e25139dfe787e6e (diff)
downloadgem5-a7904e2cf341d5452c5622adfcbdcd268d4ab7d1.tar.xz
ruby: apply some fixes that were overwritten by the recent ruby import.
Diffstat (limited to 'src/mem/ruby/common/Driver.hh')
-rw-r--r--src/mem/ruby/common/Driver.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index db8279fa5..9aa756386 100644
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -60,7 +60,7 @@ public:
virtual void get_network_config() {}
virtual void dmaHitCallback() = 0;
virtual void hitCallback(NodeID proc, SubBlock& data, CacheRequestType type, int thread) = 0; // Called by sequencer
- virtual void conflictCallback(NodeID proc, SubBlock& data, CacheRequestType type, int thread) { assert(0) }; // Called by sequencer
+ virtual void conflictCallback(NodeID proc, SubBlock& data, CacheRequestType type, int thread) { assert(0); }; // Called by sequencer
virtual integer_t getInstructionCount(int procID) const { return 1; }
virtual integer_t getCycleCount(int procID) const { return 1; }
virtual void addThreadDependency(int procID, int requestor_thread, int conflict_thread) const { assert(0);}