changeset 4154f3e1edae in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=4154f3e1edae
description:
Compiler: Fixes for GCC 4.5.
diffstat:
src/arch/arm/table_walker.cc | 6 +++---
src/mem/cache/tags/iic_repl/gen.cc | 2 +-
src/sim/serialize.cc | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diffs (63 lines):
diff -r 0002812cefe5 -r 4154f3e1edae src/arch/arm/table_walker.cc
--- a/src/arch/arm/table_walker.cc Mon Aug 23 11:18:39 2010 -0500
+++ b/src/arch/arm/table_walker.cc Mon Aug 23 11:18:39 2010 -0500
@@ -51,7 +51,7 @@
: 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 @@
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 @@
*/
currState->fault =
- new DataAbort(currState->vaddr, NULL, currState->isWrite,
+ new DataAbort(currState->vaddr, 0, currState->isWrite,
ArmFault::AccessFlag1);
}
diff -r 0002812cefe5 -r 4154f3e1edae src/mem/cache/tags/iic_repl/gen.cc
--- a/src/mem/cache/tags/iic_repl/gen.cc Mon Aug 23 11:18:39 2010 -0500
+++ b/src/mem/cache/tags/iic_repl/gen.cc Mon Aug 23 11:18:39 2010 -0500
@@ -47,7 +47,7 @@
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 -r 0002812cefe5 -r 4154f3e1edae src/sim/serialize.cc
--- a/src/sim/serialize.cc Mon Aug 23 11:18:39 2010 -0500
+++ b/src/sim/serialize.cc Mon Aug 23 11:18:39 2010 -0500
@@ -269,7 +269,7 @@
// 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 @@
// 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 \"");
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
