summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorAmin Farmahini <aminfar@gmail.com>2014-01-28 18:00:49 -0600
committerAmin Farmahini <aminfar@gmail.com>2014-01-28 18:00:49 -0600
commit575a73f4a11432e11167537fb301dfc5d088810f (patch)
treed9b2541a295abc2f6dcac6ad085b734247dd5ad1 /src/mem
parent7792dedfddbb9f51f2bab1d6de01e96559109797 (diff)
downloadgem5-575a73f4a11432e11167537fb301dfc5d088810f.tar.xz
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>
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/simple_dram.cc2
1 files changed, 1 insertions, 1 deletions
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