Skip to content

Commit

Permalink
PRD: Removed BIT_STRING_CLASS alias
Browse files Browse the repository at this point in the history 
Change-Id: I30b7e7a255c61734c688356c6646a0a04c32f424
RTC: 167819
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35696
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/36448
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
  • Loading branch information
@zane131
zane131 committed Feb 15, 2017
1 parent 80e0e70 commit a16072b
Show file tree
Hide file tree
Showing 35 changed files with 155 additions and 139 deletions.
8 changes: 4 additions & 4 deletions src/usr/diag/prdf/common/framework/register/iipCaptureData.h
View file
Expand Up @@ -116,7 +116,7 @@ namespace PRDF
// Forward Declarations
class SCAN_COMM_REGISTER_CLASS;
class ScanCommRegisterAccess;
class BIT_STRING_CLASS;
class BitString;

// @jl04 a start
// @jl04 a Added this enumeration for error log compression, elimination of secondary regs.
Expand Down Expand Up @@ -221,7 +221,7 @@ class CaptureData
<ul>
<br><b>Parameter: i_pchipHandle Handle of chip object
<br><b>Parameter: scan comm id (unique one btye code representing scan comm address)
<br><b>Parameter: BIT_STRING_CLASS
<br><b>Parameter: BitString
<br><b>Parameter: Optional location in capure vector [FRONT | BACK] def = BACK
<br><b>Returns: Nothing
<br><b>Requires: Nothing
Expand All @@ -230,7 +230,7 @@ class CaptureData
</ul><br>
*/
void Add( TARGETING::TargetHandle_t i_pchipHandle, int scomId,
const BIT_STRING_CLASS & bs, Place place = BACK);
const BitString & bs, Place place = BACK);

// dg02 end

Expand Down Expand Up @@ -341,7 +341,7 @@ void Drop(RegType type); //@jl04a
/** Private function to facilitate the adding of caputre data to the
* internal vector */
void AddDataElement( TARGETING::TargetHandle_t i_trgt, int i_scomId,
const BIT_STRING_CLASS * i_bs, Place i_place,
const BitString * i_bs, Place i_place,
RegType i_type = PRIMARY );

// Predicate for deciding to delete an element of data from a Capture Data list.
Expand Down
8 changes: 5 additions & 3 deletions src/usr/diag/prdf/common/framework/register/iipErrorRegister.h
View file
Expand Up @@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* COPYRIGHT International Business Machines Corp. 1996,2014 */
/* Contributors Listed Below - COPYRIGHT 1996,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down Expand Up @@ -140,7 +142,7 @@ class ErrorRegister : public ErrorRegisterType
return code from mops scr access
</ul><br>
*/
virtual const BIT_STRING_CLASS & Read(ATTENTION_TYPE i_attn);
virtual const BitString & Read(ATTENTION_TYPE i_attn);

/**
Filter the bit string (if a filter is provided) & convert it to a BitList
Expand All @@ -153,7 +155,7 @@ class ErrorRegister : public ErrorRegisterType
<br><b>Notes: </b> The default implementation does not have a filter
</ul><br>
*/
virtual BIT_LIST_CLASS Filter(const BIT_STRING_CLASS & bs);
virtual BIT_LIST_CLASS Filter(const BitString & bs);

virtual bool FilterUndo(BitKey & i_bit_list) { return false; }
/**
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2014 */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -131,7 +131,7 @@ class ErrorRegisterFilter : public ErrorRegister
* @param io_sdc reference to STEP_CODE_DATA struct
* @return bit key
*/
virtual BitKey Filter( const BIT_STRING_CLASS & bs,
virtual BitKey Filter( const BitString & bs,
STEP_CODE_DATA_STRUCT & io_sdc );

/**
Expand Down
6 changes: 3 additions & 3 deletions src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h
View file
Expand Up @@ -159,7 +159,7 @@ class ErrorRegisterMask : public ErrorRegisterFilter
to using it for any Analysis.
</ul><br>
*/
void SetMaskBits(const BIT_STRING_CLASS & bitString);
void SetMaskBits(const BitString & bitString);

protected:

Expand All @@ -176,7 +176,7 @@ class ErrorRegisterMask : public ErrorRegisterFilter
return code from mops scr access
</ul><br>
*/
virtual const BIT_STRING_CLASS & Read();
virtual const BitString & Read();


/**
Expand Down Expand Up @@ -217,7 +217,7 @@ class ErrorRegisterMask : public ErrorRegisterFilter
inline void ErrorRegisterMask::SetMaskBit(uint32_t bitPosition)
{ bitStringMask.setBit(bitPosition); }

inline void ErrorRegisterMask::SetMaskBits(const BIT_STRING_CLASS & bitString)
inline void ErrorRegisterMask::SetMaskBits(const BitString & bitString)
{ bitStringMask.setString(bitString); }

} // end namespace PRDF
Expand Down
10 changes: 6 additions & 4 deletions src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h
View file
Expand Up @@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* COPYRIGHT International Business Machines Corp. 1996,2014 */
/* Contributors Listed Below - COPYRIGHT 1996,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down Expand Up @@ -52,7 +54,7 @@ namespace PRDF
//--------------------------------------------------------------------
// Forward References
//--------------------------------------------------------------------
class BIT_STRING_CLASS;
class BitString;
struct STEP_CODE_DATA_STRUCT;

class ErrorRegisterType
Expand Down Expand Up @@ -103,7 +105,7 @@ class ErrorRegisterType

protected:

virtual const BIT_STRING_CLASS & Read(ATTENTION_TYPE i_attn) = 0;
virtual const BitString & Read(ATTENTION_TYPE i_attn) = 0;
// Function Specification ********************************************
//
// Purpose: Read data in from hardware for this error register
Expand All @@ -118,7 +120,7 @@ class ErrorRegisterType
//
// End Function Specification ****************************************

virtual BitKey Filter(const BIT_STRING_CLASS & bs) = 0;
virtual BitKey Filter(const BitString & bs) = 0;
// Function Specification ********************************************
//
// Purpose: Filter out unwanted bits in the bit string.
Expand Down
6 changes: 3 additions & 3 deletions src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -66,7 +66,7 @@
namespace PRDF
{
// Forward References
class BIT_STRING_CLASS;
class BitString;

class MopRegisterAccess
{
Expand Down Expand Up @@ -137,7 +137,7 @@ class MopRegisterAccess
//
// End Function Specification ****************************************

virtual uint32_t Access(BIT_STRING_CLASS & bs,
virtual uint32_t Access(BitString & bs,
uint64_t registerId,
Operation operation) const = 0;
// Function Specification ********************************************
Expand Down
6 changes: 4 additions & 2 deletions src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h
View file
Expand Up @@ -5,7 +5,9 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* COPYRIGHT International Business Machines Corp. 1996,2014 */
/* Contributors Listed Below - COPYRIGHT 1996,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); */
/* you may not use this file except in compliance with the License. */
Expand Down Expand Up @@ -121,7 +123,7 @@ class MopRegisterAccessScanComm : public MopRegisterAccess
//
// End Function Specification ****************************************

virtual uint32_t Access(BIT_STRING_CLASS & bs,
virtual uint32_t Access(BitString & bs,
uint32_t registerId,
Operation operation) const;
// Function Specification ********************************************
Expand Down
16 changes: 8 additions & 8 deletions src/usr/diag/prdf/common/framework/register/iipscr.C
View file
Expand Up @@ -110,7 +110,7 @@ SCAN_COMM_REGISTER_CLASS::~SCAN_COMM_REGISTER_CLASS

uint32_t SCAN_COMM_REGISTER_CLASS::Read
(
BIT_STRING_CLASS & mask
BitString & mask
/*!i Reference to Bit String mask */
)
/*!o Error return code */
Expand All @@ -119,7 +119,7 @@ uint32_t SCAN_COMM_REGISTER_CLASS::Read

if(rc == SUCCESS)
{
BIT_STRING_CLASS & bitString = AccessBitString();
BitString & bitString = AccessBitString();
bitString.maskString(mask);
}

Expand Down Expand Up @@ -149,7 +149,7 @@ void SCAN_COMM_REGISTER_CLASS::SetBit
/*!o No value returned */
{

BIT_STRING_CLASS & bitString = AccessBitString();
BitString & bitString = AccessBitString();
bitString.setBit(bit_position);
}

Expand All @@ -175,7 +175,7 @@ void SCAN_COMM_REGISTER_CLASS::ClearBit
)
/*!o No value returned */
{
BIT_STRING_CLASS & bitString = AccessBitString();
BitString & bitString = AccessBitString();
bitString.clearBit(bit_position);
}

Expand All @@ -196,13 +196,13 @@ void SCAN_COMM_REGISTER_CLASS::ClearBit

void SCAN_COMM_REGISTER_CLASS::clearAllBits()
{
BIT_STRING_CLASS & bitString = AccessBitString();
BitString & bitString = AccessBitString();
bitString.clearAll();
}

void SCAN_COMM_REGISTER_CLASS::setAllBits()
{
BIT_STRING_CLASS & bitString = AccessBitString();
BitString & bitString = AccessBitString();
bitString.setAll();
}

Expand All @@ -219,7 +219,7 @@ uint64_t SCAN_COMM_REGISTER_CLASS::GetBitFieldJustified( uint32_t i_pos,

PRDF_ASSERT( pos_end <= len_uint64 );

const BIT_STRING_CLASS * bs = GetBitString();
const BitString * bs = GetBitString();

for ( uint32_t pos = i_pos; pos < pos_end; pos += len_cpu_word )
{
Expand Down Expand Up @@ -248,7 +248,7 @@ void SCAN_COMM_REGISTER_CLASS::SetBitFieldJustified( uint32_t i_pos,

PRDF_ASSERT( i_pos + i_len <= len_uint64 );

BIT_STRING_CLASS & bs = AccessBitString();
BitString & bs = AccessBitString();

for ( uint32_t offset = 0; offset < i_len; offset += len_cpu_word )
{
Expand Down
8 changes: 4 additions & 4 deletions src/usr/diag/prdf/common/framework/register/iipscr.h
View file
Expand Up @@ -203,7 +203,7 @@ class SCAN_COMM_REGISTER_CLASS
then extra mask bits are ignored.
</ul><br>
*/
uint32_t Read(BIT_STRING_CLASS & mask);
uint32_t Read(BitString & mask);

/**
Write hardware register (pure virtual)
Expand Down Expand Up @@ -282,7 +282,7 @@ class SCAN_COMM_REGISTER_CLASS
</ul><br>
*/
virtual
const BIT_STRING_CLASS * GetBitString(ATTENTION_TYPE
const BitString * GetBitString(ATTENTION_TYPE
i_type = INVALID_ATTENTION_TYPE
) const = 0;

Expand All @@ -300,7 +300,7 @@ class SCAN_COMM_REGISTER_CLASS
Write() is called
</ul><br>
*/
virtual void SetBitString(const BIT_STRING_CLASS * bs) = 0;
virtual void SetBitString(const BitString * bs) = 0;

/**
SetBit
Expand Down Expand Up @@ -401,7 +401,7 @@ class SCAN_COMM_REGISTER_CLASS
<br><b>Promises </b> None.
</ul><br>
*/
virtual BIT_STRING_CLASS & AccessBitString(void) = 0;
virtual BitString & AccessBitString(void) = 0;
private: // Data
static const int DEFAULT_BIT_LENGTH = 64;

Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/common/framework/register/prdfCaptureData.C
View file
Expand Up @@ -79,7 +79,7 @@ void CaptureData::Clear(void)
//------------------------------------------------------------------------------

void CaptureData::AddDataElement( TargetHandle_t i_trgt, int i_scomId,
const BIT_STRING_CLASS * i_bs,
const BitString * i_bs,
Place i_place, RegType i_type )
{
// Initial values of the bit string buffer if i_bs has a zero value.
Expand Down Expand Up @@ -133,7 +133,7 @@ void CaptureData::Add( TargetHandle_t i_trgt, int32_t i_scomId,
//------------------------------------------------------------------------------

void CaptureData::Add( TargetHandle_t i_trgt, int i_scomId,
const BIT_STRING_CLASS & i_bs, Place i_place )
const BitString & i_bs, Place i_place )
{
AddDataElement( i_trgt, i_scomId, &i_bs, i_place );
}
Expand Down
8 changes: 4 additions & 4 deletions src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2012,2015 */
/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -143,7 +143,7 @@ int32_t ErrorRegister::Analyze( STEP_CODE_DATA_STRUCT & io_sdc )
}

// Get Data from hardware
const BIT_STRING_CLASS &bs =
const BitString &bs =
Read( io_sdc.service_data->getSecondaryAttnType() );
BitKey bl; // null bit list has length 0

Expand Down Expand Up @@ -229,15 +229,15 @@ int32_t ErrorRegister::Analyze( STEP_CODE_DATA_STRUCT & io_sdc )

/*---------------------------------------------------------------------*/

const BIT_STRING_CLASS & ErrorRegister::Read(ATTENTION_TYPE i_attn)
const BitString & ErrorRegister::Read(ATTENTION_TYPE i_attn)
{
scr_rc = scr.Read();
return (*scr.GetBitString(i_attn));
}

/*---------------------------------------------------------------------*/

BitKey ErrorRegister::Filter( const BIT_STRING_CLASS & bs )
BitKey ErrorRegister::Filter( const BitString & bs )
{
BitKey bit_list;
bit_list = bs;
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C
View file
Expand Up @@ -105,7 +105,7 @@ xMaskScr(maskScr)

// **********************************************************************

const BIT_STRING_CLASS & ErrorRegisterMask::Read()
const BitString & ErrorRegisterMask::Read()
{
scr_rc = scr.Read();
bitString = *scr.GetBitString();
Expand Down Expand Up @@ -155,7 +155,7 @@ int32_t ErrorRegisterMask::Reset(const BIT_LIST_CLASS & bit_list,

// ***************************************************************************

BIT_LIST_CLASS ErrorRegisterFilter::Filter( const BIT_STRING_CLASS & bs,
BIT_LIST_CLASS ErrorRegisterFilter::Filter( const BitString & bs,
STEP_CODE_DATA_STRUCT & io_sdc )
{
BIT_LIST_CLASS bit_list;
Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C
View file
Expand Up @@ -110,7 +110,7 @@ void ScomService::setScomAccessor(ScomAccessor & i_ScomAccessor)
}

uint32_t ScomService::Access(TargetHandle_t i_target,
BIT_STRING_CLASS & bs,
BitString & bs,
uint64_t registerId,
MopRegisterAccess::Operation operation) const
{
Expand All @@ -129,7 +129,7 @@ uint32_t ScomService::Access(TargetHandle_t i_target,


uint32_t ScomAccessor::Access(TargetHandle_t i_target,
BIT_STRING_CLASS & bs,
BitString & bs,
uint64_t registerId,
MopRegisterAccess::Operation operation) const
{
Expand Down

0 comments on commit a16072b

Please sign in to comment.