diff options
Diffstat (limited to 'src/mem/ruby')
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubyRequest.hh | 4 | ||||
| -rw-r--r-- | src/mem/ruby/system/Sequencer.cc | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh index 357eddbb5..cdb04bceb 100644 --- a/src/mem/ruby/slicc_interface/RubyRequest.hh +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh @@ -49,12 +49,12 @@ class RubyRequest : public Message PrefetchBit m_Prefetch; uint8_t* data; PacketPtr pkt; - unsigned m_contextId; + ContextID m_contextId; RubyRequest(Tick curTime, uint64_t _paddr, uint8_t* _data, int _len, uint64_t _pc, RubyRequestType _type, RubyAccessMode _access_mode, PacketPtr _pkt, PrefetchBit _pb = PrefetchBit_No, - unsigned _proc_id = 100) + ContextID _proc_id = 100) : Message(curTime), m_PhysicalAddress(_paddr), m_Type(_type), diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 32e4c107c..01b868017 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -667,10 +667,8 @@ void Sequencer::issueRequest(PacketPtr pkt, RubyRequestType secondary_type) { assert(pkt != NULL); - int proc_id = -1; - if (pkt->req->hasContextId()) { - proc_id = pkt->req->contextId(); - } + ContextID proc_id = pkt->req->hasContextId() ? + pkt->req->contextId() : InvalidContextID; // If valid, copy the pc to the ruby request Addr pc = 0; |