projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ruby: move stall and wakeup functions to AbstractController
[gem5.git]
/
src
/
mem
/
addr_mapper.hh
diff --git
a/src/mem/addr_mapper.hh
b/src/mem/addr_mapper.hh
index f469b26bad2ff261b84ce11b3206e482c9c73e38..6604096bd97cb609b8a4a9c9c2da1c2a639f71c5 100644
(file)
--- a/
src/mem/addr_mapper.hh
+++ b/
src/mem/addr_mapper.hh
@@
-62,11
+62,11
@@
class AddrMapper : public MemObject
virtual ~AddrMapper() { }
virtual ~AddrMapper() { }
- virtual MasterPort& getMasterPort(const std::string& if_name,
-
int idx = -1
);
+ virtual
Base
MasterPort& getMasterPort(const std::string& if_name,
+
PortID idx = InvalidPortID
);
- virtual SlavePort& getSlavePort(const std::string& if_name,
-
int idx = -1
);
+ virtual
Base
SlavePort& getSlavePort(const std::string& if_name,
+
PortID idx = InvalidPortID
);
virtual void init();
virtual void init();
@@
-87,23
+87,16
@@
class AddrMapper : public MemObject
public:
/**
public:
/**
- * Construct a new sender state and remember the original one
- * so that we can implement a stack.
+ * Construct a new sender state to remember the original address.
*
*
- * @param _origSenderState Sender state to remember
* @param _origAddr Address before remapping
*/
* @param _origAddr Address before remapping
*/
- AddrMapperSenderState(SenderState* _origSenderState,
- Addr _origAddr)
- : origSenderState(_origSenderState), origAddr(_origAddr)
+ AddrMapperSenderState(Addr _origAddr) : origAddr(_origAddr)
{ }
/** Destructor */
~AddrMapperSenderState() { }
{ }
/** Destructor */
~AddrMapperSenderState() { }
- /** Pointer to old sender state of packet */
- SenderState* origSenderState;
-
/** The original address the packet was destined for */
Addr origAddr;
/** The original address the packet was destined for */
Addr origAddr;