Skip to content

Commit

Permalink
Greenpak4CrossConnection/Greenpak4Inverer: Implemented Load()
Browse files Browse the repository at this point in the history
azonenberg committed Jul 13, 2017
1 parent f16d4e8 commit ffaddc0
Showing 3 changed files with 9 additions and 11 deletions.
5 changes: 2 additions & 3 deletions src/greenpak4/Greenpak4BitstreamEntity.cpp
Original file line number Diff line number Diff line change
@@ -203,8 +203,8 @@ void Greenpak4BitstreamEntity::ReadMatrixSelector(
unsigned int matrix,
Greenpak4EntityOutput& signal)
{
//TODO
LogVerbose("Reading matrix selector for %s\n", GetDescription().c_str());
LogIndenter li;

unsigned int nbits = m_device->GetMatrixBits();
unsigned int startbit = m_device->GetMatrixBase(matrix) + wordpos * nbits;
@@ -218,7 +218,6 @@ void Greenpak4BitstreamEntity::ReadMatrixSelector(
}

LogVerbose("Got netnum %d\n", netnum);
LogIndenter li;

//Convert the net number back to an EntityOutput
//For now, do this exhaustively (TODO be smart about it?)
@@ -238,7 +237,7 @@ void Greenpak4BitstreamEntity::ReadMatrixSelector(
//TODO: Properly handle configuration if the primitive has multiple ports mapping to one net (e.g. Q/nQ)
if(output.GetMatrix() == matrix || output.HasDual() )
{
LogVerbose("HIT: %s\n", output.GetOutputName().c_str());
LogVerbose("Source: %s\n", output.GetOutputName().c_str());
signal = output;
nhits ++;
}
8 changes: 4 additions & 4 deletions src/greenpak4/Greenpak4CrossConnection.cpp
Original file line number Diff line number Diff line change
@@ -109,11 +109,11 @@ unsigned int Greenpak4CrossConnection::GetOutputNetNumber(string /*port*/)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Load/save logic

bool Greenpak4CrossConnection::Load(bool* /*bitstream*/)
bool Greenpak4CrossConnection::Load(bool* bitstream)
{
//TODO: Do our inputs
LogError("Unimplemented\n");
return false;
//Input should come from opposite matrix as us
ReadMatrixSelector(bitstream, m_inputBaseWord, !m_matrix, m_input);
return true;
}

bool Greenpak4CrossConnection::Save(bool* bitstream)
7 changes: 3 additions & 4 deletions src/greenpak4/Greenpak4Inverter.cpp
Original file line number Diff line number Diff line change
@@ -96,11 +96,10 @@ bool Greenpak4Inverter::CommitChanges()
return true;
}

bool Greenpak4Inverter::Load(bool* /*bitstream*/)
bool Greenpak4Inverter::Load(bool* bitstream)
{
//TODO: Do our inputs
LogError("Unimplemented\n");
return false;
ReadMatrixSelector(bitstream, m_inputBaseWord, m_matrix, m_input);
return true;
}

bool Greenpak4Inverter::Save(bool* bitstream)

0 comments on commit ffaddc0

Please sign in to comment.