Skip to content

Commit

Permalink
clang-format update of JTAG Analyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Marcus10110
Marcus10110 committed Oct 1, 2020
1 parent 47ac261 commit 86045d6
Show file tree
Hide file tree
Showing 10 changed files with 1,009 additions and 1,024 deletions.
339 changes: 173 additions & 166 deletions src/JtagAnalyzer.cpp
View file
Expand Up @@ -5,175 +5,181 @@
#include "JtagAnalyzer.h"
#include "JtagAnalyzerSettings.h"

JtagAnalyzer::JtagAnalyzer()
: mSimulationInitilized(false)
JtagAnalyzer::JtagAnalyzer() : mSimulationInitilized( false )
{
SetAnalyzerSettings(&mSettings);
SetAnalyzerSettings( &mSettings );
}

JtagAnalyzer::~JtagAnalyzer()
{
KillThread();
KillThread();
}

void JtagAnalyzer::SyncToSample(U64 to_sample)
void JtagAnalyzer::SyncToSample( U64 to_sample )
{
mTms->AdvanceToAbsPosition(to_sample);
mTck->AdvanceToAbsPosition(to_sample);
if (mTdi != NULL)
mTdi->AdvanceToAbsPosition(to_sample);
if (mTdo != NULL)
mTdo->AdvanceToAbsPosition(to_sample);
if (mTrst != NULL)
mTrst->AdvanceToAbsPosition(to_sample);
mTms->AdvanceToAbsPosition( to_sample );
mTck->AdvanceToAbsPosition( to_sample );
if( mTdi != NULL )
mTdi->AdvanceToAbsPosition( to_sample );
if( mTdo != NULL )
mTdo->AdvanceToAbsPosition( to_sample );
if( mTrst != NULL )
mTrst->AdvanceToAbsPosition( to_sample );
}

void JtagAnalyzer::AdvanceTck(Frame& frm, JtagShiftedData& shifted_data)
void JtagAnalyzer::AdvanceTck( Frame& frm, JtagShiftedData& shifted_data )
{
if (mTrst != NULL
&& mTrst->WouldAdvancingToAbsPositionCauseTransition(mTck->GetSampleOfNextEdge()))
{
mTrst->AdvanceToNextEdge();

// close the frame and add it
CloseFrame(frm, shifted_data, mTrst->GetSampleNumber());

// reset the TAP state
mTAPCtrl.SetState(TestLogicReset);

// prepare the reset frame
frm.mStartingSampleInclusive = mTrst->GetSampleNumber() + 1;
frm.mType = mTAPCtrl.GetCurrState();

// find the rising edge of TRST
mTrst->AdvanceToNextEdge();

// bring TCK here too
mTck->AdvanceToAbsPosition(mTrst->GetSampleNumber());
} else {
mTck->AdvanceToNextEdge();
}
if( mTrst != NULL && mTrst->WouldAdvancingToAbsPositionCauseTransition( mTck->GetSampleOfNextEdge() ) )
{
mTrst->AdvanceToNextEdge();

// close the frame and add it
CloseFrame( frm, shifted_data, mTrst->GetSampleNumber() );

// reset the TAP state
mTAPCtrl.SetState( TestLogicReset );

// prepare the reset frame
frm.mStartingSampleInclusive = mTrst->GetSampleNumber() + 1;
frm.mType = mTAPCtrl.GetCurrState();

// find the rising edge of TRST
mTrst->AdvanceToNextEdge();

// bring TCK here too
mTck->AdvanceToAbsPosition( mTrst->GetSampleNumber() );
}
else
{
mTck->AdvanceToNextEdge();
}
}

void JtagAnalyzer::Setup()
{
{
// get the channel data pointers
mTms = GetAnalyzerChannelData(mSettings.mTmsChannel);
mTck = GetAnalyzerChannelData(mSettings.mTckChannel);
if (mSettings.mTdiChannel != UNDEFINED_CHANNEL)
mTdi = GetAnalyzerChannelData(mSettings.mTdiChannel);
else
mTdi = NULL;

if (mSettings.mTdoChannel != UNDEFINED_CHANNEL)
mTdo = GetAnalyzerChannelData(mSettings.mTdoChannel);
else
mTdo = NULL;

if (mSettings.mTrstChannel != UNDEFINED_CHANNEL)
mTrst = GetAnalyzerChannelData(mSettings.mTrstChannel);
else
mTrst = NULL;
mTms = GetAnalyzerChannelData( mSettings.mTmsChannel );
mTck = GetAnalyzerChannelData( mSettings.mTckChannel );
if( mSettings.mTdiChannel != UNDEFINED_CHANNEL )
mTdi = GetAnalyzerChannelData( mSettings.mTdiChannel );
else
mTdi = NULL;

if( mSettings.mTdoChannel != UNDEFINED_CHANNEL )
mTdo = GetAnalyzerChannelData( mSettings.mTdoChannel );
else
mTdo = NULL;

if( mSettings.mTrstChannel != UNDEFINED_CHANNEL )
mTrst = GetAnalyzerChannelData( mSettings.mTrstChannel );
else
mTrst = NULL;
}

void JtagAnalyzer::CloseFrame(Frame& frm, JtagShiftedData& shifted_data, U64 ending_sample_number)
void JtagAnalyzer::CloseFrame( Frame& frm, JtagShiftedData& shifted_data, U64 ending_sample_number )
{
// save the TDI/TDO values in the frame
if (frm.mType == ShiftIR || frm.mType == ShiftDR)
{
// mind the bit order
if ((frm.mType == ShiftIR && mSettings.mInstructRegBitOrder == LSB_First)
|| (frm.mType == ShiftDR && mSettings.mDataRegBitOrder == LSB_First))
{
std::reverse(shifted_data.mTdiBits.begin(), shifted_data.mTdiBits.end());
std::reverse(shifted_data.mTdoBits.begin(), shifted_data.mTdoBits.end());
}

mResults->AddShiftedData(shifted_data);

shifted_data.mTdiBits.clear();
shifted_data.mTdoBits.clear();
}

frm.mEndingSampleInclusive = ending_sample_number;
mResults->AddFrame(frm);
// save the TDI/TDO values in the frame
if( frm.mType == ShiftIR || frm.mType == ShiftDR )
{
// mind the bit order
if( ( frm.mType == ShiftIR && mSettings.mInstructRegBitOrder == LSB_First ) ||
( frm.mType == ShiftDR && mSettings.mDataRegBitOrder == LSB_First ) )
{
std::reverse( shifted_data.mTdiBits.begin(), shifted_data.mTdiBits.end() );
std::reverse( shifted_data.mTdoBits.begin(), shifted_data.mTdoBits.end() );
}

mResults->AddShiftedData( shifted_data );

shifted_data.mTdiBits.clear();
shifted_data.mTdoBits.clear();
}

frm.mEndingSampleInclusive = ending_sample_number;
mResults->AddFrame( frm );
}

void JtagAnalyzer::WorkerThread()
{
Setup();

// make sure that we enter the loop on TRST high (inactive)
if (mTrst != NULL && mTrst->GetBitState() == BIT_LOW)
{
// since we started on a active TRST we'll
// ignore the initial state from the settings
mTAPCtrl.SetState(TestLogicReset);

// advance to the rising edge of TRST
mTrst->AdvanceToNextEdge();
SyncToSample(mTrst->GetSampleNumber());
} else {
mTAPCtrl.SetState(mSettings.mTAPInitialState);
}

Frame frm;
frm.mStartingSampleInclusive = mTck->GetSampleNumber();
frm.mType = mTAPCtrl.GetCurrState();
frm.mFlags = 0;
frm.mData1 = 0;
frm.mData2 = 0;

JtagShiftedData shifted_data;

for (;;)
{
// advance TCK to the rising edge
AdvanceTck(frm, shifted_data);
if (mTck->GetBitState() == BIT_LOW)
AdvanceTck(frm, shifted_data);

// advance all other channels here too
SyncToSample(mTck->GetSampleNumber());

// mark the rising edge of TCK
mResults->AddMarker(mTck->GetSampleNumber(), AnalyzerResults::UpArrow, mSettings.mTckChannel);

// save TDI and TDO states markers and data
if (mTAPCtrl.GetCurrState() == ShiftIR || mTAPCtrl.GetCurrState() == ShiftDR)
{
if (mTdi != NULL)
{
mResults->AddMarker(mTdi->GetSampleNumber(), (mTdi->GetBitState() == BIT_HIGH ? AnalyzerResults::One : AnalyzerResults::Zero), mSettings.mTdiChannel);
shifted_data.mTdiBits.push_back(mTdi->GetBitState());
}

if (mTdo != NULL)
{
mResults->AddMarker(mTdo->GetSampleNumber(), (mTdo->GetBitState() == BIT_HIGH ? AnalyzerResults::One : AnalyzerResults::Zero), mSettings.mTdoChannel);
shifted_data.mTdoBits.push_back(mTdo->GetBitState());
}
}

// send TMS state to the TAP state machine - returns true if state machine has changed
if (mTAPCtrl.AdvanceState(mTms->GetBitState()))
{
mResults->AddMarker(mTms->GetSampleNumber(), AnalyzerResults::Dot, mSettings.mTmsChannel);

CloseFrame(frm, shifted_data, mTck->GetSampleNumber());

// prepare the next frame
frm.mStartingSampleInclusive = mTck->GetSampleNumber() + 1;
frm.mType = mTAPCtrl.GetCurrState();

shifted_data.mStartSampleIndex = frm.mStartingSampleInclusive;

mResults->CommitResults();
}

// update progress bar
ReportProgress(mTck->GetSampleNumber());
}
// make sure that we enter the loop on TRST high (inactive)
if( mTrst != NULL && mTrst->GetBitState() == BIT_LOW )
{
// since we started on a active TRST we'll
// ignore the initial state from the settings
mTAPCtrl.SetState( TestLogicReset );

// advance to the rising edge of TRST
mTrst->AdvanceToNextEdge();
SyncToSample( mTrst->GetSampleNumber() );
}
else
{
mTAPCtrl.SetState( mSettings.mTAPInitialState );
}

Frame frm;
frm.mStartingSampleInclusive = mTck->GetSampleNumber();
frm.mType = mTAPCtrl.GetCurrState();
frm.mFlags = 0;
frm.mData1 = 0;
frm.mData2 = 0;

JtagShiftedData shifted_data;

for( ;; )
{
// advance TCK to the rising edge
AdvanceTck( frm, shifted_data );
if( mTck->GetBitState() == BIT_LOW )
AdvanceTck( frm, shifted_data );

// advance all other channels here too
SyncToSample( mTck->GetSampleNumber() );

// mark the rising edge of TCK
mResults->AddMarker( mTck->GetSampleNumber(), AnalyzerResults::UpArrow, mSettings.mTckChannel );

// save TDI and TDO states markers and data
if( mTAPCtrl.GetCurrState() == ShiftIR || mTAPCtrl.GetCurrState() == ShiftDR )
{
if( mTdi != NULL )
{
mResults->AddMarker( mTdi->GetSampleNumber(),
( mTdi->GetBitState() == BIT_HIGH ? AnalyzerResults::One : AnalyzerResults::Zero ),
mSettings.mTdiChannel );
shifted_data.mTdiBits.push_back( mTdi->GetBitState() );
}

if( mTdo != NULL )
{
mResults->AddMarker( mTdo->GetSampleNumber(),
( mTdo->GetBitState() == BIT_HIGH ? AnalyzerResults::One : AnalyzerResults::Zero ),
mSettings.mTdoChannel );
shifted_data.mTdoBits.push_back( mTdo->GetBitState() );
}
}

// send TMS state to the TAP state machine - returns true if state machine has changed
if( mTAPCtrl.AdvanceState( mTms->GetBitState() ) )
{
mResults->AddMarker( mTms->GetSampleNumber(), AnalyzerResults::Dot, mSettings.mTmsChannel );

CloseFrame( frm, shifted_data, mTck->GetSampleNumber() );

// prepare the next frame
frm.mStartingSampleInclusive = mTck->GetSampleNumber() + 1;
frm.mType = mTAPCtrl.GetCurrState();

shifted_data.mStartSampleIndex = frm.mStartingSampleInclusive;

mResults->CommitResults();
}

// update progress bar
ReportProgress( mTck->GetSampleNumber() );
}
}

bool JtagAnalyzer::NeedsRerun()
Expand All @@ -183,50 +189,51 @@ bool JtagAnalyzer::NeedsRerun()

void JtagAnalyzer::SetupResults()
{
mResults.reset(new JtagAnalyzerResults(this, &mSettings));
SetAnalyzerResults(mResults.get());
mResults.reset( new JtagAnalyzerResults( this, &mSettings ) );
SetAnalyzerResults( mResults.get() );

// set which channels will carry bubbles
mResults->AddChannelBubblesWillAppearOn(mSettings.mTmsChannel);
if (mTdi != NULL)
mResults->AddChannelBubblesWillAppearOn(mSettings.mTdiChannel);
if (mTdo != NULL)
mResults->AddChannelBubblesWillAppearOn(mSettings.mTdoChannel);
mResults->AddChannelBubblesWillAppearOn( mSettings.mTmsChannel );
if( mTdi != NULL )
mResults->AddChannelBubblesWillAppearOn( mSettings.mTdiChannel );
if( mTdo != NULL )
mResults->AddChannelBubblesWillAppearOn( mSettings.mTdoChannel );
}

U32 JtagAnalyzer::GenerateSimulationData(U64 minimum_sample_index, U32 device_sample_rate, SimulationChannelDescriptor** simulation_channels)
U32 JtagAnalyzer::GenerateSimulationData( U64 minimum_sample_index, U32 device_sample_rate,
SimulationChannelDescriptor** simulation_channels )
{
if (!mSimulationInitilized)
{
mSimulationDataGenerator.Initialize(GetSimulationSampleRate(), &mSettings);
mSimulationInitilized = true;
}
if( !mSimulationInitilized )
{
mSimulationDataGenerator.Initialize( GetSimulationSampleRate(), &mSettings );
mSimulationInitilized = true;
}

return mSimulationDataGenerator.GenerateSimulationData(minimum_sample_index, device_sample_rate, simulation_channels);
return mSimulationDataGenerator.GenerateSimulationData( minimum_sample_index, device_sample_rate, simulation_channels );
}

U32 JtagAnalyzer::GetMinimumSampleRateHz()
{
// whatever
return 9600;
// whatever
return 9600;
}

const char* JtagAnalyzer::GetAnalyzerName() const
{
return ::GetAnalyzerName();
return ::GetAnalyzerName();
}

const char* GetAnalyzerName()
{
return "JTAG";
return "JTAG";
}

Analyzer* CreateAnalyzer()
{
return new JtagAnalyzer();
return new JtagAnalyzer();
}

void DestroyAnalyzer(Analyzer* analyzer)
void DestroyAnalyzer( Analyzer* analyzer )
{
delete analyzer;
delete analyzer;
}

0 comments on commit 86045d6

Please sign in to comment.