diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-30 21:07:57 -0800 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-30 21:07:57 -0800 |
commit | e88165a431a90cf7e33e205794caed898ca6fcb1 (patch) | |
tree | 741d1c85c83957add6250af0a208d1b976023e29 /src/mem | |
parent | 39f314cc151b0a05ee0e654d52bad1c906fac668 (diff) | |
parent | ade53def9252a36a39b2c4bd61196355906f0505 (diff) | |
download | gem5-e88165a431a90cf7e33e205794caed898ca6fcb1.tar.xz |
Merge with main repository.
Diffstat (limited to 'src/mem')
-rw-r--r-- | src/mem/ruby/system/RubyPort.cc | 3 | ||||
-rw-r--r-- | src/mem/ruby/system/RubyPort.hh | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc index b60ca2a07..af414f17a 100644 --- a/src/mem/ruby/system/RubyPort.cc +++ b/src/mem/ruby/system/RubyPort.cc @@ -88,8 +88,7 @@ RubyPort::getPort(const std::string &if_name, int idx) // RubyPort should only have one port to physical memory assert (physMemPort == NULL); - physMemPort = new M5Port(csprintf("%s-physMemPort", name()), this, - ruby_system, access_phys_mem); + physMemPort = new PioPort(csprintf("%s-physMemPort", name()), this); return physMemPort; } diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh index 2ffdef3d9..6df713a13 100644 --- a/src/mem/ruby/system/RubyPort.hh +++ b/src/mem/ruby/system/RubyPort.hh @@ -155,7 +155,7 @@ class RubyPort : public MemObject uint16_t m_port_id; uint64_t m_request_cnt; - M5Port* physMemPort; + PioPort* physMemPort; /*! Vector of CPU Port attached to this Ruby port. */ typedef std::vector<M5Port*>::iterator CpuPortIter; |