PRD: removed BIT_STRING_BUFFER_CLASS alias

Change-Id: I461ac55f513b1f22c1e64b4b21b8eaf73418950f RTC: 167819 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35697 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36449 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
open-power · Feb 15, 2017 · f0e78d1 · f0e78d1
1 parent a16072b
commit f0e78d1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
@@ -204,8 +204,8 @@ class ErrorRegisterMask : public ErrorRegisterFilter
 
 protected: // Data
 
-  BIT_STRING_BUFFER_CLASS   bitString;
-  BIT_STRING_BUFFER_CLASS   bitStringMask;
+  BitStringBuffer   bitString;
+  BitStringBuffer   bitStringMask;
 
 private:  // Data
 

diff --git a/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h
@@ -47,7 +47,7 @@
 //
 //   void foo(MopRegisterAccess & mra)
 //   {
-//     BIT_STRING_BUFFER_CLASS bitString(80);  // 80 bits
+//     BitStringBuffer bitString(80);  // 80 bits
 //
 //     mra.Access(bitString, READ);
 //     ...

diff --git a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
@@ -569,27 +569,27 @@ class AttnTypeRegister : public SCAN_COMM_REGISTER_CLASS
         switch (i_type)
         {
             case CHECK_STOP:
-                (*iv_bs) = BIT_STRING_BUFFER_CLASS(
+                (*iv_bs) = BitStringBuffer(
                                             *iv_check->GetBitString(i_type));
                 break;
 
             case RECOVERABLE:
-                (*iv_bs) = BIT_STRING_BUFFER_CLASS(
+                (*iv_bs) = BitStringBuffer(
                                             *iv_recov->GetBitString(i_type));
                 break;
 
             case SPECIAL:
-                (*iv_bs) = BIT_STRING_BUFFER_CLASS(
+                (*iv_bs) = BitStringBuffer(
                                             *iv_special->GetBitString(i_type));
                 break;
 
             case PROC_CS:
-                (*iv_bs) = BIT_STRING_BUFFER_CLASS(
+                (*iv_bs) = BitStringBuffer(
                                             *iv_proccs->GetBitString(i_type));
                 break;
 
             case HOST_ATTN:
-                (*iv_bs) = BIT_STRING_BUFFER_CLASS(
+                (*iv_bs) = BitStringBuffer(
                                             *iv_hostattn->GetBitString(i_type));
                 break;
         }

diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
@@ -189,7 +189,7 @@ int32_t AndResetErrorRegister::Reset(const BitKey & bit_list,
   uint32_t bl_length = bit_list.size();
   if(bl_length !=0)
   {
-    BIT_STRING_BUFFER_CLASS bs(xAndResetScr.GetBitLength());
+    BitStringBuffer bs(xAndResetScr.GetBitLength());
     bs.setAll(); // set to all ones
     uint32_t i;
     for(i = 0; i < bl_length; ++i)  // Turn off all bits used to isolate problem

diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
@@ -187,7 +187,7 @@ class AndOperator : public RegisterResetOperator
         {
             if(bl_length != 0) // Check for bits to reset
             {
-                BIT_STRING_BUFFER_CLASS bs(writeReg->GetBitLength());
+                BitStringBuffer bs(writeReg->GetBitLength());
                 bs.setAll(); // set all to 1's.
 
                 uint32_t i;
@@ -308,7 +308,7 @@ class NotOperator : public RegisterResetOperator
         }
         else // RESETOPERATOR_MASK
         {
-            BIT_STRING_BUFFER_CLASS bs(writeReg->GetBitLength());
+            BitStringBuffer bs(writeReg->GetBitLength());
             bs.setAll(); // set all to 1's.
             writeReg->SetBitString(&bs); // Copy bit-string to register.
             rc = writeReg->Write();    // Write hardware

diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9ProcDomain.C b/src/usr/diag/prdf/common/plat/p9/prdfP9ProcDomain.C
@@ -213,12 +213,12 @@ void ProcDomain::SortForXstop()
     // Currently does not do cycle elimination.
 
     // Get initial list (all chips).
-    BIT_STRING_BUFFER_CLASS l_current(GetSize());
+    BitStringBuffer l_current(GetSize());
     l_current.setAll(); // turn on all bits.
 
     // Do reduction.
     // When done, l_prev will have the minimal list.
-    BIT_STRING_BUFFER_CLASS l_prev(GetSize());
+    BitStringBuffer l_prev(GetSize());
     l_prev.clearAll();
 
     while ((!(l_current == l_prev)) && (!l_current.isZero()))

diff --git a/src/usr/diag/prdf/common/prdf_types.h b/src/usr/diag/prdf/common/prdf_types.h
@@ -35,8 +35,6 @@ namespace PRDF
 {
 
 #define BIT_LIST_CLASS           BitKey
-#define BitString         BitString
-#define BIT_STRING_BUFFER_CLASS  BitStringBuffer
 #define FILTER_CLASS             FilterClass
 
 } // end namespace PRDF

diff --git a/src/usr/diag/prdf/common/rule/prdfGroup.C b/src/usr/diag/prdf/common/rule/prdfGroup.C
@@ -265,7 +265,7 @@ void Group::AddFilter(FilterClass * i_filter, bool i_addFirst )
 
 const BitString & Group::Read(ATTENTION_TYPE i_attn)
 {
-    static BIT_STRING_BUFFER_CLASS a(64);
+    static BitStringBuffer a(64);
     return a;
 };
 

diff --git a/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C
@@ -737,7 +737,7 @@ SCAN_COMM_REGISTER_CLASS * RuleMetaData::createVirtualRegister(
         case Prdr::BIT_STR:
             {
                 uint32_t l_size = i_vReg->cv_bitStrVect.size();
-                BIT_STRING_BUFFER_CLASS l_bs(l_size * 64);
+                BitStringBuffer l_bs(l_size * 64);
 
                 for (uint32_t i = 0; i < l_size; i++)
                 {