summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2009-07-18 17:40:20 -0500
committerDerek Hower <drh5@cs.wisc.edu>2009-07-18 17:40:20 -0500
commit926ab6e6dbc2417f6c103512481a60e64be4fea8 (patch)
treed8598dd4a0841928729ebde1f0b00882e6498604 /src/mem/ruby/common
parent4b7ea4cb510465bc82c6679407d5a125cfddd18c (diff)
parentd85cd08113e61817fdf1df978f2713ba8b094996 (diff)
downloadgem5-926ab6e6dbc2417f6c103512481a60e64be4fea8.tar.xz
merge
Diffstat (limited to 'src/mem/ruby/common')
-rw-r--r--src/mem/ruby/common/Driver.hh17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index 9aa756386..9d17fcadb 100644
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -40,13 +40,8 @@
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/system/NodeID.hh"
-#include "mem/protocol/CacheRequestType.hh"
+#include "mem/ruby/common/Address.hh"
-class RubySystem;
-class SubBlock;
-class Address;
-class MachineID;
-class SimicsHypervisor;
class Driver {
public:
@@ -58,15 +53,12 @@ public:
// Public Methods
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 dmaHitCallback() {};
+ virtual void hitCallback(int64_t id) = 0; // Called by sequencer
+ virtual void go() = 0;
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);}
- virtual int inTransaction(int procID, int thread ) const{
- cout << "Driver.hh inTransaction " << endl;
-return false; } //called by Sequencer
virtual void printDebug(){} //called by Sequencer
virtual void printStats(ostream& out) const = 0;
@@ -74,7 +66,6 @@ return false; } //called by Sequencer
virtual void printConfig(ostream& out) const = 0;
- //virtual void abortCallback(NodeID proc){}
virtual integer_t readPhysicalMemory(int procID, physical_address_t address,
int len ){ ASSERT(0); return 0; }