summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:06 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:06 -0500
commitc10098f28be209e90277925e3f983b7e62d1d037 (patch)
tree0b9c9f562c030ae74ae0a5fea25f804fdb84cec0 /src/mem/ruby/system
parent860155a5fc48f983e9af40c19bf8db8250709c26 (diff)
downloadgem5-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/mem/ruby/system')
-rw-r--r--src/mem/ruby/system/System.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index ab441560c..f1a6a91b8 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -482,8 +482,8 @@ RubySystem::functionalRead(PacketPtr pkt)
DPRINTF(RubySystem, "reading from %s block %s\n",
m_abs_cntrl_vec[i]->name(), block);
- for (unsigned i = 0; i < size_in_bytes; ++i) {
- data[i] = block.getByte(i + startByte);
+ for (unsigned j = 0; j < size_in_bytes; ++j) {
+ data[j] = block.getByte(j + startByte);
}
return true;
}
@@ -507,8 +507,8 @@ RubySystem::functionalRead(PacketPtr pkt)
DPRINTF(RubySystem, "reading from %s block %s\n",
m_abs_cntrl_vec[i]->name(), block);
- for (unsigned i = 0; i < size_in_bytes; ++i) {
- data[i] = block.getByte(i + startByte);
+ for (unsigned j = 0; j < size_in_bytes; ++j) {
+ data[j] = block.getByte(j + startByte);
}
return true;
}
@@ -545,8 +545,8 @@ RubySystem::functionalWrite(PacketPtr pkt)
DataBlock& block = m_abs_cntrl_vec[i]->getDataBlock(line_addr);
DPRINTF(RubySystem, "%s\n",block);
- for (unsigned i = 0; i < size_in_bytes; ++i) {
- block.setByte(i + startByte, data[i]);
+ for (unsigned j = 0; j < size_in_bytes; ++j) {
+ block.setByte(j + startByte, data[j]);
}
DPRINTF(RubySystem, "%s\n",block);
}