sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ruby: fixes to support more types of RubyRequests

Browse source
This commit is contained in:
Brad Beckmann 2011-04-06 14:41:41 -07:00
parent afa897403d
commit 95faf1904b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mem/ruby/system/Sequencer.cc
View file

@ -229,6 +229,7 @@ Sequencer::insertRequest(SequencerRequest* request)
Address line_addr(request->ruby_request.m_PhysicalAddress); Address line_addr(request->ruby_request.m_PhysicalAddress);
line_addr.makeLineAddress(); line_addr.makeLineAddress();
if ((request->ruby_request.m_Type == RubyRequestType_ST) || if ((request->ruby_request.m_Type == RubyRequestType_ST) ||
(request->ruby_request.m_Type == RubyRequestType_ATOMIC) ||
(request->ruby_request.m_Type == RubyRequestType_RMW_Read) || (request->ruby_request.m_Type == RubyRequestType_RMW_Read) ||
(request->ruby_request.m_Type == RubyRequestType_RMW_Write) || (request->ruby_request.m_Type == RubyRequestType_RMW_Write) ||
(request->ruby_request.m_Type == RubyRequestType_Load_Linked) || (request->ruby_request.m_Type == RubyRequestType_Load_Linked) ||
@ -381,6 +382,7 @@ Sequencer::writeCallback(const Address& address,
markRemoved(); markRemoved();
assert((request->ruby_request.m_Type == RubyRequestType_ST) || assert((request->ruby_request.m_Type == RubyRequestType_ST) ||
(request->ruby_request.m_Type == RubyRequestType_ATOMIC) ||
(request->ruby_request.m_Type == RubyRequestType_RMW_Read) || (request->ruby_request.m_Type == RubyRequestType_RMW_Read) ||
(request->ruby_request.m_Type == RubyRequestType_RMW_Write) || (request->ruby_request.m_Type == RubyRequestType_RMW_Write) ||
(request->ruby_request.m_Type == RubyRequestType_Load_Linked) || (request->ruby_request.m_Type == RubyRequestType_Load_Linked) ||
@ -648,6 +650,7 @@ Sequencer::issueRequest(const RubyRequest& request)
// //
case RubyRequestType_Load_Linked: case RubyRequestType_Load_Linked:
case RubyRequestType_Store_Conditional: case RubyRequestType_Store_Conditional:
case RubyRequestType_ATOMIC:
ctype = RubyRequestType_ATOMIC; ctype = RubyRequestType_ATOMIC;
break; break;
default: default:
@ -671,8 +674,10 @@ Sequencer::issueRequest(const RubyRequest& request)
Address line_addr(request.m_PhysicalAddress); Address line_addr(request.m_PhysicalAddress);
line_addr.makeLineAddress(); line_addr.makeLineAddress();
int proc_id = request.pkt->req->hasContextId() ? int proc_id = -1;
request.pkt->req->contextId() : -1; if (request.pkt != NULL && request.pkt->req->hasContextId()) {
proc_id = request.pkt->req->contextId();
}
RubyRequest *msg = new RubyRequest(request.m_PhysicalAddress.getAddress(), RubyRequest *msg = new RubyRequest(request.m_PhysicalAddress.getAddress(),
request.data, request.m_Size, request.data, request.m_Size,
request.m_ProgramCounter.getAddress(), request.m_ProgramCounter.getAddress(),