summaryrefslogtreecommitdiffstats
path: root/src/usr/diag/prdf/common/framework
diff options
context:
space:
mode:
authorZane Shelley <zshelle@us.ibm.com>2017-01-31 10:21:32 -0600
committerZane C. Shelley <zshelle@us.ibm.com>2017-02-10 17:34:54 -0500
commita56b9bde18a2baac1b4e9b8f31ba1d7ff8f4ca71 (patch)
tree50ffe23b298c73f48e625f3563d2cda875328844 /src/usr/diag/prdf/common/framework
parent500d4171608d4619d547f3a4dccedc67a3278561 (diff)
downloadblackbird-hostboot-a56b9bde18a2baac1b4e9b8f31ba1d7ff8f4ca71.tar.gz
blackbird-hostboot-a56b9bde18a2baac1b4e9b8f31ba1d7ff8f4ca71.zip
PRD: cleaned BitString::Pattern()
This function had a off-by-one error that could access memory beyond the available memory space. Change-Id: I762d0e24f0cc7ecd42e7f9393b0dc5b3b8bddefc RTC: 167819 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35688 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36201 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf/common/framework')
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/iipscr.C4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C6
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C4
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/register/prdfResetOperators.H6
6 files changed, 14 insertions, 14 deletions
diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.C b/src/usr/diag/prdf/common/framework/register/iipscr.C
index fac4cb854..127992be5 100755
--- a/src/usr/diag/prdf/common/framework/register/iipscr.C
+++ b/src/usr/diag/prdf/common/framework/register/iipscr.C
@@ -197,13 +197,13 @@ void SCAN_COMM_REGISTER_CLASS::ClearBit
void SCAN_COMM_REGISTER_CLASS::clearAllBits()
{
BIT_STRING_CLASS & bitString = AccessBitString();
- bitString.Pattern( 0, bitString.getBitLen(), 0x00000000, 32 );
+ bitString.clearAll();
}
void SCAN_COMM_REGISTER_CLASS::setAllBits()
{
BIT_STRING_CLASS & bitString = AccessBitString();
- bitString.Pattern( 0, bitString.getBitLen(), 0xffffffff, 32 );
+ bitString.setAll();
}
//------------------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
index f237ccdce..64aa10009 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2014 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -84,7 +84,7 @@ bitString(r.GetBitLength()),
bitStringMask(r.GetBitLength()),
xMaskScr(maskScr)
{
- bitStringMask.Pattern(0);
+ bitStringMask.clearAll();
}
ErrorRegisterMask::ErrorRegisterMask
@@ -100,7 +100,7 @@ bitString(r.GetBitLength()),
bitStringMask(r.GetBitLength()),
xMaskScr(maskScr)
{
- bitStringMask.Pattern(0); // clear software mask
+ bitStringMask.clearAll(); // clear software mask
}
// **********************************************************************
diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
index d5627bb6a..c022cdec8 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -200,7 +200,7 @@ uint32_t ScomAccessor::Access(TargetHandle_t i_target,
}
case MopRegisterAccess::READ:
- bs.Pattern(0x00000000); // clear all bits
+ bs.clearAll(); // clear all bits
rc = PRDF::PlatServices::getScom(i_target, bs, registerId);
diff --git a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
index 01780e37e..093205985 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2016 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -122,7 +122,7 @@ class SummaryRegister : public SCAN_COMM_REGISTER_CLASS
const BIT_STRING_CLASS * GetBitString(
ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const
{
- iv_bs->Clear();
+ iv_bs->clearAll();
PRDF::BitString tmp = *iv_child->GetBitString(i_type);
diff --git a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
index 24064490a..2c50bdda8 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetErrorRegister.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -190,7 +190,7 @@ int32_t AndResetErrorRegister::Reset(const BitKey & bit_list,
if(bl_length !=0)
{
BIT_STRING_BUFFER_CLASS bs(xAndResetScr.GetBitLength());
- bs.Pattern(0xffffffff,32); // set to all ones
+ 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
index 9cf18750b..d31ad9556 100755
--- a/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
+++ b/src/usr/diag/prdf/common/framework/register/prdfResetOperators.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -188,7 +188,7 @@ class AndOperator : public RegisterResetOperator
if(bl_length != 0) // Check for bits to reset
{
BIT_STRING_BUFFER_CLASS bs(writeReg->GetBitLength());
- bs.Pattern(0xffffffff, 32); // set all to 1's.
+ bs.setAll(); // set all to 1's.
uint32_t i;
for(i = 0; i < bl_length; ++i) // Turn off all bits specified
@@ -309,7 +309,7 @@ class NotOperator : public RegisterResetOperator
else // RESETOPERATOR_MASK
{
BIT_STRING_BUFFER_CLASS bs(writeReg->GetBitLength());
- bs.Pattern(0xffffffff, 32); // set all to 1's.
+ bs.setAll(); // set all to 1's.
writeReg->SetBitString(&bs); // Copy bit-string to register.
rc = writeReg->Write(); // Write hardware
}
OpenPOWER on IntegriCloud