diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-31 01:09:44 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-31 01:09:44 -0700 |
| commit | d735abe5dabf483aafb0ccfb0a70cb7c3b0a5a74 (patch) | |
| tree | dd273d4e65d4ba5a11a5928f3aa4d012fbcd2e19 /src/arch/power | |
| parent | ce2f9625f4c4ed0bf6a79eede184a222e61b1f26 (diff) | |
| download | gem5-d735abe5dabf483aafb0ccfb0a70cb7c3b0a5a74.tar.xz | |
GCC: Get everything working with gcc 4.6.1.
And by "everything" I mean all the quick regressions.
Diffstat (limited to 'src/arch/power')
| -rw-r--r-- | src/arch/power/isa/formats/mem.isa | 2 | ||||
| -rw-r--r-- | src/arch/power/tlb.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/arch/power/isa/formats/mem.isa b/src/arch/power/isa/formats/mem.isa index 0361ee998..a409eefac 100644 --- a/src/arch/power/isa/formats/mem.isa +++ b/src/arch/power/isa/formats/mem.isa @@ -123,7 +123,7 @@ def template LoadCompleteAcc {{ %(CPU_exec_context)s *xc, Trace::InstRecord *traceData) const { - Addr EA; + Addr M5_VAR_USED EA; Fault fault = NoFault; %(op_decl)s; diff --git a/src/arch/power/tlb.cc b/src/arch/power/tlb.cc index 8a088032c..0b3edd5a2 100644 --- a/src/arch/power/tlb.cc +++ b/src/arch/power/tlb.cc @@ -118,7 +118,6 @@ int TLB::probeEntry(Addr vpn,uint8_t asn) const { // assume not found... - PowerISA::PTE *retval = NULL; int Ind = -1; PageTable::const_iterator i = lookupTable.find(vpn); if (i != lookupTable.end()) { @@ -132,7 +131,6 @@ TLB::probeEntry(Addr vpn,uint8_t asn) const && (pte->G || (asn == pte->asid))) { // We have a VPN + ASID Match - retval = pte; Ind = index; break; } |