summaryrefslogtreecommitdiff
path: root/src/cpu/o3
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-04-21 19:12:13 -0400
committerAli Saidi <saidi@eecs.umich.edu>2007-04-21 19:12:13 -0400
commit088a0565836fc678fabef3c8662de79595bf20c2 (patch)
tree1c6db574ec295ed96fd9fe2beeca0f44d3b019c3 /src/cpu/o3
parent25e92383c839f6d69f933f614fd3f9acef907075 (diff)
parent53ba34391ff7b82dd143c7cce0d31bf56882d5ae (diff)
downloadgem5-088a0565836fc678fabef3c8662de79595bf20c2.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/tmp/newmem --HG-- extra : convert_revision : 8f173d3522e2e8847e51dfab48f35e34e6d3c1a7
Diffstat (limited to 'src/cpu/o3')
-rw-r--r--src/cpu/o3/lsq_unit.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index f24de20d9..cc33e025d 100644
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -33,6 +33,7 @@
#define __CPU_O3_LSQ_UNIT_HH__
#include <algorithm>
+#include <cstring>
#include <map>
#include <queue>
@@ -292,7 +293,7 @@ class LSQUnit {
: inst(NULL), req(NULL), size(0),
canWB(0), committed(0), completed(0)
{
- bzero(data, sizeof(data));
+ std::memset(data, 0, sizeof(data));
}
/** Constructs a store queue entry for a given instruction. */
@@ -300,7 +301,7 @@ class LSQUnit {
: inst(_inst), req(NULL), size(0),
canWB(0), committed(0), completed(0)
{
- bzero(data, sizeof(data));
+ std::memset(data, 0, sizeof(data));
}
/** The store instruction. */