From: Amin Farmahini <aminfar@gmail.com>
Date: Wed, 29 Jan 2014 00:00:49 +0000 (-0600)
Subject: mem: Fixes a bug in simple_dram write merging
X-Git-Tag: stable_2014_08_26~184
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=575a73f4a11432e11167537fb301dfc5d088810f;p=gem5.git

mem: Fixes a bug in simple_dram write merging
Fixes updating the value of size in the write merge function.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
---

diff --git a/src/mem/simple_dram.cc b/src/mem/simple_dram.cc
index b2ee4172f..9538ea719 100644
--- a/src/mem/simple_dram.cc
+++ b/src/mem/simple_dram.cc
@@ -506,8 +506,8 @@ SimpleDRAM::addToWriteQueue(PacketPtr pkt, unsigned int pktCount)
                     merged = true;
                     // the existing queue item needs to be adjusted with
                     // respect to both address and size
-                    (*w)->addr = addr;
                     (*w)->size = (*w)->addr + (*w)->size - addr;
+                    (*w)->addr = addr;
                 }
             } else {
                 // the new one starts after the current one, figure