projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Macros are nasty, so let's get rid of them. Convert all
[gem5.git]
/
dev
/
tsunami_cchip.hh
diff --git
a/dev/tsunami_cchip.hh
b/dev/tsunami_cchip.hh
index 381fb58f194ec58075ad990c2bea47a930ccbaa9..3269cf53a13360cdaf542bd576753615cf119f52 100644
(file)
--- a/
dev/tsunami_cchip.hh
+++ b/
dev/tsunami_cchip.hh
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 200
3
The Regents of The University of Michigan
+ * Copyright (c) 200
4
The Regents of The University of Michigan
* 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
@@
-33,13
+33,14
@@
#ifndef __TSUNAMI_CCHIP_HH__
#define __TSUNAMI_CCHIP_HH__
#ifndef __TSUNAMI_CCHIP_HH__
#define __TSUNAMI_CCHIP_HH__
-#include "mem/functional_mem/functional_memory.hh"
#include "dev/tsunami.hh"
#include "dev/tsunami.hh"
+#include "base/range.hh"
+#include "dev/io_device.hh"
/*
* Tsunami CChip
*/
/*
* Tsunami CChip
*/
-class TsunamiCChip : public
FunctionalMemory
+class TsunamiCChip : public
PioDevice
{
private:
/** The base address of this device */
{
private:
/** The base address of this device */
@@
-49,11
+50,11
@@
class TsunamiCChip : public FunctionalMemory
static const Addr size = 0xfff;
protected:
static const Addr size = 0xfff;
protected:
-
/**
-
* pointer to the tsunami object.
-
* This is our access to all the other tsunami
-
* devices.
-
*/
+ /**
+ * pointer to the tsunami object.
+ * This is our access to all the other tsunami
+ * devices.
+ */
Tsunami *tsunami;
/**
Tsunami *tsunami;
/**
@@
-95,9
+96,12
@@
class TsunamiCChip : public FunctionalMemory
* @param t pointer back to the Tsunami object that we belong to.
* @param a address we are mapped at.
* @param mmu pointer to the memory controller that sends us events.
* @param t pointer back to the Tsunami object that we belong to.
* @param a address we are mapped at.
* @param mmu pointer to the memory controller that sends us events.
+ * @param hier object to store parameters universal the device hierarchy
+ * @param bus The bus that this device is attached to
*/
TsunamiCChip(const std::string &name, Tsunami *t, Addr a,
*/
TsunamiCChip(const std::string &name, Tsunami *t, Addr a,
- MemoryController *mmu);
+ MemoryController *mmu, HierParams *hier, Bus *bus,
+ Tick pio_latency);
/**
* Process a read to the CChip.
/**
* Process a read to the CChip.
@@
-145,6
+149,13
@@
class TsunamiCChip : public FunctionalMemory
* @param section The section name of this object
*/
virtual void unserialize(Checkpoint *cp, const std::string §ion);
* @param section The section name of this object
*/
virtual void unserialize(Checkpoint *cp, const std::string §ion);
+
+ /**
+ * Return how long this access will take.
+ * @param req the memory request to calcuate
+ * @return Tick when the request is done
+ */
+ Tick cacheAccess(MemReqPtr &req);
};
#endif // __TSUNAMI_CCHIP_HH__
};
#endif // __TSUNAMI_CCHIP_HH__