diff options
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/system.cc | 4 | ||||
| -rw-r--r-- | src/sim/system.hh | 3 | ||||
| -rw-r--r-- | src/sim/tlb.hh | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/sim/system.cc b/src/sim/system.cc index dae09b85a..5ec7f4b30 100644 --- a/src/sim/system.cc +++ b/src/sim/system.cc @@ -171,8 +171,8 @@ System::init() panic("System port on %s is not connected.\n", name()); } -MasterPort& -System::getMasterPort(const std::string &if_name, int idx) +BaseMasterPort& +System::getMasterPort(const std::string &if_name, PortID idx) { // no need to distinguish at the moment (besides checking) return _systemPort; diff --git a/src/sim/system.hh b/src/sim/system.hh index 2393c83f2..645ef8af2 100644 --- a/src/sim/system.hh +++ b/src/sim/system.hh @@ -117,7 +117,8 @@ class System : public MemObject /** * Additional function to return the Port of a memory object. */ - MasterPort& getMasterPort(const std::string &if_name, int idx = -1); + BaseMasterPort& getMasterPort(const std::string &if_name, + PortID idx = InvalidPortID); static const char *MemoryModeStrings[3]; diff --git a/src/sim/tlb.hh b/src/sim/tlb.hh index 0b89c9bd0..aadf047bf 100644 --- a/src/sim/tlb.hh +++ b/src/sim/tlb.hh @@ -49,7 +49,7 @@ #include "sim/sim_object.hh" class ThreadContext; -class MasterPort; +class BaseMasterPort; class BaseTLB : public SimObject { @@ -73,7 +73,7 @@ class BaseTLB : public SimObject * * @return A pointer to the walker master port or NULL if not present */ - virtual MasterPort* getMasterPort() { return NULL; } + virtual BaseMasterPort* getMasterPort() { return NULL; } class Translation { |