diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:41 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:41 -0500 |
| commit | cc2cc588693bb73b1892aea82fd0ac9729196f25 (patch) | |
| tree | 29056c28b5492831634fcab6692e94ffe66af3eb /src/mem/ruby/system | |
| parent | 82d136285dac52a97384961a814d5a0dda4a6482 (diff) | |
| download | gem5-cc2cc588693bb73b1892aea82fd0ac9729196f25.tar.xz | |
ruby: eliminate type Time
There is another type Time in src/base class which results in a conflict.
Diffstat (limited to 'src/mem/ruby/system')
| -rw-r--r-- | src/mem/ruby/system/CacheRecorder.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/system/CacheRecorder.hh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc index 3a76a64f7..542d91aef 100644 --- a/src/mem/ruby/system/CacheRecorder.cc +++ b/src/mem/ruby/system/CacheRecorder.cc @@ -143,7 +143,7 @@ CacheRecorder::enqueueNextFetchRequest() void CacheRecorder::addRecord(int cntrl, const physical_address_t data_addr, const physical_address_t pc_addr, - RubyRequestType type, Time time, DataBlock& data) + RubyRequestType type, Tick time, DataBlock& data) { TraceRecord* rec = (TraceRecord*)malloc(sizeof(TraceRecord) + m_block_size_bytes); diff --git a/src/mem/ruby/system/CacheRecorder.hh b/src/mem/ruby/system/CacheRecorder.hh index 2156b0689..ad1223dce 100644 --- a/src/mem/ruby/system/CacheRecorder.hh +++ b/src/mem/ruby/system/CacheRecorder.hh @@ -38,6 +38,7 @@ #include <vector> #include "base/hashmap.hh" +#include "base/types.hh" #include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/DataBlock.hh" @@ -54,7 +55,7 @@ class Sequencer; class TraceRecord { public: int m_cntrl_id; - Time m_time; + Tick m_time; physical_address_t m_data_address; physical_address_t m_pc_address; RubyRequestType m_type; @@ -75,7 +76,7 @@ class CacheRecorder uint64_t block_size_bytes); void addRecord(int cntrl, const physical_address_t data_addr, const physical_address_t pc_addr, RubyRequestType type, - Time time, DataBlock& data); + Tick time, DataBlock& data); uint64 aggregateRecords(uint8_t** data, uint64 size); |