summaryrefslogtreecommitdiff
path: root/src/mem/ruby
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:08 -0500
committerAndreas Hansson <andreas.hansson@arm.com>2013-02-19 05:56:08 -0500
commita62afd094b75f52471ff2556c62c9c5f53d705e6 (patch)
treec7d7d1dbbfd29c7bba2ef11a124cef014f5dff0c /src/mem/ruby
parent08a5fd328b25d2ff431dc8f593c2d1bf3816b36e (diff)
downloadgem5-a62afd094b75f52471ff2556c62c9c5f53d705e6.tar.xz
scons: Fix warnings issued by clang 3.2svn (XCode 4.6)
This patch fixes the warnings that clang3.2svn emit due to the "-Wall" flag. There is one case of an uninitialised value in the ARM neon ISA description, and then a whole range of unused private fields that are pruned.
Diffstat (limited to 'src/mem/ruby')
-rw-r--r--src/mem/ruby/common/Consumer.hh3
-rw-r--r--src/mem/ruby/filters/BlockBloomFilter.hh2
-rw-r--r--src/mem/ruby/filters/BulkBloomFilter.hh2
-rw-r--r--src/mem/ruby/filters/H3BloomFilter.hh3
-rw-r--r--src/mem/ruby/filters/MultiBitSelBloomFilter.hh3
-rw-r--r--src/mem/ruby/filters/MultiGrainBloomFilter.hh3
-rw-r--r--src/mem/ruby/filters/NonCountingBloomFilter.hh3
-rw-r--r--src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh2
-rw-r--r--src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh2
-rw-r--r--src/mem/ruby/system/DMASequencer.hh1
-rw-r--r--src/mem/ruby/system/RubyPort.cc3
-rw-r--r--src/mem/ruby/system/RubyPort.hh2
12 files changed, 4 insertions, 25 deletions
diff --git a/src/mem/ruby/common/Consumer.hh b/src/mem/ruby/common/Consumer.hh
index 33c78d780..c1b4d70b1 100644
--- a/src/mem/ruby/common/Consumer.hh
+++ b/src/mem/ruby/common/Consumer.hh
@@ -44,7 +44,7 @@ class Consumer
{
public:
Consumer(ClockedObject *_em)
- : m_last_scheduled_wakeup(0), m_last_wakeup(0), em(_em)
+ : m_last_scheduled_wakeup(0), em(_em)
{
}
@@ -93,7 +93,6 @@ class Consumer
private:
Tick m_last_scheduled_wakeup;
std::set<Tick> m_scheduled_wakeups;
- Tick m_last_wakeup;
ClockedObject *em;
class ConsumerEvent : public Event
diff --git a/src/mem/ruby/filters/BlockBloomFilter.hh b/src/mem/ruby/filters/BlockBloomFilter.hh
index ade599f42..e7958df62 100644
--- a/src/mem/ruby/filters/BlockBloomFilter.hh
+++ b/src/mem/ruby/filters/BlockBloomFilter.hh
@@ -66,8 +66,6 @@ class BlockBloomFilter : public AbstractBloomFilter
int m_filter_size;
int m_filter_size_bits;
- int m_count_bits;
- int m_count;
};
#endif // __MEM_RUBY_FILTERS_BLOCKBLOOMFILTER_HH__
diff --git a/src/mem/ruby/filters/BulkBloomFilter.hh b/src/mem/ruby/filters/BulkBloomFilter.hh
index 50b24732f..1a723c51d 100644
--- a/src/mem/ruby/filters/BulkBloomFilter.hh
+++ b/src/mem/ruby/filters/BulkBloomFilter.hh
@@ -71,8 +71,6 @@ class BulkBloomFilter : public AbstractBloomFilter
int m_sector_bits;
- int m_count_bits;
- int m_count;
};
#endif // __MEM_RUBY_FILTERS_BULKBLOOMFILTER_HH__
diff --git a/src/mem/ruby/filters/H3BloomFilter.hh b/src/mem/ruby/filters/H3BloomFilter.hh
index b040af42f..c1b53c9b5 100644
--- a/src/mem/ruby/filters/H3BloomFilter.hh
+++ b/src/mem/ruby/filters/H3BloomFilter.hh
@@ -80,9 +80,6 @@ class H3BloomFilter : public AbstractBloomFilter
int m_par_filter_size;
int m_par_filter_size_bits;
- int m_count_bits;
- int m_count;
-
int primes_list[6];// = {9323,11279,10247,30637,25717,43711};
int mults_list[6]; //= {255,29,51,3,77,43};
int adds_list[6]; //= {841,627,1555,241,7777,65391};
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
index 5263309a4..f9a423648 100644
--- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh
@@ -82,9 +82,6 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter
int m_par_filter_size;
int m_par_filter_size_bits;
- int m_count_bits;
- int m_count;
-
bool isParallel;
};
diff --git a/src/mem/ruby/filters/MultiGrainBloomFilter.hh b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
index dfe9c3e98..d5a6e330c 100644
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.hh
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.hh
@@ -71,9 +71,6 @@ class MultiGrainBloomFilter : public AbstractBloomFilter
std::vector<int> m_page_filter;
int m_page_filter_size;
int m_page_filter_size_bits;
-
- int m_count_bits;
- int m_count;
};
#endif // __MEM_RUBY_FILTERS_MULTIGRAINBLOOMFILTER_HH__
diff --git a/src/mem/ruby/filters/NonCountingBloomFilter.hh b/src/mem/ruby/filters/NonCountingBloomFilter.hh
index 57274ef87..c940a0805 100644
--- a/src/mem/ruby/filters/NonCountingBloomFilter.hh
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.hh
@@ -73,9 +73,6 @@ class NonCountingBloomFilter : public AbstractBloomFilter
int m_filter_size;
int m_offset;
int m_filter_size_bits;
-
- int m_count_bits;
- int m_count;
};
#endif // __MEM_RUBY_FILTERS_NONCOUNTINGBLOOMFILTER_HH__
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
index 444cfae5c..4c1cae842 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh
@@ -75,7 +75,7 @@ class flitBuffer_d
private:
std::vector<flit_d *> m_buffer;
- int size, max_size;
+ int max_size;
};
inline std::ostream&
diff --git a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
index 4b244a608..609c5a9b6 100644
--- a/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/flitBuffer.hh
@@ -58,7 +58,7 @@ class flitBuffer
private:
std::vector<flit *> m_buffer;
- int size, max_size;
+ int max_size;
};
inline std::ostream&
diff --git a/src/mem/ruby/system/DMASequencer.hh b/src/mem/ruby/system/DMASequencer.hh
index d8a6ef059..b3ba0be8c 100644
--- a/src/mem/ruby/system/DMASequencer.hh
+++ b/src/mem/ruby/system/DMASequencer.hh
@@ -73,7 +73,6 @@ class DMASequencer : public RubyPort
bool m_is_busy;
uint64_t m_data_block_mask;
DMARequest active_request;
- int num_active_requests;
};
#endif // __MEM_RUBY_SYSTEM_DMASEQUENCER_HH__
diff --git a/src/mem/ruby/system/RubyPort.cc b/src/mem/ruby/system/RubyPort.cc
index 5e9e8cdd4..4cfc1f252 100644
--- a/src/mem/ruby/system/RubyPort.cc
+++ b/src/mem/ruby/system/RubyPort.cc
@@ -119,8 +119,7 @@ RubyPort::getSlavePort(const std::string &if_name, PortID idx)
RubyPort::PioPort::PioPort(const std::string &_name,
RubyPort *_port)
- : QueuedMasterPort(_name, _port, queue), queue(*_port, *this),
- ruby_port(_port)
+ : QueuedMasterPort(_name, _port, queue), queue(*_port, *this)
{
DPRINTF(RubyPort, "creating master port on ruby sequencer %s\n", _name);
}
diff --git a/src/mem/ruby/system/RubyPort.hh b/src/mem/ruby/system/RubyPort.hh
index 3c61eb522..70f74d83b 100644
--- a/src/mem/ruby/system/RubyPort.hh
+++ b/src/mem/ruby/system/RubyPort.hh
@@ -99,8 +99,6 @@ class RubyPort : public MemObject
MasterPacketQueue queue;
- RubyPort *ruby_port;
-
public:
PioPort(const std::string &_name, RubyPort *_port);