summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/DMASequencer.cc
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-04-13 12:13:44 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2016-04-13 12:13:44 -0400
commit8127c4e7bf5fa95b3d06dd0e10ca5b7d32261064 (patch)
treecd4ec3f82a01a2ae2ed07b8ddb11150463fbe88e /src/mem/ruby/system/DMASequencer.cc
parent4b802a09c52ca2a2274a232ba5a29936de8ec3a9 (diff)
downloadgem5-8127c4e7bf5fa95b3d06dd0e10ca5b7d32261064.tar.xz
misc: Fix issues flagged by gcc 6
A few warnings (and thus errors) pop up after being added to -Wall: 1. -Wmisleading-indentation In the auto-generated code there were instances of if/else blocks that were not indented to gcc's liking. This is addressed by adding braces. 2. -Wshift-negative-value gcc is clever enougn to consider ~0 a negative constant, and rightfully complains. This is addressed by using mask() which explicitly casts to unsigned before shifting. That is all. Porting done.
Diffstat (limited to 'src/mem/ruby/system/DMASequencer.cc')
-rw-r--r--src/mem/ruby/system/DMASequencer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/system/DMASequencer.cc b/src/mem/ruby/system/DMASequencer.cc
index 6e708a927..3b0304158 100644
--- a/src/mem/ruby/system/DMASequencer.cc
+++ b/src/mem/ruby/system/DMASequencer.cc
@@ -45,7 +45,7 @@ DMASequencer::init()
{
RubyPort::init();
m_is_busy = false;
- m_data_block_mask = ~ (~0 << RubySystem::getBlockSizeBits());
+ m_data_block_mask = mask(RubySystem::getBlockSizeBits());
for (const auto &s_port : slave_ports)
s_port->sendRangeChange();