From a16072bf583c8f01ba17012864bc16c2c9f67371 Mon Sep 17 00:00:00 2001 From: Zane Shelley Date: Tue, 31 Jan 2017 17:06:42 -0600 Subject: [PATCH] PRD: Removed BIT_STRING_CLASS alias Change-Id: I30b7e7a255c61734c688356c6646a0a04c32f424 RTC: 167819 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35696 Tested-by: Jenkins Server Reviewed-by: Caleb N. Palmer Reviewed-by: Brian J. Stegmiller Reviewed-by: Zane C. Shelley Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36448 Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI --- .../framework/register/iipCaptureData.h | 8 +-- .../framework/register/iipErrorRegister.h | 8 +-- .../register/iipErrorRegisterFilter.h | 4 +- .../framework/register/iipErrorRegisterMask.h | 6 +-- .../framework/register/iipErrorRegisterType.h | 10 ++-- .../framework/register/iipMopRegisterAccess.h | 6 +-- .../register/iipMopRegisterAccessScanComm.h | 6 ++- .../prdf/common/framework/register/iipscr.C | 16 +++--- .../prdf/common/framework/register/iipscr.h | 8 +-- .../framework/register/prdfCaptureData.C | 4 +- .../framework/register/prdfErrorRegister.C | 8 +-- .../register/prdfErrorRegisterMask.C | 4 +- .../register/prdfHomRegisterAccess.C | 4 +- .../register/prdfHomRegisterAccess.H | 8 +-- .../framework/register/prdfOperatorRegister.H | 54 +++++++++---------- .../framework/register/prdfRegisterCache.C | 14 ++--- .../framework/register/prdfRegisterCache.H | 14 ++--- .../framework/register/prdfScanFacility.H | 2 +- .../framework/register/prdfScomRegister.C | 14 ++--- .../framework/register/prdfScomRegister.H | 16 +++--- src/usr/diag/prdf/common/prdf_types.h | 2 +- src/usr/diag/prdf/common/rule/prdfGroup.C | 6 +-- src/usr/diag/prdf/common/rule/prdfGroup.H | 6 +-- .../diag/prdf/common/rule/prdfRuleMetaData.C | 2 +- .../prdf/framework/prdfFileRegisterAccess.C | 2 +- .../prdf/framework/prdfFileRegisterAccess.H | 6 +-- src/usr/diag/prdf/plat/prdfPlatServices.C | 4 +- src/usr/diag/prdf/plat/prdfPlatServices.H | 6 +-- .../prdf/test/prdfTest_ScomAccessInterface.H | 4 +- .../diag/prdf/test/prdfsimHomRegisterAccess.C | 4 +- .../diag/prdf/test/prdfsimHomRegisterAccess.H | 6 +-- src/usr/diag/prdf/test/prdfsimScrDB.C | 8 +-- src/usr/diag/prdf/test/prdfsimScrDB.H | 12 +++-- src/usr/diag/prdf/test/prdfsimServices.C | 6 +-- src/usr/diag/prdf/test/prdfsimServices.H | 6 ++- 35 files changed, 155 insertions(+), 139 deletions(-) diff --git a/src/usr/diag/prdf/common/framework/register/iipCaptureData.h b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h index b8aeac6526c..f1a9d4d3508 100755 --- a/src/usr/diag/prdf/common/framework/register/iipCaptureData.h +++ b/src/usr/diag/prdf/common/framework/register/iipCaptureData.h @@ -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. @@ -221,7 +221,7 @@ class CaptureData

    Parameter: i_pchipHandle Handle of chip object
    Parameter: scan comm id (unique one btye code representing scan comm address) -
    Parameter: BIT_STRING_CLASS +
    Parameter: BitString
    Parameter: Optional location in capure vector [FRONT | BACK] def = BACK
    Returns: Nothing
    Requires: Nothing @@ -230,7 +230,7 @@ class CaptureData

*/ 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 @@ -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. diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h index e89026ed228..0ca322be4a0 100755 --- a/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h +++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegister.h @@ -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. */ @@ -140,7 +142,7 @@ class ErrorRegister : public ErrorRegisterType return code from mops scr access
*/ - 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 @@ -153,7 +155,7 @@ class ErrorRegister : public ErrorRegisterType
Notes: The default implementation does not have a filter
*/ - 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; } /** diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h index 3aae0998358..18123dc0cbb 100755 --- a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h +++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterFilter.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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 ); /** diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h index 9d615f18ad5..e74d809008e 100755 --- a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h +++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterMask.h @@ -159,7 +159,7 @@ class ErrorRegisterMask : public ErrorRegisterFilter to using it for any Analysis.
*/ - void SetMaskBits(const BIT_STRING_CLASS & bitString); + void SetMaskBits(const BitString & bitString); protected: @@ -176,7 +176,7 @@ class ErrorRegisterMask : public ErrorRegisterFilter return code from mops scr access
*/ - virtual const BIT_STRING_CLASS & Read(); + virtual const BitString & Read(); /** @@ -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 diff --git a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h index 53819a397c1..0d5260d67c5 100755 --- a/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h +++ b/src/usr/diag/prdf/common/framework/register/iipErrorRegisterType.h @@ -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. */ @@ -52,7 +54,7 @@ namespace PRDF //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- -class BIT_STRING_CLASS; +class BitString; struct STEP_CODE_DATA_STRUCT; class ErrorRegisterType @@ -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 @@ -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. diff --git a/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h index b8b799f8bfb..2bd97c6b0af 100755 --- a/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h +++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccess.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -66,7 +66,7 @@ namespace PRDF { // Forward References -class BIT_STRING_CLASS; +class BitString; class MopRegisterAccess { @@ -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 ******************************************** diff --git a/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h index 1cc00d9c4c3..e87d702107e 100755 --- a/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h +++ b/src/usr/diag/prdf/common/framework/register/iipMopRegisterAccessScanComm.h @@ -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. */ @@ -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 ******************************************** diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.C b/src/usr/diag/prdf/common/framework/register/iipscr.C index e8eda78812d..f6d386f17d7 100755 --- a/src/usr/diag/prdf/common/framework/register/iipscr.C +++ b/src/usr/diag/prdf/common/framework/register/iipscr.C @@ -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 */ @@ -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); } @@ -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); } @@ -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); } @@ -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(); } @@ -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 ) { @@ -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 ) { diff --git a/src/usr/diag/prdf/common/framework/register/iipscr.h b/src/usr/diag/prdf/common/framework/register/iipscr.h index 0eaf3e9ba35..53c9bfa5a4d 100755 --- a/src/usr/diag/prdf/common/framework/register/iipscr.h +++ b/src/usr/diag/prdf/common/framework/register/iipscr.h @@ -203,7 +203,7 @@ class SCAN_COMM_REGISTER_CLASS then extra mask bits are ignored.
*/ - uint32_t Read(BIT_STRING_CLASS & mask); + uint32_t Read(BitString & mask); /** Write hardware register (pure virtual) @@ -282,7 +282,7 @@ class SCAN_COMM_REGISTER_CLASS
*/ virtual - const BIT_STRING_CLASS * GetBitString(ATTENTION_TYPE + const BitString * GetBitString(ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE ) const = 0; @@ -300,7 +300,7 @@ class SCAN_COMM_REGISTER_CLASS Write() is called
*/ - virtual void SetBitString(const BIT_STRING_CLASS * bs) = 0; + virtual void SetBitString(const BitString * bs) = 0; /** SetBit @@ -401,7 +401,7 @@ class SCAN_COMM_REGISTER_CLASS
Promises None.
*/ - virtual BIT_STRING_CLASS & AccessBitString(void) = 0; + virtual BitString & AccessBitString(void) = 0; private: // Data static const int DEFAULT_BIT_LENGTH = 64; diff --git a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C index 4990e23236e..55516049729 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C +++ b/src/usr/diag/prdf/common/framework/register/prdfCaptureData.C @@ -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. @@ -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 ); } diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C index 9ee1358eb3b..f3939d1f5b2 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegister.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -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 @@ -229,7 +229,7 @@ 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)); @@ -237,7 +237,7 @@ const BIT_STRING_CLASS & ErrorRegister::Read(ATTENTION_TYPE i_attn) /*---------------------------------------------------------------------*/ -BitKey ErrorRegister::Filter( const BIT_STRING_CLASS & bs ) +BitKey ErrorRegister::Filter( const BitString & bs ) { BitKey bit_list; bit_list = bs; diff --git a/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C index 0c083d03e49..e699e5e5b5c 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C +++ b/src/usr/diag/prdf/common/framework/register/prdfErrorRegisterMask.C @@ -105,7 +105,7 @@ xMaskScr(maskScr) // ********************************************************************** -const BIT_STRING_CLASS & ErrorRegisterMask::Read() +const BitString & ErrorRegisterMask::Read() { scr_rc = scr.Read(); bitString = *scr.GetBitString(); @@ -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; diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C index c022cdec825..2939352f644 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.C @@ -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 { @@ -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 { diff --git a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H index 343ef6361af..6426b4ac301 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H +++ b/src/usr/diag/prdf/common/framework/register/prdfHomRegisterAccess.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -73,7 +73,7 @@ class ScomAccessor * register state */ virtual uint32_t Access( TARGETING::TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const; @@ -131,7 +131,7 @@ class ScomService /** Access the scan com register @param i_target Target to access the register - @param BIT_STRING_CLASS - holds data read or to write + @param BitString - holds data read or to write @param register address @param [READ|WRITE] @returns [SUCCESS|FAIL] @@ -140,7 +140,7 @@ class ScomService @note */ virtual uint32_t Access(TARGETING::TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const; diff --git a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H index c35425bac63..726406edeae 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H +++ b/src/usr/diag/prdf/common/framework/register/prdfOperatorRegister.H @@ -61,7 +61,7 @@ class NotRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return iv_child->Read(); } virtual uint32_t Write() { return iv_child->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { (*iv_bs) = ~(*iv_child->GetBitString(i_type)); @@ -81,8 +81,8 @@ class NotRegister : public SCAN_COMM_REGISTER_CLASS { return iv_child >= r.iv_child; } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_child; @@ -119,7 +119,7 @@ class SummaryRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return iv_child->Read(); } virtual uint32_t Write() { return iv_child->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { iv_bs->clearAll(); @@ -156,8 +156,8 @@ class SummaryRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_child; @@ -195,7 +195,7 @@ class LeftShiftRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return iv_child->Read(); } virtual uint32_t Write() { return iv_child->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { (*iv_bs) = (*iv_child->GetBitString(i_type)) << iv_amount; @@ -223,8 +223,8 @@ class LeftShiftRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_child; @@ -262,7 +262,7 @@ class RightShiftRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return iv_child->Read(); } virtual uint32_t Write() { return iv_child->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { (*iv_bs) = (*iv_child->GetBitString(i_type)) >> iv_amount; @@ -290,8 +290,8 @@ class RightShiftRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_child; @@ -338,7 +338,7 @@ class AndRegister : public SCAN_COMM_REGISTER_CLASS return iv_left->Write() | iv_right->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { (*iv_bs) = *iv_left->GetBitString(i_type); @@ -372,8 +372,8 @@ class AndRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_left; @@ -421,7 +421,7 @@ class OrRegister : public SCAN_COMM_REGISTER_CLASS return iv_left->Write() | iv_right->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE ) const { (*iv_bs) = *iv_left->GetBitString(i_type); @@ -455,8 +455,8 @@ class OrRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: SCAN_COMM_REGISTER_CLASS * iv_left; @@ -482,15 +482,15 @@ class NullRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return 0; } virtual uint32_t Write() { return 0; } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { return &iv_iBS; } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: BitStringBuffer iv_iBS; @@ -563,7 +563,7 @@ class AttnTypeRegister : public SCAN_COMM_REGISTER_CLASS iv_hostattn->Write(); } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { switch (i_type) @@ -618,8 +618,8 @@ class AttnTypeRegister : public SCAN_COMM_REGISTER_CLASS } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: static NullRegister cv_null; @@ -654,7 +654,7 @@ class ConstantRegister : public SCAN_COMM_REGISTER_CLASS virtual uint32_t Read() const { return SUCCESS; } virtual uint32_t Write() { return SUCCESS; } - const BIT_STRING_CLASS * GetBitString( + const BitString * GetBitString( ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const { return &iv_iBS; @@ -669,8 +669,8 @@ class ConstantRegister : public SCAN_COMM_REGISTER_CLASS { return r.iv_iBS == iv_iBS; } protected: - BIT_STRING_CLASS & AccessBitString(void) { return iv_iBS; } - void SetBitString(const BIT_STRING_CLASS *) {} + BitString & AccessBitString(void) { return iv_iBS; } + void SetBitString(const BitString *) {} private: BitStringBuffer iv_iBS; diff --git a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.C b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.C index 5b66196fd02..e7d29ff1ccf 100644 --- a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.C +++ b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.C @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,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. */ @@ -43,11 +45,11 @@ RegDataCache::~RegDataCache() //------------------------------------------------------------------------------ -BIT_STRING_CLASS & RegDataCache::read( ExtensibleChip * i_chip, +BitString & RegDataCache::read( ExtensibleChip * i_chip, const SCAN_COMM_REGISTER_CLASS * i_reg ) { ScomRegisterAccess l_scomAccessKey ( *i_reg, i_chip ); - BIT_STRING_CLASS * l_pBitString = queryCache( l_scomAccessKey ); + BitString * l_pBitString = queryCache( l_scomAccessKey ); if ( NULL == l_pBitString ) { @@ -94,7 +96,7 @@ void RegDataCache::flush( ExtensibleChip* i_pChip, //------------------------------------------------------------------------------ -BIT_STRING_CLASS * RegDataCache::queryCache( +BitString * RegDataCache::queryCache( ExtensibleChip* i_pChip, const SCAN_COMM_REGISTER_CLASS * i_pRegister )const { @@ -104,10 +106,10 @@ BIT_STRING_CLASS * RegDataCache::queryCache( //------------------------------------------------------------------------------ -BIT_STRING_CLASS * RegDataCache::queryCache( +BitString * RegDataCache::queryCache( const ScomRegisterAccess & i_scomAccessKey ) const { - BIT_STRING_CLASS * l_pBitString = NULL; + BitString * l_pBitString = NULL; CacheDump::const_iterator itDump = iv_cachedRead.find( i_scomAccessKey ); if( iv_cachedRead.end() != itDump ) { diff --git a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H index 95cd9dc7efc..be34884a36e 100644 --- a/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H +++ b/src/usr/diag/prdf/common/framework/register/prdfRegisterCache.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,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. */ @@ -33,7 +35,7 @@ #include #include -class BIT_STRING_CLASS; +class BitString; namespace PRDF { @@ -76,7 +78,7 @@ class RegDataCache * @param i_reg Pointer to register to be read. * @return A reference to the data buffer associated with the register. */ - BIT_STRING_CLASS & read( ExtensibleChip * i_chip, + BitString & read( ExtensibleChip * i_chip, const SCAN_COMM_REGISTER_CLASS * i_reg ); /** @@ -97,7 +99,7 @@ class RegDataCache * @param i_pRegister base part of register entry to be queried in cache. * @return pointer to cache entry associated with a given register */ - BIT_STRING_CLASS * queryCache( ExtensibleChip* i_pChip, + BitString * queryCache( ExtensibleChip* i_pChip, const SCAN_COMM_REGISTER_CLASS * i_pRegister )const; /** * @brief Queries if a specific entry exist in cache. @@ -105,11 +107,11 @@ class RegDataCache * @return pointer to cache entry associated with a given register */ - BIT_STRING_CLASS * queryCache( + BitString * queryCache( const ScomRegisterAccess & i_scomAccessKey )const; private: // data - typedef std::map CacheDump; + typedef std::map CacheDump; CacheDump iv_cachedRead; }; diff --git a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H index f9ee286d661..c01efa6f802 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H +++ b/src/usr/diag/prdf/common/framework/register/prdfScanFacility.H @@ -149,7 +149,7 @@ public: /** * @brief Get a PrdfConstantRegister - * @param BIT_STRING_CLASS - the bit string constant to use. + * @param BitString - the bit string constant to use. * @post only one instance of the register with this BIT_STRING value will * exist. */ diff --git a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C index e06c4e61575..7e4cce81baf 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C +++ b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.C @@ -75,16 +75,16 @@ namespace PRDF // --------------------------------------------------------------------- -void ScomRegister::SetBitString( const BIT_STRING_CLASS *bs ) +void ScomRegister::SetBitString( const BitString *bs ) { - BIT_STRING_CLASS & l_string = AccessBitString(); + BitString & l_string = AccessBitString(); l_string.setString(*bs); } //------------------------------------------------------------------------------ -const BIT_STRING_CLASS * ScomRegister::GetBitString(ATTENTION_TYPE i_type) const +const BitString * ScomRegister::GetBitString(ATTENTION_TYPE i_type) const { // Calling Read() will ensure that an entry exists in the cache and the // entry has at been synched with hardware at least once. Note that we @@ -101,7 +101,7 @@ const BIT_STRING_CLASS * ScomRegister::GetBitString(ATTENTION_TYPE i_type) const //------------------------------------------------------------------------------ -BIT_STRING_CLASS & ScomRegister::AccessBitString() +BitString & ScomRegister::AccessBitString() { // Calling Read() will ensure that an entry exists in the cache and the // entry has at been synched with hardware at least once. Note that we @@ -212,7 +212,7 @@ uint32_t ScomRegister::Write() //------------------------------------------------------------------------------ -uint32_t ScomRegister::Access( BIT_STRING_CLASS & bs, +uint32_t ScomRegister::Access( BitString & bs, MopRegisterAccess::Operation op ) const { int32_t l_rc = SCR_ACCESS_FAILED; @@ -237,13 +237,13 @@ ExtensibleChip* ScomRegister::getChip( )const bool ScomRegister::queryCache() const { RegDataCache & cache = RegDataCache::getCachedRegisters(); - BIT_STRING_CLASS * bs = cache.queryCache( getChip(), this ); + BitString * bs = cache.queryCache( getChip(), this ); return ( NULL != bs ); } //------------------------------------------------------------------------------ -BIT_STRING_CLASS & ScomRegister::readCache() const +BitString & ScomRegister::readCache() const { RegDataCache & cache = RegDataCache::getCachedRegisters(); return cache.read( getChip(), this ); diff --git a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H index 4bfe43581e0..655f4d52373 100755 --- a/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H +++ b/src/usr/diag/prdf/common/framework/register/prdfScomRegister.H @@ -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. */ @@ -81,10 +83,10 @@ class ScomRegister : public SCAN_COMM_REGISTER_CLASS /** * @brief Returns the pointer to bit string * @param i_type attention type - * @return BIT_STRING_CLASS * pointer to bit string + * @return BitString * pointer to bit string */ - virtual const BIT_STRING_CLASS * GetBitString(ATTENTION_TYPE i_type = + virtual const BitString * GetBitString(ATTENTION_TYPE i_type = INVALID_ATTENTION_TYPE) const; /** * @brief Updates bit string contents associated with register @@ -92,7 +94,7 @@ class ScomRegister : public SCAN_COMM_REGISTER_CLASS * @return Nil */ - virtual void SetBitString(const BIT_STRING_CLASS * i_bs) ; + virtual void SetBitString(const BitString * i_bs) ; /** * @brief Returns length of the bits string associated with register @@ -190,7 +192,7 @@ class ScomRegister : public SCAN_COMM_REGISTER_CLASS * @brief Returns reference to bit string associated with register * @return Refer to function description */ - virtual BIT_STRING_CLASS & AccessBitString( ); + virtual BitString & AccessBitString( ); /** * @brief Gets the register read and write done by calling access * function of scom accessor service. @@ -198,7 +200,7 @@ class ScomRegister : public SCAN_COMM_REGISTER_CLASS * @param Read or write operation * @return [SUCCESS|FAIL] */ - uint32_t Access( BIT_STRING_CLASS & bs, + uint32_t Access( BitString & bs, MopRegisterAccess::Operation op )const; /** @@ -218,7 +220,7 @@ private: // functions * @brief Reads register contents from cache. * @return Reference to bit string buffer maintained in cache. */ - BIT_STRING_CLASS & readCache() const; + BitString & readCache() const; /** * @brief Deletes one or all entry in the cache diff --git a/src/usr/diag/prdf/common/prdf_types.h b/src/usr/diag/prdf/common/prdf_types.h index 0b2677b15b7..fd3c0a680b9 100755 --- a/src/usr/diag/prdf/common/prdf_types.h +++ b/src/usr/diag/prdf/common/prdf_types.h @@ -35,7 +35,7 @@ namespace PRDF { #define BIT_LIST_CLASS BitKey -#define BIT_STRING_CLASS BitString +#define BitString BitString #define BIT_STRING_BUFFER_CLASS BitStringBuffer #define FILTER_CLASS FilterClass diff --git a/src/usr/diag/prdf/common/rule/prdfGroup.C b/src/usr/diag/prdf/common/rule/prdfGroup.C index fd5651f1720..f3b1b61a237 100755 --- a/src/usr/diag/prdf/common/rule/prdfGroup.C +++ b/src/usr/diag/prdf/common/rule/prdfGroup.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -263,13 +263,13 @@ void Group::AddFilter(FilterClass * i_filter, bool i_addFirst ) -const BIT_STRING_CLASS & Group::Read(ATTENTION_TYPE i_attn) +const BitString & Group::Read(ATTENTION_TYPE i_attn) { static BIT_STRING_BUFFER_CLASS a(64); return a; }; -BIT_LIST_CLASS Group::Filter(const BIT_STRING_CLASS & i) +BIT_LIST_CLASS Group::Filter(const BitString & i) { return BIT_LIST_CLASS(); }; diff --git a/src/usr/diag/prdf/common/rule/prdfGroup.H b/src/usr/diag/prdf/common/rule/prdfGroup.H index 1bc84399967..bc7eae24cab 100755 --- a/src/usr/diag/prdf/common/rule/prdfGroup.H +++ b/src/usr/diag/prdf/common/rule/prdfGroup.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -96,8 +96,8 @@ class Group : public ErrorRegisterType virtual bool FilterUndo(BitKey & i_bit_list) { return false; } protected: - const BIT_STRING_CLASS & Read(ATTENTION_TYPE i_attn); - BIT_LIST_CLASS Filter(const BIT_STRING_CLASS &); + const BitString & Read(ATTENTION_TYPE i_attn); + BIT_LIST_CLASS Filter(const BitString &); int32_t Lookup(STEP_CODE_DATA_STRUCT &, BIT_LIST_CLASS &); int32_t Reset(const BIT_LIST_CLASS &, STEP_CODE_DATA_STRUCT &); diff --git a/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C index 5f35f04150a..5984e4f0fbf 100644 --- a/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C +++ b/src/usr/diag/prdf/common/rule/prdfRuleMetaData.C @@ -567,7 +567,7 @@ int32_t RuleMetaData::CaptureErrorData( CaptureData & io_cap, if( l_primReg ) { - const BIT_STRING_CLASS *l_bitStringPtr = + const BitString *l_bitStringPtr = l_primReg->GetBitString(); if(l_bitStringPtr->isZero()) { diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C index 2322d4bf649..a7a89b4cf14 100755 --- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C +++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.C @@ -35,7 +35,7 @@ namespace PRDF errlHndl_t FileScomAccessor::Access( TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const { diff --git a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H index 875b2ad1dfc..256d3ac4dd3 100755 --- a/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H +++ b/src/usr/diag/prdf/framework/prdfFileRegisterAccess.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -62,14 +62,14 @@ class FileScomAccessor : public ScomAccessor /** * Access the scom register using file. * @param i_target Target to access the register - * @param BIT_STRING_CLASS - holds data read or to write + * @param BitString - holds data read or to write * @param register address * @param [READ|WRITE] * @returns NULL if success, valid error handle otherwise * @pre bs.Length() must be size of register data to read/write */ virtual errlHndl_t Access(TARGETING::TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const; }; diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.C b/src/usr/diag/prdf/plat/prdfPlatServices.C index bea0be17dc5..a51c92268de 100644 --- a/src/usr/diag/prdf/plat/prdfPlatServices.C +++ b/src/usr/diag/prdf/plat/prdfPlatServices.C @@ -115,7 +115,7 @@ bool isSpConfigFsp() //------------------------------------------------------------------------------ -uint32_t getScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, +uint32_t getScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, uint64_t i_address) { errlHndl_t errl = NULL; @@ -165,7 +165,7 @@ uint32_t getScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, //------------------------------------------------------------------------------ -uint32_t putScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, +uint32_t putScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, uint64_t i_address) { errlHndl_t errl = NULL; diff --git a/src/usr/diag/prdf/plat/prdfPlatServices.H b/src/usr/diag/prdf/plat/prdfPlatServices.H index e7377ccf17a..53509ec8efe 100644 --- a/src/usr/diag/prdf/plat/prdfPlatServices.H +++ b/src/usr/diag/prdf/plat/prdfPlatServices.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -87,7 +87,7 @@ inline bool isSmpCoherent() { return false; } * * @return SUCCESS or PRD_SCANCOM_FAILURE */ -uint32_t getScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, +uint32_t getScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, uint64_t i_address); /** @@ -99,7 +99,7 @@ uint32_t getScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, * * @return SUCCESS or PRD_SCANCOM_FAILURE */ -uint32_t putScom(TARGETING::TargetHandle_t i_target, BIT_STRING_CLASS& io_bs, +uint32_t putScom(TARGETING::TargetHandle_t i_target, BitString& io_bs, uint64_t i_address); //############################################################################## diff --git a/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H b/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H index 4e337e14ca0..a39a93c238b 100644 --- a/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H +++ b/src/usr/diag/prdf/test/prdfTest_ScomAccessInterface.H @@ -68,8 +68,8 @@ public: //OCC fir, which shouldn't generate an attention uint64_t address = 0x01010800; CPU_WORD l_cpuWord[(64)/(sizeof(CPU_WORD)*8)] = {0}; - BIT_STRING_CLASS exp(64, l_cpuWord); - BIT_STRING_CLASS bs(64, l_cpuWord); + BitString exp(64, l_cpuWord); + BitString bs(64, l_cpuWord); TARGETING::TargetHandleList targetList = PRDF::PlatServices::getFunctionalTargetList(TARGETING::TYPE_PROC); diff --git a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C index e040b7777b8..3e3079883e9 100755 --- a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C +++ b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,7 @@ SimScomAccessor::~SimScomAccessor() } uint32_t SimScomAccessor::Access(TARGETING::TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const { diff --git a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.H b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.H index 5a6b6ffb70f..b8a610f756b 100755 --- a/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.H +++ b/src/usr/diag/prdf/test/prdfsimHomRegisterAccess.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -62,7 +62,7 @@ class SimScomAccessor : public ScomAccessor /** Access the scan com register @param i_target Target to access the register - @param BIT_STRING_CLASS - holds data read or to write + @param BitString - holds data read or to write @param register address @param [READ|WRITE] @returns SUCCESS or PRD_SCANCOM_FAILURE @@ -71,7 +71,7 @@ class SimScomAccessor : public ScomAccessor @note */ virtual uint32_t Access(TARGETING::TargetHandle_t i_target, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, MopRegisterAccess::Operation operation) const; diff --git a/src/usr/diag/prdf/test/prdfsimScrDB.C b/src/usr/diag/prdf/test/prdfsimScrDB.C index 294c17ad902..6308ba423f1 100755 --- a/src/usr/diag/prdf/test/prdfsimScrDB.C +++ b/src/usr/diag/prdf/test/prdfsimScrDB.C @@ -53,7 +53,7 @@ namespace PRDF } void ScrDB::processCmd(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, SimOp i_op) { @@ -83,7 +83,7 @@ namespace PRDF } void ScrDB::Read(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId) { //PRDF_DENTER( "ScrDB::Read() huid: 0x%X, addr: 0x%016X", @@ -135,7 +135,7 @@ namespace PRDF } void ScrDB::Write(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId) { PRDF_TRAC( "ScrDB::Write() huid: %X, addr: %016X, data: %08X %08X", @@ -201,7 +201,7 @@ namespace PRDF void ScrDB::Expect(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId) { PRDF_TRAC( "ScrDB::Expect() huid: %X, addr: %016X, data: %08X %08X", diff --git a/src/usr/diag/prdf/test/prdfsimScrDB.H b/src/usr/diag/prdf/test/prdfsimScrDB.H index 50ccba79f44..e6d20f4ba9d 100755 --- a/src/usr/diag/prdf/test/prdfsimScrDB.H +++ b/src/usr/diag/prdf/test/prdfsimScrDB.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,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. */ @@ -84,7 +86,7 @@ namespace PRDF // void processCmd(const std::string & cmd, std::string & response); void processCmd(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, SimOp i_op); @@ -92,13 +94,13 @@ namespace PRDF private: void Read(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId); void Write(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId); void Expect(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId); // void Setup(std::istringstream & iss, std::string & response); // void Expect(std::istringstream & iss, std::string & response); diff --git a/src/usr/diag/prdf/test/prdfsimServices.C b/src/usr/diag/prdf/test/prdfsimServices.C index f1cd908f044..dc31d6f5ea9 100755 --- a/src/usr/diag/prdf/test/prdfsimServices.C +++ b/src/usr/diag/prdf/test/prdfsimServices.C @@ -180,7 +180,7 @@ namespace PRDF { TARGETING::Target* l_ptargetHandle = string2Target(i_epath); CPU_WORD l_cpuWord[(64)/(sizeof(CPU_WORD)*8)] = {0}; - BIT_STRING_CLASS l_bs(64, l_cpuWord); + BitString l_bs(64, l_cpuWord); l_bs.setFieldJustify(0, 32, (i_data >> 32) & 0xFFFFFFFF); l_bs.setFieldJustify(32, 32, (i_data & 0xFFFFFFFF)); @@ -196,7 +196,7 @@ namespace PRDF { TARGETING::Target* l_ptargetHandle = string2Target(i_epath); CPU_WORD l_cpuWord[(64)/(sizeof(CPU_WORD)*8)] = {0}; - BIT_STRING_CLASS l_bs(64, l_cpuWord); + BitString l_bs(64, l_cpuWord); l_bs.setFieldJustify(0, 32, (i_data >> 32) & 0xFFFFFFFF); l_bs.setFieldJustify(32, 32, (i_data & 0xFFFFFFFF)); @@ -207,7 +207,7 @@ namespace PRDF } void SimServices::processCmd(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, ScrDB::SimOp i_op) { diff --git a/src/usr/diag/prdf/test/prdfsimServices.H b/src/usr/diag/prdf/test/prdfsimServices.H index b756d850715..66d14b0147b 100755 --- a/src/usr/diag/prdf/test/prdfsimServices.H +++ b/src/usr/diag/prdf/test/prdfsimServices.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,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. */ @@ -63,7 +65,7 @@ class SimServices uint64_t i_address, uint64_t i_data); void processCmd(TARGETING::TargetHandle_t i_ptargetHandle, - BIT_STRING_CLASS & bs, + BitString & bs, uint64_t registerId, ScrDB::SimOp i_op); // ScrDB functions end ------------------------------