Compiler: Fixes for GCC 4.5.
This commit is contained in:
parent
7d191366e1
commit
ac575a9d82
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
2
src/mem/cache/tags/iic_repl/gen.cc
vendored
2
src/mem/cache/tags/iic_repl/gen.cc
vendored
|
@ -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])
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -269,7 +269,7 @@ arrayParamIn(Checkpoint *cp, const string §ion, 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 §ion,
|
|||
// 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 \"");
|
||||
|
||||
|
|
Loading…
Reference in a new issue