278,280c278,280
< : noWB(false), isSplit(false), pktToSend(false), outstanding(1),
< mainPkt(NULL), pendingPacket(NULL)
< { }
---
> : mainPkt(NULL), pendingPacket(NULL), outstanding(1),
> noWB(false), isSplit(false), pktToSend(false)
> { }
283a284,291
> /** The main packet from a split load, used during writeback. */
> PacketPtr mainPkt;
> /** A second packet from a split store that needs sending. */
> PacketPtr pendingPacket;
> /** The LQ/SQ index of the instruction. */
> uint8_t idx;
> /** Number of outstanding packets to complete. */
> uint8_t outstanding;
286,287d293
< /** The LQ/SQ index of the instruction. */
< int idx;
294,299d299
< /** Number of outstanding packets to complete. */
< int outstanding;
< /** The main packet from a split load, used during writeback. */
< PacketPtr mainPkt;
< /** A second packet from a split store that needs sending. */
< PacketPtr pendingPacket;
345c345,346
<
---
> /** The store data. */
> char data[16];
354,356c355
< int size;
< /** The store data. */
< char data[16];
---
> uint8_t size;
596c595
< load_inst->recordResult = false;
---
> load_inst->recordResult(false);
598c597
< load_inst->recordResult = true;
---
> load_inst->recordResult(true);
654c653
< assert(storeQueue[store_idx].inst->effAddrValid);
---
> assert(storeQueue[store_idx].inst->effAddrValid());