diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2010-08-23 11:18:39 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2010-08-23 11:18:39 -0500 |
| commit | ac575a9d8242d4ff8e40ac25f2fd5862ef551ad7 (patch) | |
| tree | 8a2dc5fa815d98c970c370f155d5747d3fa2ddff /src/arch | |
| parent | 7d191366e1b8c3efaf2a08b26483bca82c00e4de (diff) | |
| download | gem5-ac575a9d8242d4ff8e40ac25f2fd5862ef551ad7.tar.xz | |
Compiler: Fixes for GCC 4.5.
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/table_walker.cc | 6 |
1 files changed, 3 insertions, 3 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); } |