110,112c110,116
< l1_cntrl.requestFromL1Cache = ruby_system.network.slave
< l1_cntrl.responseFromL1Cache = ruby_system.network.slave
< l1_cntrl.unblockFromL1Cache = ruby_system.network.slave
---
> l1_cntrl.mandatoryQueue = MessageBuffer()
> l1_cntrl.requestFromL1Cache = MessageBuffer()
> l1_cntrl.requestFromL1Cache.master = ruby_system.network.slave
> l1_cntrl.responseFromL1Cache = MessageBuffer()
> l1_cntrl.responseFromL1Cache.master = ruby_system.network.slave
> l1_cntrl.unblockFromL1Cache = MessageBuffer()
> l1_cntrl.unblockFromL1Cache.master = ruby_system.network.slave
114,115c118
< l1_cntrl.requestToL1Cache = ruby_system.network.master
< l1_cntrl.responseToL1Cache = ruby_system.network.master
---
> l1_cntrl.optionalQueue = MessageBuffer()
116a120,123
> l1_cntrl.requestToL1Cache = MessageBuffer()
> l1_cntrl.requestToL1Cache.slave = ruby_system.network.master
> l1_cntrl.responseToL1Cache = MessageBuffer()
> l1_cntrl.responseToL1Cache.slave = ruby_system.network.master
117a125
>
137,139c145,150
< l2_cntrl.DirRequestFromL2Cache = ruby_system.network.slave
< l2_cntrl.L1RequestFromL2Cache = ruby_system.network.slave
< l2_cntrl.responseFromL2Cache = ruby_system.network.slave
---
> l2_cntrl.DirRequestFromL2Cache = MessageBuffer()
> l2_cntrl.DirRequestFromL2Cache.master = ruby_system.network.slave
> l2_cntrl.L1RequestFromL2Cache = MessageBuffer()
> l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave
> l2_cntrl.responseFromL2Cache = MessageBuffer()
> l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave
141,143c152,157
< l2_cntrl.unblockToL2Cache = ruby_system.network.master
< l2_cntrl.L1RequestToL2Cache = ruby_system.network.master
< l2_cntrl.responseToL2Cache = ruby_system.network.master
---
> l2_cntrl.unblockToL2Cache = MessageBuffer()
> l2_cntrl.unblockToL2Cache.slave = ruby_system.network.master
> l2_cntrl.L1RequestToL2Cache = MessageBuffer()
> l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master
> l2_cntrl.responseToL2Cache = MessageBuffer()
> l2_cntrl.responseToL2Cache.slave = ruby_system.network.master
172,174c186,192
< dir_cntrl.requestToDir = ruby_system.network.master
< dir_cntrl.responseToDir = ruby_system.network.master
< dir_cntrl.responseFromDir = ruby_system.network.slave
---
> dir_cntrl.requestToDir = MessageBuffer()
> dir_cntrl.requestToDir.slave = ruby_system.network.master
> dir_cntrl.responseToDir = MessageBuffer()
> dir_cntrl.responseToDir.slave = ruby_system.network.master
> dir_cntrl.responseFromDir = MessageBuffer()
> dir_cntrl.responseFromDir.master = ruby_system.network.slave
> dir_cntrl.responseFromMemory = MessageBuffer()
192,193c210,214
< dma_cntrl.responseFromDir = ruby_system.network.master
< dma_cntrl.requestToDir = ruby_system.network.slave
---
> dma_cntrl.mandatoryQueue = MessageBuffer()
> dma_cntrl.responseFromDir = MessageBuffer(ordered = True)
> dma_cntrl.responseFromDir.slave = ruby_system.network.master
> dma_cntrl.requestToDir = MessageBuffer()
> dma_cntrl.requestToDir.master = ruby_system.network.slave
210,211c231,235
< io_controller.responseFromDir = ruby_system.network.master
< io_controller.requestToDir = ruby_system.network.slave
---
> io_controller.mandatoryQueue = MessageBuffer()
> io_controller.responseFromDir = MessageBuffer(ordered = True)
> io_controller.responseFromDir.slave = ruby_system.network.master
> io_controller.requestToDir = MessageBuffer()
> io_controller.requestToDir.master = ruby_system.network.slave