The Road to Clang-Format part 1
Whitespace: The Darkening
Change-Id: I9c0c355ddf22f9b27763c97e3e85079c135ae7a7
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
diff --git a/src/isolator/hei_isolation_node.cpp b/src/isolator/hei_isolation_node.cpp
index a0bbf37..b30a678 100644
--- a/src/isolator/hei_isolation_node.cpp
+++ b/src/isolator/hei_isolation_node.cpp
@@ -5,8 +5,8 @@
//------------------------------------------------------------------------------
-bool IsolationNode::analyze( const Chip & i_chip, AttentionType_t i_attnType,
- IsolationData & io_isoData ) const
+bool IsolationNode::analyze(const Chip & i_chip, AttentionType_t i_attnType,
+ IsolationData & io_isoData) const
{
bool o_activeAttn = false; // Initially, assume no active attentions.
@@ -14,34 +14,34 @@
pushIsolationStack();
// A rule for i_attnType must exist.
- auto rule_itr = iv_rules.find( i_attnType );
- HEI_ASSERT( iv_rules.end() != rule_itr );
+ auto rule_itr = iv_rules.find(i_attnType);
+ HEI_ASSERT(iv_rules.end() != rule_itr);
// Get the returned BitString for this rule.
- const BitString * bs = rule_itr->second->getBitString( i_chip );
+ const BitString * bs = rule_itr->second->getBitString(i_chip);
// Ensure this BitString is not longer than the maximum bit field.
- HEI_ASSERT( bs->getBitLen() <= sizeof(RegisterBit_t) * 8 );
+ HEI_ASSERT(bs->getBitLen() <= sizeof(RegisterBit_t) * 8);
// Find all active bits for this rule.
- for ( RegisterBit_t bit = 0; bit < bs->getBitLen(); bit++ )
+ for (RegisterBit_t bit = 0; bit < bs->getBitLen(); bit++)
{
// Continue to the next bit if not active.
- if ( !bs->isBitSet(bit) ) continue;
+ if (!bs->isBitSet(bit)) continue;
// At least one active bit was found.
o_activeAttn = true;
// Determine if this attention originated from another register or if it
// is a leaf in the isolation tree.
- auto child_itr = iv_children.find( bit );
- if ( iv_children.end() != child_itr )
+ auto child_itr = iv_children.find(bit);
+ if (iv_children.end() != child_itr)
{
// This bit was driven from an attention from another register.
// Continue down the isolation tree to look for more attentions.
- bool attnFound = child_itr->second->analyze( i_chip, i_attnType,
- io_isoData );
- if ( !attnFound )
+ bool attnFound = child_itr->second->analyze(i_chip, i_attnType,
+ io_isoData);
+ if (!attnFound)
{
// Something went wrong. There should have been an active
// attention. It's possible there is a bug in the Chip Data
@@ -53,18 +53,18 @@
// io_isoData. If there are no other active attentions, the user
// application could use this signature to help determine, and
// circumvent, the isolation problem.
- io_isoData.addSignature( Signature { i_chip, iv_hwReg.getId(),
- iv_hwReg.getInstance(),
- bit, i_attnType } );
+ io_isoData.addSignature(Signature { i_chip, iv_hwReg.getId(),
+ iv_hwReg.getInstance(),
+ bit, i_attnType });
}
}
else
{
// We have reached a leaf in the isolation tree. Add this bit's
// signature to io_isoData.
- io_isoData.addSignature( Signature { i_chip, iv_hwReg.getId(),
- iv_hwReg.getInstance(),
- bit, i_attnType } );
+ io_isoData.addSignature(Signature { i_chip, iv_hwReg.getId(),
+ iv_hwReg.getInstance(),
+ bit, i_attnType });
}
}
@@ -76,14 +76,13 @@
//------------------------------------------------------------------------------
-void IsolationNode::addRule( AttentionType_t i_attnType,
- const Register * i_rule )
+void IsolationNode::addRule(AttentionType_t i_attnType, const Register * i_rule)
{
// A rule for this attention type should not already exist.
- HEI_ASSERT( iv_rules.end() == iv_rules.find(i_attnType) );
+ HEI_ASSERT(iv_rules.end() == iv_rules.find(i_attnType));
// The rule should not be null.
- HEI_ASSERT( nullptr != i_rule );
+ HEI_ASSERT(nullptr != i_rule);
// Add the new rule.
iv_rules[i_attnType] = i_rule;
@@ -91,13 +90,13 @@
//------------------------------------------------------------------------------
-void IsolationNode::addChild( uint8_t i_bit, const IsolationNode * i_child )
+void IsolationNode::addChild(uint8_t i_bit, const IsolationNode * i_child)
{
// An entry for this bit should not already exist.
- HEI_ASSERT( iv_children.end() == iv_children.find(i_bit) );
+ HEI_ASSERT(iv_children.end() == iv_children.find(i_bit));
// The child register should not be null.
- HEI_ASSERT( nullptr != i_child );
+ HEI_ASSERT(nullptr != i_child);
// Add the new rule.
iv_children[i_bit] = i_child;
@@ -112,15 +111,14 @@
void IsolationNode::pushIsolationStack() const
{
// Ensure this node does not already exist in cv_isolationStack.
- auto itr = std::find( cv_isolationStack.begin(),
- cv_isolationStack.end(), this );
- HEI_ASSERT( cv_isolationStack.end() == itr );
+ auto itr = std::find(cv_isolationStack.begin(),
+ cv_isolationStack.end(), this);
+ HEI_ASSERT(cv_isolationStack.end() == itr);
// Push to node to the stack.
- cv_isolationStack.push_back( this );
+ cv_isolationStack.push_back(this);
}
//------------------------------------------------------------------------------
} // end namespace libhei
-