summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-08-23 11:18:39 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2010-08-23 11:18:39 -0500
commitac575a9d8242d4ff8e40ac25f2fd5862ef551ad7 (patch)
tree8a2dc5fa815d98c970c370f155d5747d3fa2ddff /src
parent7d191366e1b8c3efaf2a08b26483bca82c00e4de (diff)
downloadgem5-ac575a9d8242d4ff8e40ac25f2fd5862ef551ad7.tar.xz
Compiler: Fixes for GCC 4.5.
Diffstat (limited to 'src')
-rw-r--r--src/arch/arm/table_walker.cc6
-rw-r--r--src/mem/cache/tags/iic_repl/gen.cc2
-rw-r--r--src/sim/serialize.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 937d51b87..9bf067b81 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -51,7 +51,7 @@ TableWalker::TableWalker(const Params *p)
: MemObject(p), stateQueue(NUM_WALKERS), port(NULL), tlb(NULL),
currState(NULL), doL1DescEvent(this), doL2DescEvent(this)
{
- sctlr = NULL;
+ sctlr = 0;
}
TableWalker::~TableWalker()
@@ -419,7 +419,7 @@ TableWalker::doL1Descriptor()
new PrefetchAbort(currState->vaddr, ArmFault::Translation0);
else
currState->fault =
- new DataAbort(currState->vaddr, NULL, currState->isWrite,
+ new DataAbort(currState->vaddr, 0, currState->isWrite,
ArmFault::Translation0);
return;
case L1Descriptor::Section:
@@ -532,7 +532,7 @@ TableWalker::doL2Descriptor()
*/
currState->fault =
- new DataAbort(currState->vaddr, NULL, currState->isWrite,
+ new DataAbort(currState->vaddr, 0, currState->isWrite,
ArmFault::AccessFlag1);
}
diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 1008c3a7c..0d1b30220 100644
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -47,7 +47,7 @@ using namespace std;
GenRepl::GenRepl(const Params *p) // fix this, should be set by cache
: Repl(p), num_pools(p->num_pools), fresh_res(p->fresh_res),
pool_res(p->pool_res), num_entries(0), num_pool_entries(0), misses(0),
- pools(pools = new GenPool[num_pools+1])
+ pools(new GenPool[num_pools+1])
{
}
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc
index d6d5ac094..aa343d0e9 100644
--- a/src/sim/serialize.cc
+++ b/src/sim/serialize.cc
@@ -269,7 +269,7 @@ arrayParamIn(Checkpoint *cp, const string &section, const string &name,
// for which operator[] returns a special reference class
// that's not the same as 'bool&', (since it's a packed
// vector)
- T scalar_value;
+ T scalar_value = 0;
if (!parseParam(tokens[i], scalar_value)) {
string err("could not parse \"");
@@ -311,7 +311,7 @@ arrayParamIn(Checkpoint *cp, const string &section,
// for which operator[] returns a special reference class
// that's not the same as 'bool&', (since it's a packed
// vector)
- T scalar_value;
+ T scalar_value = 0;
if (!parseParam(tokens[i], scalar_value)) {
string err("could not parse \"");