MI data corruption bug fix
This commit is contained in:
parent
353a69eae7
commit
7ef3e3b2c2
|
@ -22,6 +22,7 @@ machine(Directory, "Directory protocol")
|
|||
M_DWR, desc="Blocked on an invalidation for a DMA write";
|
||||
|
||||
M_DWRI, desc="Intermediate state M_DWR-->I";
|
||||
M_DRDI, desc="Intermediate state M_DRD-->I";
|
||||
|
||||
IM, desc="Intermediate state I-->M";
|
||||
MI, desc="Intermediate state M-->I";
|
||||
|
@ -323,13 +324,12 @@ machine(Directory, "Directory protocol")
|
|||
dmaRequestQueue_in.dequeue();
|
||||
}
|
||||
|
||||
action(l_writeDataToMemory, "l", desc="Write PUTX data to memory") {
|
||||
action(l_writeDataToMemory, "pl", desc="Write PUTX data to memory") {
|
||||
peek(requestQueue_in, RequestMsg) {
|
||||
// assert(in_msg.Dirty);
|
||||
// assert(in_msg.MessageSize == MessageSizeType:Writeback_Data);
|
||||
directory[in_msg.Address].DataBlk := in_msg.DataBlk;
|
||||
DEBUG_EXPR(in_msg.Address);
|
||||
DEBUG_EXPR(in_msg.DataBlk);
|
||||
//directory[in_msg.Address].DataBlk.copyPartial(in_msg.DataBlk, addressOffset(in_msg.Address), in_msg.Len);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -416,7 +416,8 @@ machine(Directory, "Directory protocol")
|
|||
out_msg.Address := address;
|
||||
out_msg.Type := MemoryRequestType:MEMORY_WB;
|
||||
out_msg.OriginalRequestorMachId := in_msg.Requestor;
|
||||
//out_msg.DataBlk := in_msg.DataBlk;
|
||||
// get incoming data
|
||||
// out_msg.DataBlk := in_msg.DataBlk;
|
||||
out_msg.DataBlk.copyPartial(TBEs[address].DataBlk, addressOffset(TBEs[address].PhysicalAddress), TBEs[address].Len);
|
||||
out_msg.MessageSize := in_msg.MessageSize;
|
||||
//out_msg.Prefetch := in_msg.Prefetch;
|
||||
|
@ -448,12 +449,14 @@ machine(Directory, "Directory protocol")
|
|||
}
|
||||
|
||||
action(w_writeDataToMemoryFromTBE, "\w", desc="Write date to directory memory from TBE") {
|
||||
directory[address].DataBlk := TBEs[address].DataBlk;
|
||||
//directory[address].DataBlk := TBEs[address].DataBlk;
|
||||
directory[address].DataBlk.copyPartial(TBEs[address].DataBlk, addressOffset(TBEs[address].PhysicalAddress), TBEs[address].Len);
|
||||
|
||||
}
|
||||
|
||||
// TRANSITIONS
|
||||
|
||||
transition({M_DRD, M_DWR, M_DWRI}, GETX) {
|
||||
transition({M_DRD, M_DWR, M_DWRI, M_DRDI}, GETX) {
|
||||
z_recycleRequestQueue;
|
||||
}
|
||||
|
||||
|
@ -465,6 +468,7 @@ machine(Directory, "Directory protocol")
|
|||
y_recycleDMARequestQueue;
|
||||
}
|
||||
|
||||
|
||||
transition(I, GETX, IM) {
|
||||
//d_sendData;
|
||||
qf_queueMemoryFetchRequest;
|
||||
|
@ -507,18 +511,27 @@ machine(Directory, "Directory protocol")
|
|||
}
|
||||
|
||||
transition(M, DMA_READ, M_DRD) {
|
||||
v_allocateTBE;
|
||||
inv_sendCacheInvalidate;
|
||||
p_popIncomingDMARequestQueue;
|
||||
}
|
||||
|
||||
transition(M_DRD, PUTX, I) {
|
||||
transition(M_DRD, PUTX, M_DRDI) {
|
||||
l_writeDataToMemory;
|
||||
drp_sendDMAData;
|
||||
c_clearOwner;
|
||||
a_sendWriteBackAck;
|
||||
d_deallocateDirectory;
|
||||
l_queueMemoryWBRequest;
|
||||
i_popIncomingRequestQueue;
|
||||
}
|
||||
|
||||
transition(M_DRDI, Memory_Ack, I) {
|
||||
l_sendWriteBackAck;
|
||||
w_deallocateTBE;
|
||||
d_deallocateDirectory;
|
||||
l_popMemQueue;
|
||||
}
|
||||
|
||||
|
||||
transition(M, DMA_WRITE, M_DWR) {
|
||||
v_allocateTBE;
|
||||
inv_sendCacheInvalidate;
|
||||
|
@ -526,6 +539,7 @@ machine(Directory, "Directory protocol")
|
|||
}
|
||||
|
||||
transition(M_DWR, PUTX, M_DWRI) {
|
||||
l_writeDataToMemory;
|
||||
qw_queueMemoryWBRequest_partialTBE;
|
||||
c_clearOwner;
|
||||
i_popIncomingRequestQueue;
|
||||
|
@ -547,6 +561,7 @@ machine(Directory, "Directory protocol")
|
|||
}
|
||||
|
||||
transition(M, PUTX, MI) {
|
||||
l_writeDataToMemory;
|
||||
c_clearOwner;
|
||||
v_allocateTBEFromRequestNet;
|
||||
l_queueMemoryWBRequest;
|
||||
|
|
Loading…
Reference in a new issue