diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
| commit | c10098f28be209e90277925e3f983b7e62d1d037 (patch) | |
| tree | 0b9c9f562c030ae74ae0a5fea25f804fdb84cec0 /src/arch/alpha | |
| parent | 860155a5fc48f983e9af40c19bf8db8250709c26 (diff) | |
| download | gem5-c10098f28be209e90277925e3f983b7e62d1d037.tar.xz | |
scons: Fix up numerous warnings about name shadowing
This patch address the most important name shadowing warnings (as
produced when using gcc/clang with -Wshadow). There are many
locations where constructor parameters and function parameters shadow
local variables, but these are left unchanged.
Diffstat (limited to 'src/arch/alpha')
| -rw-r--r-- | src/arch/alpha/interrupts.hh | 5 | ||||
| -rw-r--r-- | src/arch/alpha/stacktrace.cc | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/arch/alpha/interrupts.hh b/src/arch/alpha/interrupts.hh index ce3108d79..5749a1f0d 100644 --- a/src/arch/alpha/interrupts.hh +++ b/src/arch/alpha/interrupts.hh @@ -158,11 +158,10 @@ class Interrupts : public SimObject } } - uint64_t interrupts = intstatus; - if (interrupts) { + if (intstatus) { for (uint64_t i = INTLEVEL_EXTERNAL_MIN; i < INTLEVEL_EXTERNAL_MAX; i++) { - if (interrupts & (ULL(1) << i)) { + if (intstatus & (ULL(1) << i)) { // See table 4-19 of 21164 hardware reference ipl = i; summary |= (ULL(1) << i); diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc index 7c23489a3..8c0e85af4 100644 --- a/src/arch/alpha/stacktrace.cc +++ b/src/arch/alpha/stacktrace.cc @@ -197,7 +197,7 @@ StackTrace::trace(ThreadContext *_tc, bool is_call) return; } - bool kernel = sys->kernelStart <= pc && pc <= sys->kernelEnd; + kernel = sys->kernelStart <= pc && pc <= sys->kernelEnd; if (!kernel) return; |