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 | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh b/src/mem/ruby/slicc_interface/RubyRequest.hh index 06ca0de1c..8ac43a8e1 100644 --- a/src/mem/ruby/slicc_interface/RubyRequest.hh +++ b/src/mem/ruby/slicc_interface/RubyRequest.hh @@ -52,7 +52,7 @@ class RubyRequest : public Message PrefetchBit m_Prefetch; uint8_t* data; PacketPtr pkt; - unsigned proc_id; + unsigned m_contextId; RubyRequest() {} RubyRequest(uint64_t _paddr, uint8_t* _data, int _len, uint64_t _pc, @@ -67,7 +67,7 @@ class RubyRequest : public Message m_Prefetch(_pb), data(_data), pkt(_pkt), - proc_id(_proc_id) + m_contextId(_proc_id) { m_LineAddress = m_PhysicalAddress; m_LineAddress.makeLineAddress(); diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index 94ba6c2d3..94d41ffe4 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -671,11 +671,13 @@ Sequencer::issueRequest(const RubyRequest& request) Address line_addr(request.m_PhysicalAddress); line_addr.makeLineAddress(); + int proc_id = request.pkt->req->hasContextId() ? + request.pkt->req->contextId() : -1; RubyRequest *msg = new RubyRequest(request.m_PhysicalAddress.getAddress(), request.data, request.m_Size, request.m_ProgramCounter.getAddress(), ctype, amtype, request.pkt, - PrefetchBit_No, request.proc_id); + PrefetchBit_No, proc_id); DPRINTFR(ProtocolTrace, "%7s %3s %10s%20s %6s>%-6s %s %s\n", g_eventQueue_ptr->getTime(), m_version, "Seq", "Begin", "", "", |