From 8127c4e7bf5fa95b3d06dd0e10ca5b7d32261064 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Wed, 13 Apr 2016 12:13:44 -0400 Subject: 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. --- src/mem/ruby/system/DMASequencer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mem/ruby/system') 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(); -- cgit v1.2.3