From 4cf57e6db08da791233d75237f62e74bc88dd427 Mon Sep 17 00:00:00 2001
From: stephane Domas <stephane.domas@univ-fcomte.fr>
Date: Mon, 15 Jan 2018 00:02:16 +0100
Subject: [PATCH] add graph modif, progress on vhdl generation
---
AbstractBlock.cpp | 1 +
AbstractBlock.h | 5 +
AbstractInputModifier.cpp | 28 ++
AbstractInputModifier.h | 37 ++
AbstractInterface.cpp | 35 +-
BlockImplementation.cpp | 169 ++++---
BlockImplementation.h | 4 +
BlockLibraryTree.cpp | 63 ++-
BlockLibraryTree.h | 4 +-
BlockLibraryWidget.cpp | 23 +-
BlockParameter.cpp | 2 +-
BlockParameter.h | 2 +-
BlockParameterGeneric.cpp | 6 +-
BoxItem.cpp | 32 +-
ConnectedInterface.cpp | 12 +-
ConnectedInterface.h | 17 +-
ConnectionItem.cpp | 20 +-
DelayInputModifier.cpp | 30 ++
DelayInputModifier.h | 33 ++
Dispatcher.cpp | 124 +++++-
Dispatcher.h | 11 +-
Exception.cpp | 5 +-
Exception.h | 8 +-
FunctionalBlock.cpp | 288 +++++++++++-
FunctionalBlock.h | 12 +-
FunctionalInterface.cpp | 1 +
Graph.cpp | 5 +-
GroupBlock.cpp | 93 ++--
GroupBlock.h | 1 +
GroupWidget.cpp | 14 +-
InterfaceItem.cpp | 14 +-
InterfacePropertiesWindow.cpp | 3 +
MainWindow.cpp | 81 +++-
MainWindow.h | 21 +-
Parameters.cpp | 130 +++++-
Parameters.h | 9 +-
ParametersWindow.cpp | 6 +-
ReferenceBlock.cpp | 34 +-
ReferenceBlock.h | 1 +
SourceItem.cpp | 2 +-
VHDLConverter.cpp | 9 +-
blast.creator.user | 6 +-
blast.creator.user.3701e19 | 199 +++++++++
blast.files | 4 +
blastconfig.xml | 5 +-
blastconfig.xsd | 1 -
boxfilter_3x3.vhd | 421 ++++++++++++++++++
checker.vhd | 94 ++++
deserializer_3x1.vhd | 96 ++++
lib/implementations/boxfilter_3x3_impl.xml | 402 +++++++++++++++++
lib/implementations/checker_impl.xml | 71 +++
lib/implementations/csvreader_impl.xml | 34 ++
lib/implementations/deserializer_3x1_impl.xml | 81 ++++
lib/implementations/impls.bmf | Bin 2596 -> 5582 bytes
lib/implementations/logical_AND_3_impl.xml | 54 +++
.../implementations/rgb3sx8_to_gs_impl.xml | 43 +-
.../rgb3sx8_to_ycbcr_3DSP_impl.xml | 319 +++++++++++++
lib/implementations/threshold_extctl_impl.xml | 59 +++
lib/references/boxfilter_3x3.xml | 29 ++
lib/references/checker.xml | 31 ++
lib/references/csvreader.xml | 39 ++
lib/references/deserializer_3x1.xml | 30 ++
lib/references/logical_AND_3.xml | 28 ++
lib/references/references.bmf | Bin 11752 -> 20338 bytes
lib/references/rgb3sx8_to_gs.xml | 27 ++
lib/references/rgb3sx8_to_ycbcr_3DSP.xml | 24 +
lib/references/threshold_extctl.xml | 29 ++
logical_AND_3.vhd | 65 +++
object-files.txt | 2 +
projectfile.xsd | 24 +-
reference.xsd | 15 +-
rgb3sx8_to_gs.vhd | 102 +++++
rgb3sx8_to_gs.xml | 27 --
rgb3sx8_to_ycbcr_3DSP.vhd | 337 ++++++++++++++
threshold_extctl.vhd | 77 ++++
toto.xml | 27 --
76 files changed, 3865 insertions(+), 332 deletions(-)
create mode 100644 AbstractInputModifier.cpp
create mode 100644 AbstractInputModifier.h
create mode 100644 DelayInputModifier.cpp
create mode 100644 DelayInputModifier.h
create mode 100755 blast.creator.user.3701e19
create mode 100644 boxfilter_3x3.vhd
create mode 100644 checker.vhd
create mode 100644 deserializer_3x1.vhd
create mode 100644 lib/implementations/boxfilter_3x3_impl.xml
create mode 100644 lib/implementations/checker_impl.xml
create mode 100644 lib/implementations/csvreader_impl.xml
create mode 100644 lib/implementations/deserializer_3x1_impl.xml
create mode 100644 lib/implementations/logical_AND_3_impl.xml
rename rgb3sx8_to_gs_impl.xml => lib/implementations/rgb3sx8_to_gs_impl.xml (58%)
create mode 100644 lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
create mode 100644 lib/implementations/threshold_extctl_impl.xml
create mode 100644 lib/references/boxfilter_3x3.xml
create mode 100644 lib/references/checker.xml
create mode 100644 lib/references/csvreader.xml
create mode 100644 lib/references/deserializer_3x1.xml
create mode 100644 lib/references/logical_AND_3.xml
create mode 100644 lib/references/rgb3sx8_to_gs.xml
create mode 100644 lib/references/rgb3sx8_to_ycbcr_3DSP.xml
create mode 100644 lib/references/threshold_extctl.xml
create mode 100644 logical_AND_3.vhd
create mode 100644 rgb3sx8_to_gs.vhd
delete mode 100644 rgb3sx8_to_gs.xml
create mode 100644 rgb3sx8_to_ycbcr_3DSP.vhd
create mode 100644 threshold_extctl.vhd
delete mode 100644 toto.xml
diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 66c8f37..f551b30 100644
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -234,3 +234,4 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
}
return lst;
}
+
diff --git a/AbstractBlock.h b/AbstractBlock.h
index 2bb2717..80e0413 100644
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -37,11 +37,14 @@ public:
QList<BlockParameter *> getWishboneParameters();
inline AbstractBlock* getParent() { return parent; }
inline bool getPatternComputed() { return patternComputed; }
+ inline int getTraversalLevel() { return traversalLevel; }
// setters
void setName(const QString& str);
virtual void setParent(AbstractBlock* _parent);
inline void setPatternComputed(bool state) { patternComputed = state; }
+ inline void resetTraversalLevel() { traversalLevel = -1; }
+ inline void setTraversalLevel(int level) { traversalLevel = level; }
// testers
virtual bool isReferenceBlock();
@@ -72,6 +75,7 @@ public:
// patterns
virtual void checkInputPatternCompatibility() throw(Exception) = 0;
virtual void computeOutputPattern(int nbExec = -1) throw(Exception) = 0;
+ virtual void computeAdmittanceDelays() throw(Exception) = 0;
protected:
@@ -90,6 +94,7 @@ protected:
// patterns
bool patternComputed;
+ int traversalLevel; // the level (0, 1, ...) during the traversal of the graph
// NB: only GroupBlock and FunctionalBlock have a real parent, except sources that have no parents
AbstractBlock* parent;
diff --git a/AbstractInputModifier.cpp b/AbstractInputModifier.cpp
new file mode 100644
index 0000000..aa9c9a2
--- /dev/null
+++ b/AbstractInputModifier.cpp
@@ -0,0 +1,28 @@
+#include "AbstractInputModifier.h"
+
+AbstractInputModifier::AbstractInputModifier() {
+
+ pattern = new QList<char>();
+}
+
+AbstractInputModifier::~AbstractInputModifier() {
+
+ delete pattern;
+}
+
+bool AbstractInputModifier::isDelay() {
+ return false;
+}
+
+bool AbstractInputModifier::isComplexDelay() {
+ return false;
+}
+
+bool AbstractInputModifier::isFIFO() {
+ return false;
+}
+
+bool AbstractInputModifier::isDecimator() {
+ return false;
+}
+
diff --git a/AbstractInputModifier.h b/AbstractInputModifier.h
new file mode 100644
index 0000000..bbc5bdd
--- /dev/null
+++ b/AbstractInputModifier.h
@@ -0,0 +1,37 @@
+#ifndef __ABSTRACTINPUTMODIFIER_H__
+#define __ABSTRACTINPUTMODIFIER_H__
+
+#include <iostream>
+
+#include <QtCore>
+
+using namespace std;
+using namespace Qt;
+
+class AbstractInputModifier {
+
+public:
+
+ AbstractInputModifier();
+ virtual ~AbstractInputModifier();
+
+ //getters
+ virtual QString getTypeStr() = 0;
+ virtual QString getParametersStr() = 0;
+
+ // setters
+
+ // testers
+ virtual bool isDelay();
+ virtual bool isComplexDelay();
+ virtual bool isFIFO();
+ virtual bool isDecimator();
+
+ // others
+ virtual QList<char>* getModifiedInput(QList<char>* input) = 0;
+
+ protected:
+ QList<char>* pattern; // the pattern modified by this
+};
+
+#endif // __ABSTRACTINPUTMODIFIER_H__
diff --git a/AbstractInterface.cpp b/AbstractInterface.cpp
index 76654ff..c03cba9 100644
--- a/AbstractInterface.cpp
+++ b/AbstractInterface.cpp
@@ -209,15 +209,21 @@ int AbstractInterface::typeFromString(const QString &_type) {
QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
+
if (isReferenceInterface()) throw(Exception(IFACE_INVALID_TYPE));
QString msb = width;
QString ret="";
bool ok;
+ cout << "iface " << qPrintable(name) << " must be evaluated to vhdl :" << qPrintable(msb) << " with type = " << qPrintable(getTypeString()) << endl;
+
if ((context == BlockParameter::Entity) || (context == BlockParameter::Component)) {
QString formatBool = "%1 : %2 std_logic";
- QString formatVector = "%1 : %2 std_logic_vector(%3 downto %4)";
+ QString formatVector = "";
+ if (endianess == LittleEndian) formatVector = "%1 : %2 std_logic_vector(%3 downto %4)";
+ else formatVector = "%1 : %2 std_logic_vector(%4 to %3)";
+
if ((flags & BlockParameter::NoComma) == 0) {
formatBool.append(";");
formatVector.append(";");
@@ -233,7 +239,7 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
orientation = "inout";
}
if (type == Boolean) {
- ret = formatVector.arg(name).arg(orientation);
+ ret = formatBool.arg(name).arg(orientation);
}
else if (type == Natural) {
int w = width.toInt(&ok);
@@ -246,6 +252,8 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
}
}
else if (type == Expression) {
+
+
/* must check the following conditions :
- if it contains user/port parameters : must evaluate their numeric value
- if it contains generic parameters : just remove the $ -> the expression is not arithmetically evaluated.
@@ -255,7 +263,7 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
QList<BlockParameter*> listPorts = owner->getPortParameters();
foreach(BlockParameter* p, listUsers) {
QString var = "$";
- var.append(p->getName());
+ var += p->getName();
if (width.contains(var)) {
int w = p->getValue().toInt(&ok);
if (!ok) throw(Exception(INVALID_VALUE));
@@ -264,18 +272,21 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
}
foreach(BlockParameter* p, listPorts) {
QString var = "$";
- var.append(p->getName());
+ var += p->getName();
+ if (width.contains(var)) {
+ msb.replace(var,p->toVHDL(0,0));
+ }
+ }
+ foreach(BlockParameter* p, listGenerics) {
+ QString var = "$";
+ var += p->getName();
if (width.contains(var)) {
- BlockParameterPort* pp = (BlockParameterPort*)p;
- AbstractInterface* iface = owner->getIfaceFromName(pp->getIfaceName());
-
- int w = p->getValue().toInt(&ok);
- if (!ok) throw(Exception(INVALID_VALUE));
- msb.replace(var,p->getValue().toString());
+ msb.replace(var,p->getName());
}
}
-
- ret = formatVector.arg(name).arg(orientation).arg("toto").arg("0");
+ msb += "-1";
+ cout << "iface size :" << qPrintable(msb) << endl;
+ ret = formatVector.arg(name).arg(orientation).arg(msb).arg("0");
}
}
return ret;
diff --git a/BlockImplementation.cpp b/BlockImplementation.cpp
index b751021..f71297f 100644
--- a/BlockImplementation.cpp
+++ b/BlockImplementation.cpp
@@ -73,20 +73,31 @@ void BlockImplementation::loadPatterns(QDomElement& root) throw(Exception) {
}
bool BlockImplementation::checkPatterns() {
- if (reference == NULL) return false;
+
+
+ if (reference == NULL) {
+ cout << "no ref. while checking patterns of implementation " << endl;
+ return false;
+ }
AbstractInterface* iface;
QHashIterator<QString,QString> iterI(consumptionPattern);
while (iterI.hasNext()) {
iterI.next();
iface = reference->getIfaceFromName(iterI.key());
- if (iface == NULL) return false;
+ if (iface == NULL) {
+ cout << "cannot found an input ref. iface for impl. iface " << qPrintable(iterI.key()) << endl;
+ return false;
+ }
}
QHashIterator<QString,QString> iterO(productionPattern);
while (iterO.hasNext()) {
iterO.next();
iface = reference->getIfaceFromName(iterO.key());
- if (iface == NULL) return false;
+ if (iface == NULL) {
+ cout << "cannot found an output ref. iface for impl. iface " << qPrintable(iterI.key()) << endl;
+ return false;
+ }
}
return true;
}
@@ -215,17 +226,17 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
for(int i = 0; i < listLib.length(); i++) {
QDomNode nodeLib = listLib.item(i);
QDomElement eltLib = nodeLib.toElement();
- QString nameLib = eltLib.attribute("name", "");
+ QString nameLib = eltLib.attribute("name","none");
out << "library " << nameLib << ";\n";
QDomNodeList listPack = eltLib.elementsByTagName("package");
for(int j = 0; j < listPack.length(); j++) {
QDomNode nodePack = listPack.item(j);
QDomElement eltPack = nodePack.toElement();
- QString namePack = eltPack.attribute("name", "");
- QString usePack = elt.attribute("use","");
- out << "use " << nameLib << "." << namePack << "." << usePack << ";\n";
+ QString namePack = eltPack.attribute("name","none");
+ QString usePack = eltPack.attribute("use","none");
+ out << "use " << nameLib << "." << namePack << "." << usePack << endl;
}
- out << "\n";
+ out << endl;
}
}
@@ -233,11 +244,11 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
void BlockImplementation::generateEntity(QTextStream& out, bool hasController) throw(Exception) {
int i=0;
- nameEnt = reference->getName();
+ nameEnt = block->getName();
//QList<BlockParameter*> listParams = reference->getParameters();
- QList<AbstractInterface*> listInputs = reference->getInputs();
- QList<AbstractInterface*> listOutputs = reference->getOutputs();
- QList<AbstractInterface*> listBidirs = reference->getBidirs();
+ QList<AbstractInterface*> listInputs = block->getInputs();
+ QList<AbstractInterface*> listOutputs = block->getOutputs();
+ QList<AbstractInterface*> listBidirs = block->getBidirs();
QString typePort, namePort;
out << "entity " << nameEnt << " is\n";
@@ -246,7 +257,7 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
/* TODO : rewrite the generation to take into acocunt the new object hierarchy */
// Generation of the generics
- QList<BlockParameter*> listGenerics = reference->getGenericParameters();
+ QList<BlockParameter*> listGenerics = block->getGenericParameters();
if ((!listGenerics.isEmpty()) || (hasController)) {
out << " generic (" << endl;
if (hasController) {
@@ -256,9 +267,9 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
out << endl;
}
for(i=0;i<listGenerics.size()-1;i++) {
- out << " " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0);
+ out << " " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
}
- out << " " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma);
+ out << " " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
out << " );" << endl;
}
@@ -267,9 +278,9 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
// Generation of the clk & rst signals
out << " -- clk/rst" << endl;
- for(int i = 0; i < listInputs.size(); i++) {
- if(listInputs.at(i)->getPurpose() == AbstractInterface::Clock || listInputs.at(i)->getPurpose() == AbstractInterface::Reset) {
- out << " " << listInputs.at(i)->getName() << " : in std_logic;" << endl;
+ foreach(AbstractInterface* iface, listInputs) {
+ if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {
+ out << " " << iface->getName() << " : in std_logic;" << endl;
}
}
@@ -278,55 +289,98 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
out << " -- registers r/w via wishbone" << endl;
QList<BlockParameter*> listWB = reference->getWishboneParameters();
for(i=0;i<listWB.size()-1;i++) {
- out << " " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0);
+ out << " " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
}
- out << " " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma);
+ out << " " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
}
- // Generation of the data signals
- out << "-- data ports\n";
- for(int i = 0; i < listInputs.size(); i++) {
- namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listInputs.at(i)->getName()));
- if(listInputs.at(i)->getWidth().compare("1"))
- typePort = "std_logic";
- else
- typePort = calculateWidth(listInputs.at(i)->getWidth());
- if(listInputs.at(i)->getPurpose() == 1)
- out << namePort << " : in std_logic_vector(" << typePort << " -1 downto 0) ;\n";
+ int count = 0;
+ foreach(AbstractInterface* iface, block->getInterfaces()) {
+ if((iface->getPurpose() == AbstractInterface::Data)||(iface->getPurpose() == AbstractInterface::Control)) count++;
}
+ // Generation of the data/control signals
- for(int i = 0; i < listOutputs.size(); i++) {
- namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listOutputs.at(i)->getName()));
- if(listOutputs.at(i)->getWidth().compare("1"))
- typePort = "std_logic";
- else
- typePort = calculateWidth(listOutputs.at(i)->getWidth());
- if(listOutputs.at(i)->getPurpose() == 1)
- out << namePort << " : out std_logic_vector(" << typePort << " -1 downto 0) ;\n";
- }
+ int flag = 0;
+ bool first = true;
- for(int i = 0; i < listBidirs.size(); i++) {
- namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listBidirs.at(i)->getName()));
- if(listBidirs.at(i)->getWidth().compare(("1")))
- typePort = "std_logic";
- else
- typePort = calculateWidth((listBidirs.at(i)->getWidth()));
- if(listBidirs.at(i)->getPurpose() == 1)
- out << namePort << " : inout std_logic_vector(" << typePort << " -1 downto 0) ;\n";
+ foreach(AbstractInterface* iface, listInputs) {
+ if(iface->getPurpose() == AbstractInterface::Data) {
+ if (first) {
+ out << " -- input data ports" << endl;
+ first = false;
+ }
+ count--;
+ if (count == 0) flag = AbstractInterface::NoComma;
+ out << " " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+ }
+ }
+ first = true;
+ foreach(AbstractInterface* iface, listInputs) {
+ if(iface->getPurpose() == AbstractInterface::Control) {
+ if (first) {
+ out << " -- input control ports" << endl;
+ first = false;
+ }
+ count--;
+ if (count == 0) flag = AbstractInterface::NoComma;
+ out << " " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+ }
+ }
+ first = true;
+ foreach(AbstractInterface* iface, listOutputs) {
+ if(iface->getPurpose() == AbstractInterface::Data) {
+ if (first) {
+ out << " -- output data ports" << endl;
+ first = false;
+ }
+ count--;
+ if (count == 0) flag = AbstractInterface::NoComma;
+ out << " " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+ }
+ }
+ first = true;
+ foreach(AbstractInterface* iface, listOutputs) {
+ if(iface->getPurpose() == AbstractInterface::Control) {
+ if (first) {
+ out << " -- output control ports" << endl;
+ first = false;
+ }
+ count--;
+ if (count == 0) flag = AbstractInterface::NoComma;
+ out << " " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+ }
+ }
+ first = true;
+ foreach(AbstractInterface* iface, listBidirs) {
+ if(iface->getPurpose() == AbstractInterface::Data) {
+ if (first) {
+ out << " -- bidirs data ports" << endl;
+ first = false;
+ }
+ count--;
+ if (count == 0) flag = AbstractInterface::NoComma;
+ out << " " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+ }
}
+ out << " );" << endl << endl;
+ out << "end " << nameEnt << ";" << endl << endl;
}
// This function generates the architecture part of the VHDL document
void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& out) throw(Exception) {
QString expr;
- QDomElement eltArch = elt.nextSiblingElement("architecture");
- out << "architecture " << nameEnt <<"_1 of " << nameEnt << "is\n";
- QString implText = eltArch.text();
- QStringList listLine = implText.split("\n");
+ QString code = elt.text();
+ cout << qPrintable(code) << endl;
+ out << "architecture rtl of " << nameEnt << " is" << endl;
+
+ QStringList listLine = code.split("\n");
for(int i =0; i < listLine.size(); i++) {
- if(listLine.at(i).contains(QRegularExpression("@foreach{")) != -1) {
+ QString line = listLine.at(i).simplified();
+
+ /*
+ if(listLine.at(i).contains(QRegularExpression("@foreach{"))) {
while(listLine.at(i).compare("@endforeach") != -1) {
expr = expr + listLine.at(i) + '\n';
i++;
@@ -334,7 +388,7 @@ void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& ou
expr = expr + listLine.at(i);
out << evalComplex(expr, 1) << '\n';
}
- if(listLine.at(i).contains(QRegularExpression("@caseeach{")) != -1) {
+ if(listLine.at(i).contains(QRegularExpression("@caseeach{"))) {
while(listLine.at(i).compare("@endcaseeach") != -1) {
expr = expr + listLine.at(i) + '\n';
i++;
@@ -342,11 +396,10 @@ void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& ou
expr = expr + listLine.at(i);
out << evalComplex(expr, 2) << '\n';
}
-
- if(listLine.at(i).contains('@') == -1)
- out << listLine.at(i) << "\n";
- else
- out << eval(listLine.at(i), out) << "\n";
+*/
+ if(line.contains("@{")) {
+ out << line << endl;
+ }
}
}
diff --git a/BlockImplementation.h b/BlockImplementation.h
index 4866e85..ad50a6a 100644
--- a/BlockImplementation.h
+++ b/BlockImplementation.h
@@ -37,6 +37,10 @@ public:
inline QHash<QString,QString> getProductionPattern() { return productionPattern; }
inline QString getProductionCounter() { return productionCounter; }
// setters
+ inline void setDelta(QString _delta) { delta = _delta; }
+ inline void setConsumptionPattern(QHash<QString,QString> pattern) { consumptionPattern = pattern; }
+ inline void setProductionPattern(QHash<QString,QString> pattern) { productionPattern = pattern; }
+ inline void setProductionCounter(QString pattern) { productionCounter = pattern; }
QString eval(QString line, QTextStream& out);
QString evalComplex(QString line, int num);
diff --git a/BlockLibraryTree.cpp b/BlockLibraryTree.cpp
index 33980f9..2c9b365 100644
--- a/BlockLibraryTree.cpp
+++ b/BlockLibraryTree.cpp
@@ -1,8 +1,6 @@
#include "BlockLibraryTree.h"
-BlockLibraryTree::BlockLibraryTree() {
- tabCategories = NULL;
- tabIdParent = NULL;
+BlockLibraryTree::BlockLibraryTree() {
nbCategories = 0;
}
@@ -14,8 +12,7 @@ void BlockLibraryTree::clear() {
for(int i=0;i<nbCategories;i++) {
delete tabCategories[i];
- }
- delete [] tabCategories;
+ }
nbCategories = 0;
}
@@ -25,7 +22,7 @@ void BlockLibraryTree::clearBlocks() {
tabCategories[i]->blocks.clear();
}
}
-
+/*
void BlockLibraryTree::addItem(QXmlAttributes &attributes)
{
nbCategories++;
@@ -51,15 +48,22 @@ void BlockLibraryTree::addItem(QXmlAttributes &attributes)
tabCategories[id] = cat;
tabIdParent[id] = idParent;
}
-
-bool BlockLibraryTree::initChildParent()
-{
+*/
+bool BlockLibraryTree::initChildParent() {
// initializing parent/childs
+ bool ok;
for(int i=0;i<nbCategories;i++) {
- if (tabIdParent[i] != -1) {
- if (tabIdParent[i] >= nbCategories) return false;
- tabCategories[i]->setParent(tabCategories[tabIdParent[i]]);
- tabCategories[tabIdParent[i]]->addChild(tabCategories[i]);
+ if (tabIdParent[i] >= 0) {
+ ok = false;
+ foreach (BlockCategory* cat, tabCategories) {
+ if (cat->getId() == tabIdParent[i]) {
+ tabCategories[i]->setParent(cat);
+ cat->addChild(tabCategories[i]);
+ ok = true;
+ break;
+ }
+ }
+ if (!ok) return false;
}
}
return true;
@@ -79,20 +83,15 @@ void BlockLibraryTree::load(QDomElement &elt) throw(Exception) {
if (elt.tagName() != "categories") throw(Exception(CONFIGFILE_CORRUPTED));
- QString nbStr = elt.attribute("nb","none");
bool ok;
- int nb = nbStr.toInt(&ok);
QDomNodeList list = elt.elementsByTagName("category");
nbCategories = list.size();
- if (nb != nbCategories) throw(Exception(CONFIGFILE_CORRUPTED));
QString name;
int id;
QString idStr;
int idParent;
QString idParentStr;
- tabCategories = new BlockCategory* [nbCategories];
- tabIdParent = new int[nbCategories];
BlockCategory* cat = NULL;
// creating all BlockCategory objects
@@ -103,35 +102,31 @@ void BlockLibraryTree::load(QDomElement &elt) throw(Exception) {
idStr = e.attribute("id","none");
idParentStr = e.attribute("parent","none");
id = idStr.toInt(&ok);
- if ((!ok) || (id < 0) || (id >= nbCategories)) throw(Exception(CONFIGFILE_CORRUPTED));
+ if ((!ok) || (id < 0) || (id >= 100)) throw(Exception(CONFIGFILE_CORRUPTED));
idParent = idParentStr.toInt(&ok);
- if ((!ok)|| (idParent < -1) || (idParent >= nbCategories)) throw(Exception(CONFIGFILE_CORRUPTED));
+ if ((!ok)|| (idParent < -1) || (idParent >= 100)) throw(Exception(CONFIGFILE_CORRUPTED));
cat = new BlockCategory(name,id);
- tabCategories[id] = cat;
- tabIdParent[id] = idParent;
+ tabCategories.append(cat);
+ tabIdParent.append(idParent);
}
+ cat = new BlockCategory("hidden",100);
+ tabCategories.append(cat);
+ tabIdParent.append(0);
ok = initChildParent();
- delete [] tabIdParent;
+
if (!ok) throw(Exception(CONFIGFILE_CORRUPTED));
}
BlockCategory* BlockLibraryTree::searchCategory(int id) {
- if (tabCategories != NULL) {
- if ((id>=0) && (id < nbCategories)) {
- return tabCategories[id];
- }
+ foreach(BlockCategory* cat, tabCategories) {
+ if (cat->getId() == id) return cat;
}
-
return NULL;
}
BlockCategory *BlockLibraryTree::getRoot() {
- if (tabCategories != NULL) {
- if (nbCategories > 0) {
- return tabCategories[0];
- }
- }
- return NULL;
+
+ return searchCategory(0);
}
diff --git a/BlockLibraryTree.h b/BlockLibraryTree.h
index f8fa60c..880fd17 100644
--- a/BlockLibraryTree.h
+++ b/BlockLibraryTree.h
@@ -40,8 +40,8 @@ private:
The root of the tree is in fact tabCategories[0]
*/
- BlockCategory** tabCategories;
- int* tabIdParent;
+ QList<BlockCategory*> tabCategories;
+ QList<int> tabIdParent;
int nbCategories;
};
diff --git a/BlockLibraryWidget.cpp b/BlockLibraryWidget.cpp
index 544a1d1..0d2636d 100644
--- a/BlockLibraryWidget.cpp
+++ b/BlockLibraryWidget.cpp
@@ -50,17 +50,20 @@ void BlockLibraryWidget::addChild(BlockCategory *catParent,QTreeWidgetItem* item
QList<BlockCategory *> childs = catParent->getAllChilds();
foreach(BlockCategory* cat, childs){
- newItemCat = new QTreeWidgetItem(itemParent);
- newItemCat->setData(0,Qt::DisplayRole, cat->getName());
- QList<ReferenceBlock*> list = cat->getBlocks();
- for(int i=0; i<list.length(); i++){
- newItemBlock = new QTreeWidgetItem(newItemCat);
- newItemBlock->setData(0,Qt::DisplayRole, list.at(i)->getName());
- newItemBlock->setData(1,Qt::DisplayRole, cat->getId());
- newItemBlock->setData(2,Qt::DisplayRole, i);
- newItemBlock->setIcon(0,QIcon("icons/window_new.png"));
+
+ if (cat->getId()<100) {
+ newItemCat = new QTreeWidgetItem(itemParent);
+ newItemCat->setData(0,Qt::DisplayRole, cat->getName());
+ QList<ReferenceBlock*> list = cat->getBlocks();
+ for(int i=0; i<list.length(); i++){
+ newItemBlock = new QTreeWidgetItem(newItemCat);
+ newItemBlock->setData(0,Qt::DisplayRole, list.at(i)->getName());
+ newItemBlock->setData(1,Qt::DisplayRole, cat->getId());
+ newItemBlock->setData(2,Qt::DisplayRole, i);
+ newItemBlock->setIcon(0,QIcon("icons/window_new.png"));
+ }
+ addChild(cat,newItemCat);
}
- addChild(cat,newItemCat);
}
/* TO DO :
- getting the childs of catParent
diff --git a/BlockParameter.cpp b/BlockParameter.cpp
index 6207148..b4fce09 100644
--- a/BlockParameter.cpp
+++ b/BlockParameter.cpp
@@ -42,7 +42,7 @@ int BlockParameter::getIntValue(bool* ok) {
double BlockParameter::getDoubleValue(bool* ok) {
if ((type == Real) || (type == Natural) || (type == Positive) || (type == Integer)) {
- *ok = true;
+ *ok = true;
return getValue().toDouble();
}
*ok = false;
diff --git a/BlockParameter.h b/BlockParameter.h
index e8068d4..15df2d8 100644
--- a/BlockParameter.h
+++ b/BlockParameter.h
@@ -46,7 +46,7 @@ public :
virtual QVariant getValue(); // may be overriden
int getIntValue(bool* ok);
double getDoubleValue(bool* ok);
- bool getBooleanValue(bool* ok);
+ bool getBooleanValue(bool* ok);
QString getStringValue();
virtual QString getContext() = 0;
diff --git a/BlockParameterGeneric.cpp b/BlockParameterGeneric.cpp
index 5b15eb9..5b694fc 100644
--- a/BlockParameterGeneric.cpp
+++ b/BlockParameterGeneric.cpp
@@ -57,13 +57,13 @@ QString BlockParameterGeneric::toVHDL(int context, int flags) {
}
if (!userValue.isNull()) {
- ret = formatValue.arg(name).arg(type).arg(userValue.toString());
+ ret = formatValue.arg(name).arg(getTypeString()).arg(userValue.toString());
}
else if (!defaultValue.isNull()) {
- ret = formatValue.arg(name).arg(type).arg(defaultValue.toString());
+ ret = formatValue.arg(name).arg(getTypeString()).arg(defaultValue.toString());
}
else {
- ret = formatNoValue.arg(name).arg(type);
+ ret = formatNoValue.arg(name).arg(getTypeString());
}
}
else if (context == BlockParameter::Architecture) {
diff --git a/BoxItem.cpp b/BoxItem.cpp
index 53d56ec..34b567a 100644
--- a/BoxItem.cpp
+++ b/BoxItem.cpp
@@ -514,6 +514,9 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
QAction* showWishboneIface = NULL;
QAction* showParameters = NULL;
QAction* showPatterns = NULL;
+ QAction* showModifier = NULL;
+ QAction* removeModifier = NULL;
+ QAction* generateVHDL = NULL;
InterfaceItem* ifaceItem = getInterfaceItemFromCursor(event->pos().x(), event->pos().y());
// menu for interface
@@ -560,9 +563,22 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
}
}
}
- if ((iface->getAssociatedIface() != NULL) && (iface->getDirection() == AbstractInterface::Output)) {
- showPatterns = menu.addAction("Show patterns");
+ if (iface->getAssociatedIface() != NULL) {
+ if (iface->getDirection() == AbstractInterface::Output) {
+ showPatterns = menu.addAction("Show output pattern");
+ }
+ else if (iface->getDirection() == AbstractInterface::Input) {
+ showPatterns = menu.addAction("Show input pattern");
+ }
+ }
+
+ if (iface->getInputModifier() != NULL) {
+ removeModifier = menu.addAction("Remove input modifier");
+ }
+ if (iface->getInputModifier() != NULL) {
+ showModifier = menu.addAction("Show input modifier parameters");
}
+
}
// menu for blocks (group or func)
else {
@@ -588,6 +604,7 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
showWishboneIface->setChecked(wishboneVisible);
}
removeAction = menu.addAction("Remove");
+ generateVHDL = menu.addAction("Generate VHDL");
}
QAction* selectedAction = NULL;
@@ -643,6 +660,16 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
else if(selectedAction == showPatterns) {
dispatcher->showPatterns(ifaceItem);
}
+ else if(selectedAction == removeModifier) {
+ dispatcher->removeModifier(ifaceItem);
+ }
+ else if(selectedAction == showModifier) {
+ dispatcher->showModifier(ifaceItem);
+ }
+ else if(selectedAction == generateVHDL) {
+ dispatcher->generateBlockVHDL(this);
+ }
+
}
void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
@@ -703,6 +730,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
*/
functionalBlock->setName(name);
setRefBlock(functionalBlock);
+ params->blockToItem.insert(functionalBlock,this);
setPos(posX,posY);
setDimension(dimX,dimY);
diff --git a/ConnectedInterface.cpp b/ConnectedInterface.cpp
index 017401a..3724417 100644
--- a/ConnectedInterface.cpp
+++ b/ConnectedInterface.cpp
@@ -7,15 +7,17 @@
ConnectedInterface::ConnectedInterface(AbstractBlock* _owner) : AbstractInterface(_owner) {
connectedFrom = NULL;
outputPattern = NULL;
+ inputModifier = NULL;
}
ConnectedInterface::ConnectedInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose, const QString& _type, const QString& _width) : AbstractInterface(_owner, _name, _direction, _purpose, _type, _width) {
- connectedFrom = NULL;
+ connectedFrom = NULL;
outputPattern = NULL;
+ inputModifier = NULL;
}
-ConnectedInterface::~ConnectedInterface() {
+ConnectedInterface::~ConnectedInterface() {
if (outputPattern != NULL) delete outputPattern;
}
@@ -39,6 +41,7 @@ void ConnectedInterface::setOutputPattern(QList<char>* pattern) {
if (outputPattern != NULL) delete outputPattern;
outputPattern = pattern;
}
+
void ConnectedInterface::connectTo(ConnectedInterface *iface) {
connectedTo.append(iface);
@@ -97,3 +100,8 @@ ConnectedInterface *ConnectedInterface::getConnectionFromParentGroup() {
}
return NULL;
}
+
+void ConnectedInterface::clearInputModifier() {
+ if (inputModifier != NULL) delete inputModifier;
+ inputModifier = NULL;
+}
diff --git a/ConnectedInterface.h b/ConnectedInterface.h
index 64afb9e..f0a36a4 100644
--- a/ConnectedInterface.h
+++ b/ConnectedInterface.h
@@ -8,6 +8,8 @@
#include "AbstractInterface.h"
class ReferenceInterface;
+#include "AbstractInputModifier.h"
+
#include "Exception.h"
@@ -28,14 +30,17 @@ public :
// getters
inline QList<ConnectedInterface*> getConnectedTo() { return connectedTo;}
- inline ConnectedInterface* getConnectedFrom() { return connectedFrom;}
- inline QList<char>* getOutputPattern() { return outputPattern; }
+ inline ConnectedInterface* getConnectedFrom() { return connectedFrom;}
+ inline QList<char>* getOutputPattern() { return outputPattern; }
+ inline AbstractInputModifier* getInputModifier() { return inputModifier; }
- // setters
+ // setters
void setOutputPattern(QList<char>* pattern);
+ inline void setInputModifier(AbstractInputModifier* mod) { inputModifier = mod; }
// testers
inline bool isConnectedTo(){return connectedTo.length() != 0;}
+ inline bool isConnectedToMany(){return connectedTo.length()>=2;}
inline bool isConnectedFrom(){return connectedFrom != NULL;}
virtual bool canConnectTo(AbstractInterface* iface) = 0;
virtual bool canConnectFrom(AbstractInterface* iface) = 0;
@@ -46,6 +51,7 @@ public :
//bool connectFrom(ConnectedInterface* iface);
ConnectedInterface* getConnectionToParentGroup();
ConnectedInterface* getConnectionFromParentGroup();
+ void clearInputModifier();
virtual AbstractInterface *clone() = 0;
//void removeConnectedTo(ConnectedInterface *inter);
@@ -70,8 +76,9 @@ protected:
* this interface. connecteFrom references such an interface if it exists.
*/
ConnectedInterface* connectedFrom;
-
- // patterns
+ AbstractInputModifier* inputModifier; // if needed, represent a block taht does not appear on screen but taht will modify the stream.
+
+ // patterns
QList<char>* outputPattern; //! only usefull for output interfaces
};
diff --git a/ConnectionItem.cpp b/ConnectionItem.cpp
index 5dcd338..4de86cb 100644
--- a/ConnectionItem.cpp
+++ b/ConnectionItem.cpp
@@ -876,18 +876,22 @@ void ConnectionItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
/* have to check if the connection can be removed.
If the from or to InterfaceItem is owned by a group item, and this item
is both connected to and from, thus it is impossible to remove this connection
+ because there would be a group interface alone and not connected and this situation is not allowed.
+
+ Nevertheless, there are 2 exceptions :
+ - a from group interface is connected to more than one input interface
+ - the connection is between a source block outside the top group and the top group
*/
bool canRemove = true;
- InterfaceItem* groupIfaceItem = NULL;
+
if (fromInterfaceItem->getOwner()->isGroupItem()) {
- groupIfaceItem = fromInterfaceItem;
- }
- else if (toInterfaceItem->getOwner()->isGroupItem()) {
- groupIfaceItem = toInterfaceItem;
+ ConnectedInterface* ref = fromInterfaceItem->refInter;
+ if ((ref->isConnectedFrom()) && (ref->getConnectedTo().length() == 1)) {
+ canRemove = false;
+ }
}
-
- if (groupIfaceItem != NULL) {
- ConnectedInterface* ref = groupIfaceItem->refInter;
+ else if ((toInterfaceItem->getOwner()->isGroupItem()) && (! toInterfaceItem->getOwner()->getRefBlock()->isTopGroupBlock())) {
+ ConnectedInterface* ref = toInterfaceItem->refInter;
if ((ref->isConnectedFrom()) && (ref->isConnectedTo())) {
canRemove = false;
}
diff --git a/DelayInputModifier.cpp b/DelayInputModifier.cpp
new file mode 100644
index 0000000..a35aa21
--- /dev/null
+++ b/DelayInputModifier.cpp
@@ -0,0 +1,30 @@
+#include "DelayInputModifier.h"
+
+DelayInputModifier::DelayInputModifier(int _delayLength) : AbstractInputModifier() {
+ setDelayLength(_delayLength);
+}
+
+void DelayInputModifier::setDelayLength(int _delayLength) {
+ if (_delayLength < 1) _delayLength = 1;
+ delayLength = _delayLength;
+}
+
+QList<char>* DelayInputModifier::getModifiedInput(QList<char>* input) {
+
+ pattern->clear();
+ for(int i=0;i<delayLength;i++) pattern->append(0);
+ pattern->append(*input);
+ return pattern;
+}
+
+QString DelayInputModifier::getTypeStr() {
+ return "delay";
+}
+
+QString DelayInputModifier::getParametersStr() {
+ return QString::number(delayLength);
+}
+
+bool DelayInputModifier::isDelay() {
+ return true;
+}
diff --git a/DelayInputModifier.h b/DelayInputModifier.h
new file mode 100644
index 0000000..1fda2ec
--- /dev/null
+++ b/DelayInputModifier.h
@@ -0,0 +1,33 @@
+#ifndef __DELAYINPUTMODIFIER_H__
+#define __DELAYINPUTMODIFIER_H__
+
+#include <iostream>
+#include <QtCore>
+
+#include "AbstractInputModifier.h"
+using namespace std;
+using namespace Qt;
+
+class DelayInputModifier : public AbstractInputModifier {
+
+public:
+
+ DelayInputModifier(int _delayLength = 1);
+ // getters
+ inline int getDelayLength() { return delayLength; }
+ // setters
+ void setDelayLength(int _delayLength);
+ // testers
+ bool isDelay();
+
+ // others
+ QList<char>* getModifiedInput(QList<char>* input);
+
+ QString getTypeStr();
+ QString getParametersStr();
+
+private:
+ int delayLength;
+};
+
+#endif // __DELAYINPUTMODIFIER_H__
diff --git a/Dispatcher.cpp b/Dispatcher.cpp
index a416f95..a552f20 100644
--- a/Dispatcher.cpp
+++ b/Dispatcher.cpp
@@ -23,6 +23,10 @@
#include "BlockLibraryWidget.h"
#include "BlockLibraryTree.h"
+#include "AbstractInputModifier.h"
+#include "DelayInputModifier.h"
+
+
#include "InterfacePropertiesWindow.h"
int Dispatcher::sceneCounter = 0;
@@ -167,6 +171,25 @@ void Dispatcher::changeConnectionMode(int mode){
*/
}
+void Dispatcher::generateBlockVHDL(BoxItem *item){
+ static QString fctName = "Dispatcher::generateBlockVHDL()";
+#ifdef DEBUG_FCTNAME
+ cout << "call to " << qPrintable(fctName) << endl;
+#endif
+
+ if (item->getRefBlock()->isFunctionalBlock()) {
+ FunctionalBlock* block = AB_TO_FUN(item->getRefBlock());
+ ReferenceBlock* ref = block->getReference();
+ BlockImplementation* impl = ref->getImplementations().at(0);
+ try {
+ impl->generateVHDL(block,"/home/sdomas/");
+ }
+ catch(Exception e) {
+ cout << qPrintable(e.getMessage()) << endl;
+ }
+ }
+}
+
void Dispatcher::renameFunctionalBlock(BoxItem *item){
static QString fctName = "Dispatcher::renameFunctionalBlock()";
#ifdef DEBUG_FCTNAME
@@ -341,13 +364,67 @@ void Dispatcher::showPatterns(InterfaceItem *item) {
#ifdef DEBUG_FCTNAME
cout << "call to " << qPrintable(fctName) << endl;
#endif
- ConnectedInterface* iface = AI_TO_CON(item->refInter->getAssociatedIface());
- foreach(char c, *(iface->getOutputPattern())) {
- cout << (int)c;
+ QString msg = "";
+ if (item->refInter->getDirection() == AbstractInterface::Input) {
+ msg = "Input pattern of iface ";
+ msg += item->refInter->getName();
+ msg += " owned by ";
+ msg += item->refInter->getOwner()->getName();
+ msg += " is:\n";
+ ConnectedInterface* iface = AI_TO_CON(item->refInter->getAssociatedIface());
+ ConnectedInterface* fromIface = iface->getConnectedFrom();
+ if (fromIface->getOutputPattern() == NULL) return;
+ foreach(char c, *(fromIface->getOutputPattern())) {
+ msg += QString::number((int)c);
+ }
+ msg += "\n";
+ }
+ else if (item->refInter->getDirection() == AbstractInterface::Output) {
+ msg = "Output pattern of iface ";
+ msg += item->refInter->getName();
+ msg += " owned by ";
+ msg += item->refInter->getOwner()->getName();
+ msg += " is:\n";
+ ConnectedInterface* iface = AI_TO_CON(item->refInter->getAssociatedIface());
+ if (iface->getOutputPattern() == NULL) return;
+ foreach(char c, *(iface->getOutputPattern())) {
+ msg += QString::number((int)c);
+ }
+ msg += "\n";
+ }
+ QMessageBox::information(NULL,"Interface pattern",msg,QMessageBox::Ok,QMessageBox::Ok);
+}
+
+void Dispatcher::showModifier(InterfaceItem *item) {
+ static QString fctName = "Dispatcher::showModifier()";
+#ifdef DEBUG_FCTNAME
+ cout << "call to " << qPrintable(fctName) << endl;
+#endif
+ QString msg = "";
+ AbstractInputModifier* mod = item->refInter->getInputModifier();
+ if (mod->isDelay()) {
+ DelayInputModifier* delay = (DelayInputModifier *)mod;
+ msg = "Pattern of iface ";
+ msg += item->refInter->getName();
+ msg += " owned by ";
+ msg += item->refInter->getOwner()->getName();
+ msg += " is modified by a simple delay of ";
+ msg += QString::number(delay->getDelayLength());
+
}
- cout << endl;
+ QMessageBox::information(NULL,"Interface pattern",msg,QMessageBox::Ok,QMessageBox::Ok);
}
+void Dispatcher::removeModifier(InterfaceItem *item) {
+ static QString fctName = "Dispatcher::showModifier()";
+#ifdef DEBUG_FCTNAME
+ cout << "call to " << qPrintable(fctName) << endl;
+#endif
+
+ item->refInter->clearInputModifier();
+}
+
+
void Dispatcher::duplicateBoxItem(BoxItem *item){
static QString fctName = "Dispatcher::duplicateBoxItem()";
#ifdef DEBUG_FCTNAME
@@ -430,12 +507,13 @@ void Dispatcher::duplicateInterfaceItem(InterfaceItem *item) {
}
-void Dispatcher::addBlock(int idCategory, int idBlock, int idScene) {
+BoxItem* Dispatcher::addBlock(int idCategory, int idBlock, int idScene) {
static QString fctName = "Dispatcher::addBlock()";
#ifdef DEBUG_FCTNAME
cout << "call to " << qPrintable(fctName) << endl;
#endif
bool newSource = false;
+ BoxItem* item = NULL;
GroupScene *scene = getSceneById(idScene);
ReferenceBlock* ref = params->getReferenceBlock(idCategory,idBlock);
// if block has no inputs, propose to add it as a source to top scene
@@ -452,9 +530,11 @@ void Dispatcher::addBlock(int idCategory, int idBlock, int idScene) {
else {
GroupBlock* group = AB_TO_GRP(scene->getGroupItem()->getRefBlock());
FunctionalBlock* newOne = params->getGraph()->createFunctionalBlock(group, ref);
- scene->createBoxItem(newOne);
+ item = scene->createBoxItem(newOne);
+ params->blockToItem.insert(newOne,item);
}
params->unsaveModif = true;
+ return item;
}
@@ -482,6 +562,7 @@ GroupWidget *Dispatcher::createTopScene(){
// creating the view part of the group
GroupItem *group = new GroupItem(NULL,refBlock,this,params);
+
// adding the fake interface to the top group item
//InterfaceItem* item = new InterfaceItem(0.0 , Parameters::West, (ConnectedInterface*)iface, group, params);
//group->addInterface(item,true);
@@ -531,6 +612,7 @@ GroupWidget *Dispatcher::createChildScene(GroupWidget* parentWidget, BoxItem *up
GroupBlock* groupBlock = AB_TO_GRP(upperItemOfGroupItem->getRefBlock());
// creating the view part of the group
GroupItem *groupItem = new GroupItem(upperItemOfGroupItem,groupBlock,this,params);
+
// creating the group widget
group = new GroupWidget(parentWidget, this, params);
// getting the newly created scene
@@ -834,6 +916,8 @@ void Dispatcher::removeBoxItem(BoxItem *item) {
FunctionalBlock* block = AB_TO_FUN(item->getRefBlock());
item->getScene()->removeBoxItem(item);
params->getGraph()->removeFunctionalBlock(block);
+ params->blockToItem.remove(block);
+
}
else if (item->getRefBlock()->isGroupBlock()) {
@@ -1114,3 +1198,31 @@ InterfaceItem* Dispatcher::getInterfaceItemById(int id) {
return NULL;
}
+void Dispatcher::findGraphModifications(FunctionalBlock *block) {
+ static QString fctName = "Dispatcher::findGraphModifications()";
+#ifdef DEBUG_FCTNAME
+ cout << "call to " << qPrintable(fctName) << endl;
+#endif
+
+ block->computeAdmittanceDelays();
+ // get the block item that is associated to block
+ BoxItem* toBlockItem = params->blockToItem.value(block);
+
+ /* VERSION 1: just add delays if needed */
+ QMap<AbstractInterface*,QList<int>* > delays = block->getAdmittanceDelays();
+ QMapIterator<AbstractInterface*,QList<int>* > iterD(delays);
+ while (iterD.hasNext()) {
+ iterD.next();
+ QList<int>* delay = iterD.value();
+ if (delay->at(0) > 0) {
+ // create delay and associate it to the connected input
+ AbstractInputModifier* mod = new DelayInputModifier(delay->at(0));
+ ConnectedInterface* toIface = AI_TO_CON(iterD.key()->getAssociatedIface());
+ cout << "modify input of " << qPrintable(toIface->getName()) << endl;
+ toIface->setInputModifier(mod);
+ // repaint
+ toBlockItem->update();
+ }
+ }
+}
+
diff --git a/Dispatcher.h b/Dispatcher.h
index 75583d4..ae4cc64 100644
--- a/Dispatcher.h
+++ b/Dispatcher.h
@@ -68,18 +68,20 @@ public slots:
BoxItem* getBoxItemById(int id);
GroupItem* getGroupItemById(int id);
InterfaceItem* getInterfaceItemById(int id);
-
+
// block ops
- void addBlock(int idCategory, int idBlock, int idScene);
+ BoxItem* addBlock(int idCategory, int idBlock, int idScene);
void removeBoxItem(BoxItem* item);
void duplicateBoxItem(BoxItem* item);
void renameFunctionalBlock(BoxItem* item);
+ void generateBlockVHDL(BoxItem* item);
void renameGroupBlock(GroupItem* item);
void renameSourceBlock(SourceItem* item);
void removeSourceItem(SourceItem* item);
void duplicateSourceItem(SourceItem* item);
+
// interface ops
/*!
* \brief connectInterToGroup
@@ -113,6 +115,8 @@ public slots:
void showProperties(InterfaceItem *inter);
void renameInterface(InterfaceItem* item);
void showPatterns(InterfaceItem* item);
+ void showModifier(InterfaceItem* item);
+ void removeModifier(InterfaceItem* item);
// connection ops
bool createConnection(InterfaceItem *iface1, InterfaceItem *iface2);
@@ -120,6 +124,9 @@ public slots:
void removeConnection(ConnectionItem *conn);
+ // analysis ops
+ void findGraphModifications(FunctionalBlock* block); // find modif so that block has compatible inputs
+
// others
void showBlocksLibrary();
diff --git a/Exception.cpp b/Exception.cpp
index 4036dac..9592e4d 100644
--- a/Exception.cpp
+++ b/Exception.cpp
@@ -1,14 +1,16 @@
#include "Exception.h"
-Exception::Exception(int _id) {
+Exception::Exception(int _id, void *_source) {
id = _id;
message = getDefaultMessage();
+ source = _source;
}
Exception::Exception(const Exception& other) {
id = other.id;
message = other.message;
+ source = other.source;
}
QString Exception::getDefaultMessage() {
@@ -51,6 +53,7 @@ QString Exception::getDefaultMessage() {
case IP_AP_NOTCOMPAT : ret = tr("IP and AP not compatible"); break;
case IP_END_NULLCOL : ret = tr("IP ends with anull column (normally not possible during compat. check)"); break;
case AP_TOO_SHORT : ret = tr("AP has been badly computed, leading to a AP shorter than needed (NB: it is an abnormal case)"); break;
+ case IFACE_NOT_CONNECTED : ret = tr("an interface with control is not coonected, leading to an impossible graph analysis"); break;
}
return ret;
diff --git a/Exception.h b/Exception.h
index ce2ea72..e45e7bb 100644
--- a/Exception.h
+++ b/Exception.h
@@ -61,7 +61,8 @@ supp. infos : saved in UTF-8 [éè]
// exception for patterns
#define INVALID_REFBLOCK_USE 10001
-#define INVALID_DELTA_CP 10002 // delta and CP are not consistent (NB: used during admittance computation)
+#define INVALID_GROUPBLOCK_USE 10002
+#define INVALID_DELTA_CP 10003 // delta and CP are not consistent (NB: used during admittance computation)
#define EVAL_PARAM_UNKNOWN 10101 // a variable used in an expression is not defined as a block parameter
#define EVAL_PARAM_NOVALUE 10102 // can't get the double value of a block parameter
@@ -81,6 +82,7 @@ supp. infos : saved in UTF-8 [éè]
#define IP_END_NULLCOL 10503 // IP ends with anull column (normally not possible during compat. check)
#define AP_TOO_SHORT 10504 // AP has been badly computed, leading to a AP shorter than needed (NB: it is an abnormal case)
+#define IFACE_NOT_CONNECTED 10601 // an interface with control is not connected => impossible to analyz the graph
using namespace std;
using namespace Qt;
@@ -89,17 +91,19 @@ class Exception : public QObject {
public:
- Exception(int _id);
+ Exception(int _id, void* _source = NULL);
Exception(const Exception& other);
inline int getType() { return id; }
inline void setMessage(QString _message) { message = _message; }
inline QString getMessage() { return message; }
QString getDefaultMessage();
+ inline void* getSource() { return source; }
private:
int id;
QString message;
+ void* source;
};
diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 7be000a..91f4e03 100644
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -184,6 +184,9 @@ void FunctionalBlock::createConsumptionPattern() throw(Exception) {
cout << "call to " << qPrintable(fctName) << endl;
#endif
+ // first clear if already exists
+ clearConsumptionPattern();
+
lengthCP = -1;
QHash<QString,QString> consPattern = implementation->getConsumptionPattern();
@@ -191,7 +194,7 @@ void FunctionalBlock::createConsumptionPattern() throw(Exception) {
FunctionalInterface* connIface = AI_TO_FUN(iface);
QString refName = connIface->getReference()->getName();
if (! consPattern.contains(refName)) {
- throw(Exception(NO_IFACE_CP));
+ throw(Exception(NO_IFACE_CP,this));
cerr << "no consumption pattern for reference interface " << qPrintable(refName) << endl;
}
QList<char>* pattern = NULL;
@@ -207,7 +210,7 @@ void FunctionalBlock::createConsumptionPattern() throw(Exception) {
}
else {
if (pattern->size() != lengthCP) {
- throw(Exception(INVALID_IFACE_CP_LENGTH));
+ throw(Exception(INVALID_IFACE_CP_LENGTH,this));
}
}
}
@@ -218,6 +221,9 @@ void FunctionalBlock::createProductionPattern() throw(Exception){
#ifdef DEBUG_FCTNAME
cout << "call to " << qPrintable(fctName) << endl;
#endif
+
+ // first clear if already exists
+ clearProductionPattern();
lengthPP = -1;
QHash<QString,QString> prodPattern = implementation->getProductionPattern();
@@ -226,7 +232,7 @@ void FunctionalBlock::createProductionPattern() throw(Exception){
FunctionalInterface* connIface = AI_TO_FUN(iface);
QString refName = connIface->getReference()->getName();
if (! prodPattern.contains(refName)) {
- throw(Exception(NO_IFACE_PP));
+ throw(Exception(NO_IFACE_PP,this));
}
QList<char>* pattern = NULL;
try {
@@ -241,7 +247,7 @@ void FunctionalBlock::createProductionPattern() throw(Exception){
}
else {
if (pattern->size() != lengthPP) {
- throw(Exception(INVALID_IFACE_PP_LENGTH));
+ throw(Exception(INVALID_IFACE_PP_LENGTH,this));
}
}
}
@@ -252,6 +258,10 @@ void FunctionalBlock::createProductionCounter() throw(Exception) {
#ifdef DEBUG_FCTNAME
cout << "call to " << qPrintable(fctName) << endl;
#endif
+
+ // first clear if already exists
+ productionCounter.clear();
+
QStringList counterParts = implementation->getProductionCounter().split(",");
foreach(QString s, counterParts) {
@@ -266,7 +276,7 @@ void FunctionalBlock::createProductionCounter() throw(Exception) {
s.chop(1);
QStringList gen = s.split(":");
if (gen.size() != 3) {
- throw(Exception(INVALID_IFACE_PC));
+ throw(Exception(INVALID_IFACE_PC,this));
}
int start = 0;
int nb = 0;
@@ -309,9 +319,21 @@ QList<char>* FunctionalBlock::expandPattern(const QString& patternIn) throw(Exce
#ifdef DEBUG_FCTNAME
cout << "call to " << qPrintable(fctName) << endl;
#endif
-
- QList<char> lst;
- QString p = patternIn;
+ /* expanding a pattern is done in two steps :
+ - 1 : finding all variables that correspond to an expression
+ and copy them in the pattern
+ - 2 : parsing the result
+
+ Note that the result MUST contain only variables that have a
+ integer/double value. Otherwise, expanding will fail.
+
+ */
+
+ // first step.
+
+ QString p = replaceExpressions(patternIn);
+
+ QList<char> lst;
p.append(')');
int offset = 0;
QList<char>* patternOut = new QList<char>();
@@ -325,6 +347,31 @@ QList<char>* FunctionalBlock::expandPattern(const QString& patternIn) throw(Exce
return patternOut;
}
+QString FunctionalBlock::replaceExpressions(const QString& patternIn) throw(Exception) {
+
+ QString res = patternIn;
+ bool stop = false;
+ QRegularExpression re("[$][a-zA-Z0-9_]+");
+
+ while (!stop) {
+ stop = true;
+ QRegularExpressionMatchIterator matcher = re.globalMatch(res);
+ while(matcher.hasNext()) {
+ QRegularExpressionMatch m = matcher.next();
+ QString param = m.captured(0);
+ QString paramName = param;
+ paramName.remove(0,1);
+ BlockParameter* p = getParameterFromName(paramName);
+ if ((p != NULL) && (p->getType() == BlockParameter::Expression)) {
+ res.replace(param,p->getStringValue());
+ stop = false;
+ cout << "found an expr: " << qPrintable(paramName) << ", patern => " << qPrintable(res) << endl;
+ }
+ }
+ }
+ return res;
+}
+
QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *offset) throw(Exception) {
QList<char> patternOut;
@@ -358,7 +405,7 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
*offset += 1;
}
if (*offset == patternIn.size()) {
- throw(Exception(INVALID_IFACE_PATTERN));
+ throw(Exception(INVALID_IFACE_PATTERN,this));
}
double repeat = 0;
try {
@@ -387,7 +434,7 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
*offset += 1;
}
if (*offset == patternIn.size()) {
- throw(Exception(INVALID_IFACE_PATTERN));
+ throw(Exception(INVALID_IFACE_PATTERN,this));
}
double repeat = 0;
try {
@@ -421,14 +468,14 @@ double FunctionalBlock::evaluateExpression(const QString& expression) throw(Exce
foreach (QString name, varNames) {
QString paramName = name;
paramName.remove(0,1);
- BlockParameter* param = reference->getParameterFromName(paramName);
+ BlockParameter* param = getParameterFromName(paramName);
if (param == NULL) {
- throw(Exception(EVAL_PARAM_UNKNOWN));
+ throw(Exception(EVAL_PARAM_UNKNOWN,this));
}
bool okVal;
- int val = param->getDoubleValue(&okVal);
+ int val = param->getDoubleValue(&okVal);
if (!okVal) {
- throw(Exception(EVAL_PARAM_NOVALUE));
+ throw(Exception(EVAL_PARAM_NOVALUE,this));
}
vars.insert(name,(double)val);
}
@@ -440,11 +487,152 @@ double FunctionalBlock::evaluateExpression(const QString& expression) throw(Exce
}
catch(int index) {
cerr << "Error at index " << index << ": " << qPrintable(evaluator->getError()) << endl;
- throw(Exception(EVAL_INVALID_EXPR));
+ throw(Exception(EVAL_INVALID_EXPR,this));
}
return result;
}
+void FunctionalBlock::computeAdmittanceDelays() throw(Exception) {
+ static QString fctName = "FunctionalBlock::computeAdmittanceDelays()";
+#ifdef DEBUG_FCTNAME
+ cout << "call to " << qPrintable(fctName) << endl;
+#endif
+ QList<int> inClock;
+ QList<int> delays;
+
+ clearAdmittanceDelays();
+
+ // trying to synchronize the first one in AP
+ QMapIterator<AbstractInterface*,QList<char>* > iterAP(admittance);
+ QMapIterator<AbstractInterface*,QList<char>* > iterIP(inputPattern);
+
+ while (iterAP.hasNext()) {
+ iterAP.next();
+ iterIP.next();
+ QList<char>* ap = iterAP.value();
+ QList<char>* ip = iterIP.value();
+ int first = 0;
+ while ((first < lengthIP) && (ip->at(first) == 0)) first++;
+ while ((first < lengthAP) && (ap->at(first) == 0)) first--;
+ delays.append(first);
+ inClock.append(0);
+ QList<int>* delays = new QList<int>();
+ admittanceDelays.insert(iterAP.key(), delays);
+ }
+
+ QMapIterator<AbstractInterface*,QList<int>* > iterDelays(admittanceDelays);
+
+ // get the delay to apply
+ int maxDelay = 0;
+ for(int i=0;i<delays.size();i++) {
+ if (delays[i] > maxDelay) maxDelay = delays[i];
+ }
+ // adding the delays to IP
+ iterIP.toFront();
+ int i = 0;
+ while (iterIP.hasNext()) {
+ iterIP.next();
+ iterDelays.next();
+ QList<char>* ip = iterIP.value();
+ QList<int>* d = iterDelays.value();
+ d->append(maxDelay-delays[i]);
+ cout << "prependind " << qPrintable(iterIP.key()->getName()) << " with " << (maxDelay-delays[i]) << " 0" << endl;
+ for(int j=0;j<maxDelay-delays[i];j++) {
+ ip->prepend(0);
+ }
+ for(int j=0;j<delays[i];j++) {
+ ip->append(0);
+ }
+ i++;
+ }
+ lengthIP += maxDelay;
+
+ cout << "IP length = " << lengthIP << ", AP length = " << lengthAP << endl;
+ bool stop = false;
+ int apIndex = 0;
+ int ipIndex = 0;
+ while (!stop) {
+
+ // if AP is a valid group, search for the next valid group in IP
+ if (isValidDataGroup(admittance,apIndex)) {
+
+ while ((ipIndex < lengthIP) && (! isValidDataGroup(inputPattern,ipIndex))) ipIndex++;
+ if (ipIndex == lengthIP) {
+ stop = true;
+ continue;
+ }
+ }
+
+ iterAP.toFront();
+ iterIP.toFront();
+ iterDelays.toFront();
+
+ if (samePatterns(inputPattern,ipIndex,admittance,apIndex)) {
+ while (iterAP.hasNext()) {
+ iterAP.next();
+ iterDelays.next();
+ QList<char>* ap = iterAP.value();
+ if (ap->at(apIndex) == 1) {
+ QList<int>* d = iterDelays.value();
+ d->append(0); // the 1 is at its good place, so no delay
+ }
+ }
+ }
+ else {
+ cout << "diff between IP and AP at " << apIndex << endl;
+ // search for the next 1 in IP for every input that has a 1 in AP
+
+ while (iterAP.hasNext()) {
+ iterAP.next();
+ iterIP.next();
+ iterDelays.next();
+ QList<char>* ap = iterAP.value();
+ QList<char>* ip = iterIP.value();
+ QList<int>* d = iterDelays.value();
+ // case 1: 1 in IP is too late
+ if ((ap->at(apIndex) == 1) && (ip->at(ipIndex) == 0)) {
+ int delay = 1;
+ while ( ((ipIndex+delay) < lengthIP) && (ip->at(ipIndex+delay) == 0) ) delay++;
+ cout << "found a delay of " << (-delay) << " for iface " << qPrintable(iterAP.key()->getName()) << endl;
+ // moving the 1 to its normal pos.
+ ip->replace(ipIndex,1);
+ ip->replace(ipIndex+delay,0);
+ d->append(-delay);
+ }
+ // case 2: 1 in IP is too soon
+ else if ((ap->at(apIndex) == 0) && (ip->at(ipIndex) == 1)) {
+ int delay = 1;
+ while ( ((apIndex+delay) < lengthAP) && (ap->at(apIndex+delay) == 0) ) delay++;
+ cout << "found a delay of " << delay << " for iface " << qPrintable(iterAP.key()->getName()) << endl;
+ // search for next 0 in IP to put the 1
+ int k = ipIndex+delay;
+ while ((k < lengthIP) && (ip->at(k) == 1)) k++;
+ ip->replace(ipIndex,0);
+ ip->replace(k,1);
+ d->append(delay);
+ }
+ }
+ if (! samePatterns(inputPattern,inClock,admittance,apIndex)) {
+ cout << "Abnormal case while searching for delays" << endl;
+ }
+ }
+
+ apIndex++;
+ ipIndex++;
+ if ((apIndex >= lengthAP) || (ipIndex >= lengthIP)) stop = true;
+ }
+ iterDelays.toFront();
+ while (iterDelays.hasNext()) {
+ iterDelays.next();
+ QList<int>* d = iterDelays.value();
+ foreach(int v, *d) {
+ cout << v << " ";
+ }
+ cout << endl;
+ }
+
+}
+
void FunctionalBlock::createInputPattern() throw(Exception) {
static QString fctName = "FunctionalBlock::createInputPattern())";
#ifdef DEBUG_FCTNAME
@@ -452,12 +640,27 @@ void FunctionalBlock::createInputPattern() throw(Exception) {
#endif
lengthIP = -1;
- foreach(AbstractInterface* iface, getControlInputs()) {
+ foreach(AbstractInterface* iface, getControlInputs()) {
+
ConnectedInterface* connIface = AI_TO_CON(iface);
+ // check if it is connected
+ if (connIface->getConnectedFrom() == NULL) {
+ throw(Exception(IFACE_NOT_CONNECTED,this));
+ }
+ // get the precursor output pattern
QList<char>* out = connIface->getConnectedFrom()->getOutputPattern();
+
+ ConnectedInterface* assoIface = AI_TO_CON(connIface->getAssociatedIface());
+ AbstractInputModifier* modifier = assoIface->getInputModifier();
+ // check if the input is modified
+ if (modifier != NULL) {
+
+ out = modifier->getModifiedInput(out);
+ }
+
if (out->size() == 0) {
clearInputPattern();
- throw(Exception(NO_IFACE_IP));
+ throw(Exception(NO_IFACE_IP,this));
}
if (lengthIP == -1) {
lengthIP = out->size();
@@ -588,7 +791,7 @@ void FunctionalBlock::checkInputPatternCompatibility() throw(Exception) {
while ((clock < lengthIP) && (! isValidDataGroup(inputPattern,clock))) clock++;
if (clock == lengthIP) {
cerr << "Abnormal case: end of IP has been reached without finding a valid group" << endl;
- throw(Exception(IP_END_NULLCOL));
+ throw(Exception(IP_END_NULLCOL,this));
}
}
/* at that point 2 cases of compat : IP(clock) and AP(i) are equal valid group, or
@@ -596,13 +799,13 @@ void FunctionalBlock::checkInputPatternCompatibility() throw(Exception) {
*/
if (! samePatterns(inputPattern,clock,admittance,i)) {
cout << "AP(" << i << ") and IP(" << clock << ") are not equal" << endl;
- throw(Exception(IP_AP_NOTCOMPAT)); // IP and AP not compatible
+ throw(Exception(IP_AP_NOTCOMPAT,this)); // IP and AP not compatible
}
clock++;
i++;
}
if (clock < lengthIP) {
- throw(Exception(AP_TOO_SHORT));
+ throw(Exception(AP_TOO_SHORT,this));
cerr << "Abnormal case: AP is to short" << endl;
}
}
@@ -637,6 +840,8 @@ void FunctionalBlock::computeOutputPattern(int nbExec) throw(Exception) {
// in case of inputPattern not created, do it
if (lengthIP <= 0) {
+
+ cout << "Strange case: input pattern is not created while it is time to compute output pattern !" << endl;
// collect the input patterns for each input
try {
createInputPattern();
@@ -876,6 +1081,26 @@ bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >
return true;
}
+bool FunctionalBlock::samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, const QList<int> &srcCols, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol) {
+ if (patternSrc.size() != srcCols.size()) return false;
+ if (patternSrc.size() != patternDest.size()) return false;
+
+ QMapIterator<AbstractInterface*, QList<char>* > iterSrc(patternSrc);
+ QListIterator<int> iterSrcCol(srcCols);
+ QMapIterator<AbstractInterface*, QList<char>* > iterDest(patternDest);
+ while (iterSrc.hasNext()) {
+ iterSrc.next();
+ int srcCol = iterSrcCol.next();
+ iterDest.next();
+ QList<char>* srcPat = iterSrc.value();
+ QList<char>* destPat = iterDest.value();
+ if (srcCol >= srcPat->size()) return false;
+ if (destCol >= destPat->size()) return false;
+ if (srcPat->at(srcCol) != destPat->at(destCol)) return false;
+ }
+ return true;
+}
+
bool FunctionalBlock::canCombinePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, QMap<AbstractInterface*, QList<char>* > patternDest, int destCol) {
if (patternSrc.size() != patternDest.size()) return false;
QMapIterator<AbstractInterface*, QList<char>* > iterSrc(patternSrc);
@@ -960,6 +1185,19 @@ bool FunctionalBlock::isValidDataGroup(const QMap<AbstractInterface *, QList<cha
return false;
}
+bool FunctionalBlock::isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, const QList<int> offsets) {
+ QMapIterator<AbstractInterface*, QList<char>* > iterSrc(pattern);
+ QListIterator<int> iterOffsets(offsets);
+ while (iterSrc.hasNext()) {
+ iterSrc.next();
+ int offset = iterOffsets.next();
+ QList<char>* srcPat = iterSrc.value();
+ if (offset >= srcPat->size()) return false;
+ if (srcPat->at(offset) == 1) return true;
+ }
+ return false;
+}
+
bool FunctionalBlock::isOnlyXDataGroup(const QMap<AbstractInterface *, QList<char> *> &pattern, int offset) {
QMapIterator<AbstractInterface*, QList<char>* > iterSrc(pattern);
while (iterSrc.hasNext()) {
@@ -1005,6 +1243,16 @@ void FunctionalBlock::clearInputPattern() {
lengthIP = -1;
}
+void FunctionalBlock::clearAdmittanceDelays() {
+ QMapIterator<AbstractInterface*, QList<int>* > iterA(admittanceDelays);
+ while (iterA.hasNext()) {
+ iterA.next();
+ QList<int>* d = iterA.value();
+ if (d != NULL) delete d;
+ }
+ admittanceDelays.clear();
+}
+
int FunctionalBlock::createTriggers() {
triggers.clear();
/* NB: this method returns the number of executions that have been started
diff --git a/FunctionalBlock.h b/FunctionalBlock.h
index b3cfbc4..404ce17 100644
--- a/FunctionalBlock.h
+++ b/FunctionalBlock.h
@@ -33,6 +33,7 @@ public:
inline QList<int> getProductionCounter() { return productionCounter; }
inline QMap<AbstractInterface*, QList<char>* > getConsumptionPattern() { return consumptionPattern; }
inline QMap<AbstractInterface*, QList<char>* > getProductionPattern() { return productionPattern; }
+ inline QMap<AbstractInterface*, QList<int>* > getAdmittanceDelays() { return admittanceDelays; }
inline int getConsumptionPatternLength() { return lengthCP; }
inline int getProductionPatternLength() { return lengthPP; }
inline int getDelta() { return delta; }
@@ -59,7 +60,8 @@ public:
void createPatterns() throw(Exception); // called in Graph, before checking compatibility and computing output pattern
void checkInputPatternCompatibility() throw(Exception);
void computeOutputPattern(int nbExec = -1) throw(Exception);
-
+ void computeAdmittanceDelays() throw(Exception); // compute differences between IP and admittance
+
private:
// patterns
void createDelta() throw(Exception);
@@ -67,15 +69,18 @@ private:
void createProductionPattern() throw(Exception); // initialize a QList<char> for each interface from patterns defined in implementation
void createProductionCounter() throw(Exception); // initialize a QList<int> from counter defined in implementation
void createAdmittance(int nbExec) throw(Exception); // initialize a QList<char> from consumption pattern and delta
+
void clearConsumptionPattern();
void clearProductionPattern();
void createInputPattern() throw(Exception);
void clearInputPattern();
+ void clearAdmittanceDelays();
int createTriggers(); // compute the clock cycle at which the block is triggered
double evaluateExpression(const QString& expression) throw(Exception);
QList<char>* expandPattern(const QString& patternIn) throw(Exception);
QList<char> expandPatternRecur(const QString& patternIn, int* offset) throw(Exception);
+ QString replaceExpressions(const QString& patternIn) throw(Exception);
/*!
* \brief samePatterns
* \param patternSrc the pattern that must be tested with patternDest (is patternDest == patternDest)
@@ -86,6 +91,7 @@ private:
leaving the dest pattern in an inconsistent state. Thus, it is a good idea to call canCombine before.
*/
bool samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, int srcCol, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol);
+ bool samePatterns(const QMap<AbstractInterface*, QList<char>* >& patternSrc, const QList<int>& srcCols, const QMap<AbstractInterface*, QList<char>* >& patternDest, int destCol);
/*!
* \brief canCombinePatterns
* \param patternSrc the pattern that must be combined with patternDest (patternDest = patternDest OR patternSrc)
@@ -129,6 +135,7 @@ private:
* isValidGroup checks if there is at least one 1 in the column offset of pattern.
*/
bool isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
+ bool isValidDataGroup(const QMap<AbstractInterface*, QList<char>* >& pattern, const QList<int> offsets);
/*!
* \brief isOnlyXGroup
* \param pattern the pattern to test
@@ -146,8 +153,9 @@ private:
void shiftRightPattern(const QMap<AbstractInterface*, QList<char>* >& pattern, int offset);
QMap<AbstractInterface*, QList<char>* > consumptionPattern;
- QMap<AbstractInterface*, QString > admittanceCyclic; // the admittance expressed as prologue-cyclic part-eppilogue, deduced from admittance
+ QMap<AbstractInterface*, QString > admittanceCyclic; // the admittance expressed as prologue-cyclic part-epilogue, deduced from admittance
QMap<AbstractInterface*, QList<char>* > admittance; // the admittance taking into account nb exec.
+ QMap<AbstractInterface*, QList<int>* > admittanceDelays; // the delay between what should be consumed and IP
QMap<AbstractInterface*, QList<char>* > productionPattern;
QMap<AbstractInterface*,QList<char>* > inputPattern;
QMap<AbstractInterface*, QList<char>* > outputPattern; // CAUTION: the QList<char>* must also be stored in the outputPattern attributes of AbstractInterface
diff --git a/FunctionalInterface.cpp b/FunctionalInterface.cpp
index 2fc093e..23fd482 100644
--- a/FunctionalInterface.cpp
+++ b/FunctionalInterface.cpp
@@ -17,6 +17,7 @@ FunctionalInterface::FunctionalInterface(AbstractBlock* _owner, ReferenceInterfa
reference = _reference;
name = reference->getName();
+ type = reference->getType();
endianess = reference->getEndianess();
width = reference->getWidth();
direction = reference->getDirection();
diff --git a/Graph.cpp b/Graph.cpp
index 4b24181..bd1eb70 100644
--- a/Graph.cpp
+++ b/Graph.cpp
@@ -138,12 +138,15 @@ void Graph::createPatterns() throw(Exception) {
void Graph::resetPatternComputed() {
foreach(AbstractBlock* block, sources) {
block->setPatternComputed(false);
+ block->resetTraversalLevel();
}
foreach(AbstractBlock* block, groups) {
GroupBlock* group = AB_TO_GRP(block);
group->setPatternComputed(false);
+ block->resetTraversalLevel();
foreach(AbstractBlock* inBlock, group->getBlocks()) {
inBlock->setPatternComputed(false);
+ block->resetTraversalLevel();
}
}
}
@@ -157,7 +160,7 @@ void Graph::computeOutputPatterns(int nbExec) throw(Exception) {
throw(e);
}
- resetPatternComputed();
+ resetPatternComputed();
// search for all block that are generators.
QList<FunctionalBlock*> generators;
generators.append(sources);
diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 62fd6ec..b515b54 100644
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -10,7 +10,7 @@ int GroupBlock::counter = 1;
GroupBlock::GroupBlock(GroupBlock *_parent) throw(Exception) : AbstractBlock() {
// force topGroup to false if this group has a parent
- if (_parent != NULL) {
+ if (_parent != NULL) {
topGroup = false;
name = QString("sub_group")+"_"+QString::number(counter++);
}
@@ -108,14 +108,20 @@ void GroupBlock::removeGenericParameter(QString name) {
void GroupBlock::createInputPattern() {
foreach(AbstractInterface* iface, getControlInputs()) {
ConnectedInterface* connIface = AI_TO_CON(iface);
- QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
- connIface->setOutputPattern(pattern);
- }
+ QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
+ connIface->setOutputPattern(pattern);
+ }
+}
+
+void GroupBlock::computeAdmittanceDelays() throw(Exception) {
+ throw(Exception(INVALID_GROUPBLOCK_USE));
}
-void GroupBlock::checkInputPatternCompatibility() throw(Exception){
+void GroupBlock::checkInputPatternCompatibility() throw(Exception){
+ throw(Exception(INVALID_GROUPBLOCK_USE));
}
+
void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
static QString fctName = "GroupBlock::computeOutputPattern()";
@@ -125,7 +131,7 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
cout << "computing output pattern of group " << qPrintable(name) << endl;
- bool canCompute = false;
+ bool canCompute = false;
// get the input pattern on each inputs
createInputPattern();
@@ -133,28 +139,34 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
// find blocks that are connected to that inputs and generators
QList<AbstractBlock*> fifo;
foreach(AbstractBlock* block, blocks) {
-
+
bool addIt = false;
// if a block is a generator and has control outputs, add it
if (block->isGeneratorBlock()) {
if (block->getControlOutputs().size() > 0) addIt = true;
}
else {
- // if the block has a control input connected from an intput of the group, add it too
+ // if the block has all its connected inputs that are connected to an intput of the group, add it too
+ addIt = true;
foreach(AbstractInterface* iface, block->getControlInputs()) {
- //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;
+ //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;
ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
//cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
- if (connFrom->getOwner() == this) {
- addIt = true;
+ if (connFrom == NULL) {
+ addIt = false;
+ break;
+ }
+ else if (connFrom->getOwner() != this) {
+ addIt = false;
break;
}
}
}
if (addIt) {
cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;
- fifo.append(block);
+ block->setTraversalLevel(0); // level 0 = first blocks to be evaluated
+ fifo.append(block);
}
}
@@ -162,47 +174,70 @@ void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
AbstractBlock* block = fifo.takeFirst();
if (block->getPatternComputed()) continue; // block has already been processed
+
+ cout << "computing compat and output for " << qPrintable(block->getName()) << endl;
+
try {
block->checkInputPatternCompatibility();
}
- catch(Exception e) {
- cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;
+ catch(Exception e) {
+ cout << qPrintable(block->getName()) << " is not compatible with its input pattern" << endl;
throw(e);
- }
+ }
try {
block->computeOutputPattern();
}
- catch(Exception e) {
+ catch(Exception e) {
cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;
- throw(e);
+ throw(e);
}
canCompute = true;
block->setPatternComputed(true);
- // add other blocks connected from block to the fifo
+ /* add other blocks connected from block to the fifo but only if
+ all their connected inputs are connected to blocks that have
+ a traversalLevel >=0
+ */
foreach(AbstractInterface* iface, block->getControlOutputs()) {
ConnectedInterface* conn = (ConnectedInterface*)iface;
foreach(ConnectedInterface* connTo, conn->getConnectedTo()) {
- /* if connTo is owned by a functional block
- or by a group block that is within this, add the block to the fifo.
- */
- if (connTo->getOwner()->isFunctionalBlock()) {
- fifo.append(connTo->getOwner());
+
+ AbstractBlock* block1 = connTo->getOwner();
+ cout << "testing if " << qPrintable(block1->getName()) << " has all connected inputs connected to already processed blocks" << endl;
+ bool addIt = true;
+ int maxLevel = 0;
+
+ foreach(AbstractInterface* iface, block1->getControlInputs()) {
+ //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;
+ ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
+ //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
+
+ if ((connFrom != NULL) && (connFrom->getOwner()->getPatternComputed() == false)) {
+ addIt = false;
+ break;
+ }
+ else {
+ if (connFrom->getOwner()->getTraversalLevel() > maxLevel) maxLevel = connFrom->getOwner()->getTraversalLevel();
+ }
+ }
+
+ if (addIt) {
+ cout << "adding " << qPrintable(block1->getName()) << " to the FIFO" << endl;
+ block1->setTraversalLevel(maxLevel+1); // level 0 = first blocks to be evaluated
+ fifo.append(block1);
}
- else if (connTo->getOwner() != this) {
- fifo.append(connTo->getOwner());
- }
}
}
}
-
+
if (canCompute) {
foreach(AbstractInterface* iface, getControlOutputs()) {
ConnectedInterface* connIface = AI_TO_CON(iface);
QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
- connIface->setOutputPattern(pattern);
+ connIface->setOutputPattern(pattern);
}
setPatternComputed(true);
- }
+ }
+
}
diff --git a/GroupBlock.h b/GroupBlock.h
index b3aaeaf..f7a9c2c 100644
--- a/GroupBlock.h
+++ b/GroupBlock.h
@@ -44,6 +44,7 @@ public:
void checkInputPatternCompatibility() throw(Exception);
void computeOutputPattern(int nbExec = -1) throw(Exception);
+ void computeAdmittanceDelays() throw(Exception);
private:
// patterns
diff --git a/GroupWidget.cpp b/GroupWidget.cpp
index 318e596..54cdfc1 100644
--- a/GroupWidget.cpp
+++ b/GroupWidget.cpp
@@ -154,13 +154,13 @@ void GroupWidget::createActions() {
void GroupWidget::createToolbar() {
toolbarEditMode = new QToolBar(tr("Mode"));
toolbarAdd = new QToolBar(tr("Group"));
- toolbarTools = new QToolBar(tr("Tools"));
+ //toolbarTools = new QToolBar(tr("Tools"));
toolbarEditMode->addWidget(new QLabel("Mode"));
- toolbarTools->addWidget(new QLabel("Tools"));
+ //toolbarTools->addWidget(new QLabel("Tools"));
toolbarEditMode->addSeparator();
- toolbarTools->addSeparator();
+ //toolbarTools->addSeparator();
toolbarEditMode->addWidget(butAddConnection);
toolbarEditMode->addWidget(butEdit);
@@ -169,13 +169,13 @@ void GroupWidget::createToolbar() {
toolbarAdd->addAction(newEmptyGroupAct);
toolbarAdd->addAction(newGroupAct);
- toolbarTools->addAction(deleteAct);
- toolbarTools->addAction(selectAllAct);
- toolbarTools->addAction(unselectAllAct);
+ //toolbarTools->addAction(deleteAct);
+ //toolbarTools->addAction(selectAllAct);
+ //toolbarTools->addAction(unselectAllAct);
layout->addWidget(toolbarEditMode,0,0);
layout->addWidget(toolbarAdd,0,1);
- layout->addWidget(toolbarTools,0,2);
+ //layout->addWidget(toolbarTools,0,2);
}
void GroupWidget::slotEdit() {
diff --git a/InterfaceItem.cpp b/InterfaceItem.cpp
index 10158d7..443cee0 100644
--- a/InterfaceItem.cpp
+++ b/InterfaceItem.cpp
@@ -128,6 +128,16 @@ void InterfaceItem::paint(QPainter *painter) {
painter->drawPath(params->outArrow);
}
+ // paint modifier box if needed
+
+ if (refInter->getInputModifier() != NULL) {
+ painter->save();
+ painter->translate(params->arrowWidth+params->arrowLineLength,0);
+ painter->drawRect(0,-5,10,10);
+ painter->restore();
+ }
+
+
// draw names
if(selected) {
painter->setPen(QPen(Qt::red,2));
@@ -164,7 +174,9 @@ void InterfaceItem::paint(QPainter *painter) {
else if((owner->isBoxItem()) || (owner->isSourceItem())){
painter->drawText(-w,-h/2,w,h,Qt::AlignLeft | Qt::TextWordWrap, refInter->getName());
}
- }
+ }
+
+
painter->restore();
}
diff --git a/InterfacePropertiesWindow.cpp b/InterfacePropertiesWindow.cpp
index 419b33e..6999a16 100644
--- a/InterfacePropertiesWindow.cpp
+++ b/InterfacePropertiesWindow.cpp
@@ -21,6 +21,9 @@ InterfacePropertiesWindow::InterfacePropertiesWindow(InterfaceItem *_inter, QWid
layout->addWidget(new QLabel(inter->refInter->getDirectionString()), 4, 1);
layout->addWidget(new QLabel("Purpose :"), 5, 0);
layout->addWidget(new QLabel(inter->refInter->getPurposeString()), 5, 1);
+ layout->addWidget(new QLabel("Type :"), 6, 0);
+ layout->addWidget(new QLabel(inter->refInter->getTypeString()), 6, 1);
+
this->setLayout(layout);
show();
diff --git a/MainWindow.cpp b/MainWindow.cpp
index 38ec48a..79bc6f9 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -5,9 +5,8 @@
#include "GroupWidget.h"
#include "GroupScene.h"
#include "VHDLConverter.h"
-#include "AbstractBoxItem.h"
#include "Graph.h"
-#include "GroupItem.h"
+#include "FunctionalBlock.h"
#include <QDomDocument>
#include <QDomElement>
#include <QDomText>
@@ -54,6 +53,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
cout << "all references and implementations are loaded" << endl;
+ params->createDelayBlock();
+
// create the menu, action, ...
dispatcher = new Dispatcher(params,this);
params->setDispatcher(dispatcher);
@@ -86,9 +87,11 @@ MainWindow::~MainWindow() {}
void MainWindow::initialize() {
projectMenuEnb = 0;
+ analysisMenuEnb = 0;
stackedWidget->setCurrentIndex(0);
enableProjectActions(true,PROJECT_NEW | PROJECT_OPEN, OP_RAZ);
+ enableAnalysisActions(false);
stackedWidget->setCurrentIndex(0);
@@ -195,11 +198,39 @@ void MainWindow::enableProjectActions(bool enbMenu, quint16 mask, quint8 op) {
}
}
+void MainWindow::enableAnalysisActions(bool enbMenu, quint16 mask, quint8 op) {
+ if (enbMenu) {
+ analysisMenu->setEnabled(true);
+ }
+ else {
+ analysisMenu->setEnabled(false);
+ }
+
+ if (op == OP_ADD) {
+ analysisMenuEnb = analysisMenuEnb | mask;
+ }
+ else if (op == OP_REM) {
+ analysisMenuEnb = (analysisMenuEnb | mask) ^ mask;
+ }
+ else if (op == OP_RAZ) {
+ analysisMenuEnb = mask;
+ }
+
+
+ if (analysisMenuEnb & ANALYSIS_ANALYZE) {
+ graphAnalysis->setEnabled(true);
+ }
+ else {
+ graphAnalysis->setEnabled(false);
+ }
+}
+
void MainWindow::createMenus(){
allMenuBar = menuBar();
projectMenu = allMenuBar->addMenu(tr("&Project"));
+ analysisMenu = allMenuBar->addMenu(tr("&Analysis"));
toolsMenu = allMenuBar->addMenu(tr("&Tools"));
projectMenu->addAction(newProject);
@@ -209,8 +240,10 @@ void MainWindow::createMenus(){
projectMenu->addAction(closeProject);
projectMenu->addAction(openLibrary);
- toolsMenu->addAction(newBlockWidgetAct);
- toolsMenu->addAction(graphValidation);
+ analysisMenu->addAction(graphAnalysis);
+
+ toolsMenu->addAction(vhdlToXmlAct);
+
}
@@ -246,15 +279,15 @@ void MainWindow::createActions() {
openLibrary->setStatusTip(tr("Open block library window"));
connect(openLibrary, SIGNAL(triggered()), this, SLOT(slotOpenBlockLibrary()));
- newBlockWidgetAct = new QAction(tr("&XML generator"), this);
- newBlockWidgetAct->setIcon(QPixmap::fromImage(QImage("icons/new.ico")));
- newBlockWidgetAct->setStatusTip(tr("Create a new XML generator"));
- connect(newBlockWidgetAct, SIGNAL(triggered()), this, SLOT(slotNewBlockWidget()));
+ vhdlToXmlAct = new QAction(tr("&XML generator"), this);
+ vhdlToXmlAct->setIcon(QPixmap::fromImage(QImage("icons/new.ico")));
+ vhdlToXmlAct->setStatusTip(tr("Create a new XML generator"));
+ connect(vhdlToXmlAct, SIGNAL(triggered()), this, SLOT(slotVHDLToXml()));
- graphValidation = new QAction(tr("&graph validation"), this);
- graphValidation->setIcon(QPixmap::fromImage(QImage("icons/new.ico")));
- graphValidation->setStatusTip(tr("validate the graph"));
- connect(graphValidation, SIGNAL(triggered()), this, SLOT(slotGraphValidation()));
+ graphAnalysis = new QAction(tr("&graph validation"), this);
+ graphAnalysis->setIcon(QPixmap::fromImage(QImage("icons/new.ico")));
+ graphAnalysis->setStatusTip(tr("validate the graph"));
+ connect(graphAnalysis, SIGNAL(triggered()), this, SLOT(slotGraphAnalysis()));
}
@@ -273,6 +306,7 @@ void MainWindow::slotLoadProject(){
library->updateComboScene();
params->isCurrentProject = true;
enableProjectActions(true, PROJECT_CLOSE | PROJECT_SAVE | PROJECT_SAVEAS | PROJECT_LIB, OP_RAZ);
+ enableAnalysisActions(true, ANALYSIS_ANALYZE, OP_RAZ);
}
else {
QMessageBox msgBox;
@@ -289,6 +323,7 @@ void MainWindow::slotLoadProject(){
void MainWindow::slotNewProject(){
enableProjectActions(true, PROJECT_CLOSE | PROJECT_SAVE | PROJECT_SAVEAS | PROJECT_LIB, OP_RAZ);
+ enableAnalysisActions(true, ANALYSIS_ANALYZE, OP_RAZ);
GroupWidget* topGroup = dispatcher->createTopScene();
addTopGroup(topGroup);
library->updateComboScene();
@@ -342,7 +377,7 @@ bool MainWindow::slotCloseProject(){
}
-void MainWindow::slotNewBlockWidget() {
+void MainWindow::slotVHDLToXml() {
new VHDLConverter();
}
@@ -372,12 +407,24 @@ void MainWindow::slotOpenBlockLibrary() {
}
-void MainWindow::slotGraphValidation() {
- try {
- params->getGraph()->computeOutputPatterns(5);
+void MainWindow::slotGraphAnalysis() {
+ bool compat = true;
+ try {
+ params->getGraph()->computeOutputPatterns(1);
}
catch(Exception e) {
- cerr << qPrintable(e.getMessage()) << endl;
+ cerr << qPrintable(e.getMessage()) << endl;
+ compat = false;
+ if (e.getType() == IP_AP_NOTCOMPAT) {
+ FunctionalBlock* toBlock = (FunctionalBlock*)(e.getSource());
+ QString msg = tr("");
+ msg.append(toBlock->getName());
+ msg += " is not compatible with its input pattern.\nDo you want to launch automatic modification process to ensure the compatibility ?";
+ int ret = QMessageBox::question(this,tr("Building references library"),msg, QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
+ if (ret == QMessageBox::Ok) {
+ dispatcher->findGraphModifications(toBlock);
+ }
+ }
}
}
diff --git a/MainWindow.h b/MainWindow.h
index 99858c8..9664a96 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -23,7 +23,9 @@ class Graph;
// defines for menus
-#define TRACE_MENU (quint8)1
+#define PROJECT_MENU (quint8)1
+#define ANALYSIS_MENU (quint8)2
+#define TOOLS_MENU (quint8)3
// defines for actions
#define NONE_ACT (quint16)0
@@ -35,6 +37,8 @@ class Graph;
#define PROJECT_CLOSE (quint16)16
#define PROJECT_LIB (quint16)32
+#define ANALYSIS_ANALYZE (quint16)1
+
#define OP_ADD (quint8)0
#define OP_REM (quint8)1
#define OP_RAZ (quint8)2
@@ -89,8 +93,11 @@ private:
QMenu* projectMenu;
quint16 projectMenuEnb;
+ QMenu* analysisMenu;
+ quint16 analysisMenuEnb;
QMenu* toolsMenu;
+ // actions for project
QAction* newProject;
QAction* openProject;
QAction* saveProject;
@@ -98,9 +105,11 @@ private:
QAction* closeProject;
QAction* openLibrary;
- QAction *newBlockWidgetAct;
- QAction *graphValidation;
+ // actions for graph analysis
+ QAction *graphAnalysis;
+ // actions for tools
+ QAction *vhdlToXmlAct;
// versioning related
quint8 versionMaj;
@@ -109,6 +118,7 @@ private:
public slots:
void enableProjectActions(bool enbMenu, quint16 mask = 0, quint8 op = 0); // default : add nothing
+ void enableAnalysisActions(bool enbMenu, quint16 mask = 0, quint8 op = 0); // default : add nothing
private slots:
void slotNewProject();
@@ -118,8 +128,9 @@ private slots:
bool slotCloseProject();
void slotOpenBlockLibrary();
- void slotNewBlockWidget();
- void slotGraphValidation();
+ void slotGraphAnalysis();
+
+ void slotVHDLToXml();
void slotCheckNewVersion(QNetworkReply *reply);
};
diff --git a/Parameters.cpp b/Parameters.cpp
index 322046d..d3a8dd4 100644
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -24,6 +24,10 @@
#include "Exception.h"
#include "BlocksToConfigureWidget.h"
+#include "BlockParameterGeneric.h"
+
+#include "DelayInputModifier.h"
+
Parameters::Parameters() {
categoryTree = NULL;
arrowWidth = 5;
@@ -81,6 +85,48 @@ ReferenceBlock* Parameters::getReferenceBlock(int idCategory, int idBlock) {
return ref;
}
+void Parameters::createDelayBlock() {
+ delayRef = new ReferenceBlock("no.xml");
+ delayRef->addCategory(100);
+ delayRef->setName("delay");
+
+ BlockCategory* cat = categoryTree->searchCategory(100);
+ cat->blocks.append(delayRef);
+
+ AbstractInterface* interIn = new ReferenceInterface(delayRef,"data_in",AbstractInterface::Input, AbstractInterface::Data, "expression","$in_width");
+ delayRef->addInterface(interIn);
+ AbstractInterface* interInCtl = new ReferenceInterface(delayRef,"data_in_enb",AbstractInterface::Input, AbstractInterface::Control, "boolean","1");
+ delayRef->addInterface(interInCtl);
+ interInCtl->setAssociatedIface(interIn);
+ AbstractInterface* interOut = new ReferenceInterface(delayRef,"data_out",AbstractInterface::Output, AbstractInterface::Data, "expression","$in_width");
+ delayRef->addInterface(interOut);
+ AbstractInterface* interOutCtl = new ReferenceInterface(delayRef,"data_out_enb",AbstractInterface::Output, AbstractInterface::Control, "boolean","1");
+ delayRef->addInterface(interOutCtl);
+ interOutCtl->setAssociatedIface(interOut);
+ BlockParameter* param1 = new BlockParameterGeneric(delayRef,"in_width","natural","8");
+ BlockParameter* param2 = new BlockParameterGeneric(delayRef,"dly_length","natural","1");
+ delayRef->addParameter(param1);
+ delayRef->addParameter(param2);
+ delayImpl = new BlockImplementation("no.xml");
+ delayImpl->setDelta("1");
+ QHash<QString,QString> consPattern;
+ consPattern.insert("data_in_enb","1");
+ delayImpl->setConsumptionPattern(consPattern);
+ QHash<QString,QString> prodPattern;
+ prodPattern.insert("data_out_enb","O{$dly_length}1");
+ delayImpl->setProductionPattern(prodPattern);
+ delayImpl->setProductionCounter("1");
+ delayRef->addImplementation(delayImpl);
+ delayImpl->setReference(delayRef);
+ if (! delayImpl->checkPatterns()) {
+ cout << "Delay block creation: failure" << endl;
+ }
+ else {
+ cout << "Delay block creation: success" << endl;
+ }
+
+}
+
void Parameters::validateXmlFile(const QString& xmlFileName, const QString& xsdFileName, XmlFileType fileType) throw(Exception) {
@@ -398,6 +444,38 @@ GroupWidget *Parameters::loadProject(QDomElement root) throw(Exception) {
}
cout << "connections loaded and created succefully!" << endl;
+ QDomNodeList modifierNodes = root.elementsByTagName("modifier");
+
+ for(int i=0; i<modifierNodes.length(); i++){
+ QDomElement currentModifierNode = modifierNodes.at(i).toElement();
+
+ int id = currentModifierNode.attribute("id","none").toInt(&ok);
+ if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+
+ QString typeStr = currentModifierNode.attribute("type","none");
+ if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+ QString paramsStr = currentModifierNode.attribute("params","none");
+ if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+
+ AbstractInputModifier* mod = NULL;
+ if (typeStr == "delay") {
+ int delay = paramsStr.toInt(&ok);
+ if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
+ mod = new DelayInputModifier(delay);
+ }
+
+ /* NB: just adding delays for now. To be cont'd */
+ InterfaceItem *iface = searchInterfaceItemById(id,topScene);
+
+ if(iface != NULL ) {
+ iface->refInter->setInputModifier(mod);
+
+ } else {
+ cout << "interfaces not found, modifiers setup canceled!" << endl;
+ }
+ }
+ cout << "modifiers loaded and created succefully!" << endl;
+
return topGroup;
}
@@ -539,7 +617,7 @@ void Parameters::loadReferencesFromXml() throw(Exception) {
QString line = in.readLine();
line = in.readLine();
- if (!line.contains("<block>")) {
+ if (!line.contains("<block")) {
blockXML.close();
continue;
}
@@ -969,6 +1047,35 @@ void Parameters::save(QString confFile) {
}
writer.writeEndElement(); //</connections>
+
+ QList<InterfaceItem *> lstIfaceItem;
+ // search for modifiers
+ foreach(ConnectionItem* item, allConnections) {
+ InterfaceItem* fromIfaceItem = item->getFromInterfaceItem();
+ AbstractInputModifier* mod = fromIfaceItem->refInter->getInputModifier();
+ if (mod != NULL) {
+ if (!lstIfaceItem.contains(fromIfaceItem)) lstIfaceItem.append(fromIfaceItem);
+ }
+ InterfaceItem* toIfaceItem = item->getToInterfaceItem();
+ mod = toIfaceItem->refInter->getInputModifier();
+ if (mod != NULL) {
+ if (!lstIfaceItem.contains(toIfaceItem)) lstIfaceItem.append(toIfaceItem);
+ }
+ }
+ // write input modifiers
+ writer.writeStartElement("modifiers");
+ foreach(InterfaceItem* item, lstIfaceItem) {
+ AbstractInputModifier* mod = item->refInter->getInputModifier();
+ if (mod != NULL) {
+ writer.writeStartElement("modifier");
+ writer.writeAttribute("id", QString::number(item->getId()));
+ writer.writeAttribute("type",mod->getTypeStr());
+ writer.writeAttribute("params", mod->getParametersStr());
+ writer.writeEndElement();
+ }
+ }
+
+ writer.writeEndElement(); //</modifiers>
writer.writeEndElement(); //</blast_project
writer.writeEndDocument();
@@ -1039,6 +1146,27 @@ BoxItem* Parameters::searchBlockItemById(int id, GroupScene *scene) {
return NULL;
}
+BoxItem* Parameters::searchFunctionalBlock(AbstractBlock* block) {
+
+ return searchFunctionalBlockRecur(block,topScene);
+}
+
+BoxItem* Parameters::searchFunctionalBlockRecur(AbstractBlock* block, GroupScene* scene) {
+
+ foreach(BoxItem *item, scene->getBoxItems()){
+ if(item->getRefBlock() == block) {
+ return item;
+ }
+ }
+
+ BoxItem* item = NULL;
+ foreach(GroupScene *s, scene->getChildrenScene()) {
+ item = searchFunctionalBlockRecur(block,s);
+ if (item != NULL) return item;
+ }
+ return NULL;
+}
+
InterfaceItem* Parameters::searchInterfaceItemById(int id, GroupScene* scene) {
foreach(InterfaceItem *item, scene->getGroupItem()->getInterfaces()){
diff --git a/Parameters.h b/Parameters.h
index 27dc08f..8a71cfb 100644
--- a/Parameters.h
+++ b/Parameters.h
@@ -16,6 +16,7 @@ class ReferenceBlock;
class GroupBlock;
class FunctionalBlock;
class GroupScene;
+class AbstractBoxItem;
class GroupItem;
class BoxItem;
class InterfaceItem;
@@ -85,7 +86,8 @@ public :
QList<QString> implPathes;
QList<ReferenceBlock*> availableBlocks;
QList<BlockImplementation*> availableImplementations;
-
+ ReferenceBlock* delayRef;
+ BlockImplementation* delayImpl;
QString refLib;
QString implLib;
@@ -120,6 +122,7 @@ public :
EditState editState; // takes values from EDIT_STATE_XXX
bool unsaveModif;
bool isRstClkShown;
+ QMap<FunctionalBlock*, BoxItem*> blockToItem; // allow to retrieve a box item from a functionnal block
Graph* createGraph();
void destroyGraph();
@@ -137,6 +140,7 @@ public :
void loadReferencesFromXml() throw(Exception);
void loadReferencesFromLib() throw(Exception);
void saveReferencesToLib() throw(Exception);
+ void createDelayBlock();
void loadImplementationsFromXml() throw(Exception);
void loadImplementationsFromLib() throw(Exception);
@@ -153,6 +157,8 @@ public :
ReferenceBlock* searchBlockByXml(QString xmlName);
ReferenceBlock* searchBlockByMd5(QString sumMd5);
+ BoxItem* searchFunctionalBlock(AbstractBlock* block);
+
void save(QString confFile);
@@ -169,6 +175,7 @@ private:
GroupScene* searchSceneById(int id, GroupScene* scene);
BoxItem* searchBlockItemById(int id, GroupScene* scene);
+ BoxItem* searchFunctionalBlockRecur(AbstractBlock* block, GroupScene* scene);
GroupItem* searchGroupItemById(int id, GroupScene* scene);
InterfaceItem* searchInterfaceItemById(int id, GroupScene *scene);
diff --git a/ParametersWindow.cpp b/ParametersWindow.cpp
index ee98880..3fe11ea 100644
--- a/ParametersWindow.cpp
+++ b/ParametersWindow.cpp
@@ -5,8 +5,7 @@
#include "AbstractBlock.h"
ParametersWindow::ParametersWindow(AbstractBlock *_block, Parameters *_params, BlocksToConfigureWidget *btcw, QWidget *parent) :
- QWidget(parent)
-{
+ QWidget(parent) {
block = _block;
confWidget = btcw;
params = _params;
@@ -51,8 +50,7 @@ ParametersWindow::ParametersWindow(AbstractBlock *_block, Parameters *_params, B
show();
}
-void ParametersWindow::updateData()
-{
+void ParametersWindow::updateData() {
BlockParameter *param = block->getParameters().at(comboBox->currentIndex());
name->setText(param->getName());
value->setText(param->getValue().toString());
diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 037c644..fbf7828 100644
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -104,11 +104,16 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
QString idsStr = eltCat.attribute("ids","none");
if (idsStr == "none") throw (Exception(BLOCKFILE_CORRUPTED));
- QStringList listCat = idsStr.split(",");
- foreach(QString str, listCat)
- {
- int idCat = str.toInt(&ok);
- categories.append(idCat);
+ if (idsStr.isEmpty()) {
+ categories.append(99);
+ }
+ else {
+ QStringList listCat = idsStr.split(",");
+ foreach(QString str, listCat)
+ {
+ int idCat = str.toInt(&ok);
+ categories.append(idCat);
+ }
}
// getting description
@@ -417,6 +422,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
if (iface->getPurpose() == AbstractInterface::Control) {
toWrite << iface->getName();
+ toWrite << iface->getType();
toWrite << iface->getWidth();
toWrite << iface->getPurpose();
toWrite << iface->getDirection();
@@ -428,6 +434,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
if (iface->getPurpose() != AbstractInterface::Control) {
toWrite << iface->getName();
+ toWrite << iface->getType();
toWrite << iface->getWidth();
toWrite << iface->getPurpose();
toWrite << iface->getDirection();
@@ -440,6 +447,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
ReferenceInterface *iface = (ReferenceInterface *)(b.outputs.at(i));
if (iface->getPurpose() == AbstractInterface::Control) {
toWrite << iface->getName();
+ toWrite << iface->getType();
toWrite << iface->getWidth();
toWrite << iface->getPurpose();
toWrite << iface->getDirection();
@@ -451,6 +459,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
ReferenceInterface *iface = (ReferenceInterface *)(b.outputs.at(i));
if (iface->getPurpose() != AbstractInterface::Control) {
toWrite << iface->getName();
+ toWrite << iface->getType();
toWrite << iface->getWidth();
toWrite << iface->getPurpose();
toWrite << iface->getDirection();
@@ -461,6 +470,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
for(int i=0; i<b.bidirs.size(); i++){
ReferenceInterface *iface = (ReferenceInterface *)(b.bidirs.at(i));
toWrite << iface->getName();
+ toWrite << iface->getType();
toWrite << iface->getWidth();
toWrite << iface->getPurpose();
toWrite << iface->getDirection();
@@ -535,6 +545,9 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
iface = new ReferenceInterface(&b);
in >> txt;
iface->setName(txt);
+ int type;
+ in >> type;
+ iface->setType(type);
in >> txt;
iface->setWidth(txt);
in >> val;
@@ -561,6 +574,9 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
iface = new ReferenceInterface(&b);
in >> txt;
iface->setName(txt);
+ int type;
+ in >> type;
+ iface->setType(type);
in >> txt;
iface->setWidth(txt);
in >> val;
@@ -587,6 +603,9 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
iface = new ReferenceInterface(&b);
in >> txt;
iface->setName(txt);
+ int type;
+ in >> type;
+ iface->setType(type);
in >> txt;
iface->setWidth(txt);
in >> val;
@@ -609,3 +628,8 @@ void ReferenceBlock::computeOutputPattern(int nbExec) throw(Exception) {
// does strictly nothing
throw(Exception(INVALID_REFBLOCK_USE));
}
+
+void ReferenceBlock::computeAdmittanceDelays() throw(Exception) {
+ // does strictly nothing
+ throw(Exception(INVALID_REFBLOCK_USE));
+}
diff --git a/ReferenceBlock.h b/ReferenceBlock.h
index b1ebd84..baa8aaf 100644
--- a/ReferenceBlock.h
+++ b/ReferenceBlock.h
@@ -70,6 +70,7 @@ private:
// patterns
void checkInputPatternCompatibility() throw(Exception);
void computeOutputPattern(int nbExec = -1) throw(Exception);
+ void computeAdmittanceDelays() throw(Exception);
};
#endif // __REFERENCEBLOCK_H__
diff --git a/SourceItem.cpp b/SourceItem.cpp
index ca252c1..6c2b30d 100644
--- a/SourceItem.cpp
+++ b/SourceItem.cpp
@@ -630,7 +630,7 @@ void SourceItem::load(QDomElement funcElement) throw(Exception) {
BlockParameter *blockParam = NULL;
blockParam = functionalBlock->getParameterFromName(name);
if (blockParam == NULL) throw(Exception(PROJECTFILE_CORRUPTED));
- blockParam->setValue(value);
+ blockParam->setValue(value);
}
// recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars
diff --git a/VHDLConverter.cpp b/VHDLConverter.cpp
index 42fff3a..d3938b2 100644
--- a/VHDLConverter.cpp
+++ b/VHDLConverter.cpp
@@ -826,11 +826,12 @@ void VHDLConverter::replaceSignalNames(QString& line) {
void VHDLConverter::updateArchitecture() {
QRegularExpression rxLT("<=",QRegularExpression::CaseInsensitiveOption);
QRegularExpression rxGT("=>",QRegularExpression::CaseInsensitiveOption);
- foreach(QString line, archLines) {
+ for(int i=0;i<archLines.size();i++) {
+ QString line = archLines.at(i);
replaceSignalNames(line);
- line.replace(rxLT,"<=");
- line.replace(rxGT,"=>");
-
+ //line.replace(rxLT,"<=");
+ //line.replace(rxGT,"=>");
+ archLines.replace(i,line);
cout << qPrintable(line) << endl;
}
}
diff --git a/blast.creator.user b/blast.creator.user
index 25bfe7c..91a1bca 100755
--- a/blast.creator.user
+++ b/blast.creator.user
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.0, 2017-12-08T17:50:18. -->
+<!-- Written by QtCreator 4.2.0, 2018-01-15T00:01:27. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{3701e197-5b6c-48ea-9e98-a6cf6de18672}</value>
+ <value type="QByteArray">{c8006d66-d34f-42be-ad10-d0207752286d}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -61,7 +61,7 @@
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ed04208c-8774-456b-99b9-4a02094ca7a4}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{2c9bf876-3476-44eb-8065-1f0844704dda}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
diff --git a/blast.creator.user.3701e19 b/blast.creator.user.3701e19
new file mode 100755
index 0000000..95274be
--- /dev/null
+++ b/blast.creator.user.3701e19
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.2.0, 2017-10-13T10:38:54. -->
+<qtcreator>
+ <data>
+ <variable>EnvironmentId</variable>
+ <value type="QByteArray">{3701e197-5b6c-48ea-9e98-a6cf6de18672}</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">0</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+ <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+ <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+ <value type="QString" key="language">Cpp</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">qt2</value>
+ </valuemap>
+ </valuemap>
+ <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+ <value type="QString" key="language">QmlJS</value>
+ <valuemap type="QVariantMap" key="value">
+ <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+ </valuemap>
+ </valuemap>
+ <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+ <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+ <value type="int" key="EditorConfiguration.IndentSize">2</value>
+ <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+ <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+ <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+ <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+ <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+ <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+ <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+ <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+ <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+ <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+ <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+ <value type="int" key="EditorConfiguration.TabSize">4</value>
+ <value type="bool" key="EditorConfiguration.UseGlobal">false</value>
+ <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+ <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+ <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+ <value type="bool" key="EditorConfiguration.cleanWhitespace">false</value>
+ <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.PluginSettings</variable>
+ <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ed04208c-8774-456b-99b9-4a02094ca7a4}</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/sdomas/Projet/Blast/code/blast</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <valuelist type="QVariantList" key="GenericProjectManager.GenericMakeStep.BuildTargets">
+ <value type="QString">all</value>
+ </valuelist>
+ <value type="bool" key="GenericProjectManager.GenericMakeStep.Clean">false</value>
+ <value type="QString" key="GenericProjectManager.GenericMakeStep.MakeArguments"></value>
+ <value type="QString" key="GenericProjectManager.GenericMakeStep.MakeCommand"></value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <valuelist type="QVariantList" key="GenericProjectManager.GenericMakeStep.BuildTargets">
+ <value type="QString">clean</value>
+ </valuelist>
+ <value type="bool" key="GenericProjectManager.GenericMakeStep.Clean">true</value>
+ <value type="QString" key="GenericProjectManager.GenericMakeStep.MakeArguments"></value>
+ <value type="QString" key="GenericProjectManager.GenericMakeStep.MakeCommand"></value>
+ <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Défaut</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Défaut</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer localement</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+ <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
+ <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Exécutable personnalisé</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.TargetCount</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+ <value type="int">18</value>
+ </data>
+ <data>
+ <variable>Version</variable>
+ <value type="int">18</value>
+ </data>
+</qtcreator>
diff --git a/blast.files b/blast.files
index 22c212e..3c08c87 100755
--- a/blast.files
+++ b/blast.files
@@ -1,5 +1,9 @@
Exception.h
Exception.cpp
+AbstractInputModifier.h
+AbstractInputModifier.cpp
+DelayInputModifier.h
+DelayInputModifier.cpp
AbstractBlock.h
AbstractBlock.cpp
AbstractBoxItem.h
diff --git a/blastconfig.xml b/blastconfig.xml
index bc2d2bc..0abb637 100644
--- a/blastconfig.xml
+++ b/blastconfig.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<config>
- <categories nb="9">
+ <categories>
<category name="root" id="0" parent="-1"/>
<category name="math" id="1" parent="0"/>
<category name="trigonemetric" id="2" parent="1"/>
@@ -9,7 +9,8 @@
<category name="wishbone" id="5" parent="0"/>
<category name="generators" id="6" parent="0"/>
<category name="observers" id="7" parent="0"/>
- <category name="user" id="8" parent="0"/>
+ <category name="user" id="8" parent="0"/>
+ <category name="unclassified" id="99" parent="0"/>
</categories>
<references nb="2" lib_file="/home/sdomas/Projet/Blast/code/blast/lib/references/references.bmf" >
diff --git a/blastconfig.xsd b/blastconfig.xsd
index f254ff6..ef4a2fa 100644
--- a/blastconfig.xsd
+++ b/blastconfig.xsd
@@ -168,7 +168,6 @@
<xs:sequence>
<xs:element ref="category" maxOccurs="unbounded" />
</xs:sequence>
- <xs:attribute ref="nb" use="required"/>
</xs:complexType>
</xs:element>
diff --git a/boxfilter_3x3.vhd b/boxfilter_3x3.vhd
new file mode 100644
index 0000000..2998a41
--- /dev/null
+++ b/boxfilter_3x3.vhd
@@ -0,0 +1,421 @@
+-------------------------------------------------------------------------------
+--
+-- File : boxfilter_3x3.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a box (i.e. average) filter with a 3x3 mask
+-- on a grayscale image. The width of the image must be <= 1024.
+-- Image size must be provided via generics
+--
+-- Note :
+-- CP = 1{$img_width*$img_height}
+-- PP = 0{$img_width+7}1{$img_width*$img_height}
+-- PC = {$img_width+2:$img_width*$img_height-($img_width+2):1},{$img_width*$img_height:$img_width+2,0}
+-- delta = $img_width*$img_height
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity boxfilter_3x3 is
+ generic(
+ img_width : natural := 128;
+ img_height : natural := 128;
+ dsp_in_width : natural := 18;
+ dsp_out_width : natural := 36
+ );
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ pix_in : in std_logic_vector(7 downto 0);
+ pix_in_enb : in std_logic;
+ pix_out : out std_logic_vector(7 downto 0);
+ pix_out_enb : out std_logic
+ );
+end boxfilter_3x3;
+
+
+architecture rtl of boxfilter_3x3 is
+
+ component ram_dp_1024x8
+ port (
+ clka : in std_logic;
+ wea : in std_logic_vector(0 downto 0);
+ addra : in std_logic_vector(9 downto 0);
+ dina : in std_logic_vector(7 downto 0);
+ douta : out std_logic_vector(7 downto 0);
+ clkb : in std_logic;
+ web : in std_logic_vector(0 downto 0);
+ addrb : in std_logic_vector(9 downto 0);
+ dinb : in std_logic_vector(7 downto 0);
+ doutb : out std_logic_vector(7 downto 0)
+ );
+ end component;
+
+ -- Signals
+
+ -- constant signal set tup to img limits
+ signal count_col_end : unsigned (9 downto 0);
+ signal count_row_end : unsigned (9 downto 0);
+
+ -- for storing image rows
+ signal sel_mem : unsigned (1 downto 0); -- the current memorize row
+ signal wea_0 : std_logic_vector(0 downto 0); -- we for memorized row 0
+ signal wea_1 : std_logic_vector(0 downto 0); -- we for memorized row 1
+ signal wea_2 : std_logic_vector(0 downto 0); -- we for memorized row 2
+
+ signal dina_0 : std_logic_vector(7 downto 0);
+ signal dina_1 : std_logic_vector(7 downto 0);
+ signal dina_2 : std_logic_vector(7 downto 0);
+ signal dina : std_logic_vector(7 downto 0);
+
+ signal addra_w : std_logic_vector(9 downto 0);
+ signal addra_w_s : unsigned (9 downto 0);
+ signal wea : std_logic;
+
+
+ signal addrb_r : std_logic_vector(9 downto 0); -- addr where to store
+ signal addrb_r_s : unsigned (9 downto 0); -- addr where to store
+
+ signal doutb_0 : std_logic_vector(7 downto 0);
+ signal doutb_1 : std_logic_vector(7 downto 0);
+ signal doutb_2 : std_logic_vector(7 downto 0);
+
+ signal count_row_w : unsigned (10 downto 0); -- row counter while storing
+ signal store_last_pix : std_logic; -- to be sure that last pixel is stored
+ signal first_row_w : std_logic; -- '1' when the first row is read so that
+ -- mem_0 is filled with zeroes
+ signal all_pix_stored : std_logic; -- '1' when all pixels have been stored
+
+ -- for reading image rows
+ signal start_read : std_logic;
+ signal do_read : std_logic;
+ signal count_row_r : unsigned (10 downto 0);
+ signal count_row_r_dly : unsigned (10 downto 0);
+ signal wea_dly : std_logic;
+ signal end_read : std_logic;
+
+ -- for doing sums
+ signal do_sum : std_logic;
+ signal sum1 : unsigned (9 downto 0);
+ signal sum2 : unsigned (9 downto 0);
+ signal sum3 : unsigned (9 downto 0);
+
+ -- for doing total
+ signal do_total : std_logic;
+ signal sum : unsigned (dsp_in_width-1 downto 0);
+ signal count_col_total : unsigned (10 downto 0);
+ signal count_row_total : unsigned (10 downto 0);
+ signal jump_first_sum : std_logic;
+
+ -- for doing final division
+ signal do_div : std_logic;
+ signal do_out : std_logic;
+ signal end_filter : std_logic;
+ signal cst_mult : unsigned(dsp_in_width-1 downto 0); -- eq. 14564 (=2^17/9)
+ signal mult_result : unsigned (dsp_out_width-1 downto 0);
+
+
+begin
+
+ img_row_0 : ram_dp_1024x8
+ port map (
+ clka => clk,
+ wea => wea_0,
+ addra => addra_w,
+ dina => dina_0,
+ clkb => clk,
+ web => (others => '0'),
+ addrb => addrb_r,
+ dinb => (others => '0'),
+ doutb => doutb_0
+ );
+ img_row_1 : ram_dp_1024x8
+ port map (
+ clka => clk,
+ wea => wea_1,
+ addra => addra_w,
+ dina => dina_1,
+ clkb => clk,
+ web => (others => '0'),
+ addrb => addrb_r,
+ dinb => (others => '0'),
+ doutb => doutb_1
+ );
+ img_row_2 : ram_dp_1024x8
+ port map (
+ clka => clk,
+ wea => wea_2,
+ addra => addra_w,
+ dina => dina_2,
+ clkb => clk,
+ web => (others => '0'),
+ addrb => addrb_r,
+ dinb => (others => '0'),
+ doutb => doutb_2
+ );
+
+
+ cst_mult <= to_unsigned(14564, dsp_in_width);
+ count_col_end <= to_unsigned(img_width-1, 10);
+ count_row_end <= to_unsigned(img_height-1, 10);
+
+ addra_w <= std_logic_vector(addra_w_s);
+ addrb_r <= std_logic_vector(addrb_r_s);
+
+ wea_0 <= "1" when ((sel_mem = 0 or first_row_w = '1') and wea = '1') else
+ "0";
+ wea_1 <= "1" when (sel_mem = 1 and wea = '1') else
+ "0";
+ wea_2 <= "1" when (sel_mem = 2 and wea = '1') else
+ "0";
+
+ dina_0 <= (others => '0') when (first_row_w = '1') else
+ dina;
+
+ dina_1 <= dina;
+ dina_2 <= dina;
+
+ store_row_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ sel_mem <= to_unsigned(0, 2);
+ addra_w_s <= to_unsigned(img_width-1, 10);
+ dina <= (others => '0');
+
+ wea <= '0';
+ count_row_w <= to_unsigned(0, 11);
+
+ start_read <= '0';
+ first_row_w <= '1';
+ store_last_pix <= '0';
+ all_pix_stored <= '0';
+
+ elsif rising_edge(clk) then
+
+ wea <= '0';
+ start_read <= '0';
+ dina <= (others => '0');
+ store_last_pix <= '0';
+
+ -- reset all when filter has ended
+ if end_filter = '1' then
+
+ count_row_w <= to_unsigned(0, 11);
+ sel_mem <= to_unsigned(0, 2);
+ addra_w_s <= to_unsigned(img_width-1, 10);
+ first_row_w <= '1';
+ all_pix_stored <= '0';
+
+ elsif store_last_pix = '1' then
+ addra_w_s <= to_unsigned(0, 10);
+ -- select next ram
+ if sel_mem = 2 then
+ sel_mem <= to_unsigned(0, 2);
+ else
+ sel_mem <= sel_mem + 1;
+ end if;
+ all_pix_stored <= '1'; -- all pixels are stored
+
+ elsif pix_in_enb = '1' then
+
+ -- prepare to write
+ wea <= '1';
+ -- take input
+ dina <= pix_in;
+ -- check if this is the last pixel
+ if addra_w_s = img_width-2 and count_row_w = img_height then
+ store_last_pix <= '1';
+ end if;
+ -- if at line end
+ if addra_w_s = img_width-1 then
+ -- back to 0
+ addra_w_s <= to_unsigned(0, 10);
+ -- select next ram
+ if sel_mem = 2 then
+ sel_mem <= to_unsigned(0, 2);
+ else
+ sel_mem <= sel_mem + 1;
+ end if;
+ -- end of first line to store
+ if count_row_w = 1 then
+ first_row_w <= '0';
+ start_read <= '1';
+ end if;
+ count_row_w <= count_row_w + 1;
+ else
+ addra_w_s <= addra_w_s + 1;
+ end if;
+ end if;
+ end if;
+
+ end process store_row_process;
+
+ read_rows_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ addrb_r_s <= to_unsigned(0, 10);
+ do_read <= '0';
+ wea_dly <= '0';
+
+ count_row_r <= to_unsigned(0, 11);
+ end_read <= '0';
+
+ do_sum <= '0';
+
+ elsif rising_edge(clk) then
+
+ wea_dly <= wea;
+ do_sum <= '0';
+ end_read <= '0';
+
+ if end_read = '1' then
+ do_sum <= '1';
+ end if;
+
+ if start_read = '1' then
+ do_read <= '1';
+
+ elsif do_read = '1' and (all_pix_stored = '1' or wea_dly = '1') then
+
+ do_sum <= '1';
+ -- whatever the case inc addr if not at end
+ if addrb_r_s = img_width-1 then
+ addrb_r_s <= to_unsigned(0, 10);
+ if count_row_r = img_height-1 then
+ count_row_r <= to_unsigned(0, 11);
+ do_read <= '0';
+ end_read <= '1';
+ else
+ count_row_r <= count_row_r+1;
+ end if;
+ else
+ addrb_r_s <= addrb_r_s + 1;
+ end if;
+ end if;
+ end if;
+
+ end process read_rows_process;
+
+ sum_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ sum1 <= to_unsigned(0, 10);
+ sum2 <= to_unsigned(0, 10);
+ sum3 <= to_unsigned(0, 10);
+ count_row_r_dly <= to_unsigned(0, 11);
+ do_total <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_total <= '0';
+ count_row_r_dly <= count_row_r;
+
+ if end_filter = '1' then
+ sum1 <= to_unsigned(0, 10);
+ sum2 <= to_unsigned(0, 10);
+ sum3 <= to_unsigned(0, 10);
+ end if;
+ if do_sum = '1' then
+
+ sum3 <= sum2;
+ sum2 <= sum1;
+ if count_row_r_dly = img_height-1 then
+ if sel_mem = 0 then
+ sum1 <= unsigned("00" & doutb_1) + unsigned("00" & doutb_2);
+ elsif sel_mem = 1 then
+ sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_2);
+ elsif sel_mem = 2 then
+ sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_1);
+ end if;
+ else
+ sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_1) + unsigned("00" & doutb_2);
+ end if;
+ do_total <= '1';
+ end if;
+ end if;
+
+ end process sum_process;
+
+ total_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ sum <= to_unsigned(0, dsp_in_width);
+
+ jump_first_sum <= '0';
+ count_row_total <= to_unsigned(0, 11);
+ count_col_total <= to_unsigned(0, 11);
+ do_div <= '0';
+ end_filter <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_div <= '0';
+ end_filter <= '0';
+
+ if do_total = '1' then
+
+ if jump_first_sum = '1' then
+ -- sum for the end of the line
+ if count_col_total = img_width-1 then
+ sum <= resize(sum2, dsp_in_width) + resize(sum3, dsp_in_width);
+ count_col_total <= to_unsigned(0, 11);
+ if count_row_total = img_height-1 then
+ end_filter <= '1';
+ count_row_total <= to_unsigned(0, 11);
+ jump_first_sum <= '0';
+ else
+ count_row_total <= count_row_total + 1;
+ end if;
+ -- sum for the begining of the line
+ elsif count_col_total = 0 then
+ sum <= resize(sum1, dsp_in_width) + resize(sum2, dsp_in_width);
+ count_col_total <= to_unsigned(1, 11);
+ else
+ sum <= resize(sum1, dsp_in_width) + resize(sum2, dsp_in_width) + resize(sum3, dsp_in_width);
+ count_col_total <= count_col_total + 1;
+ end if;
+ do_div <= '1';
+ else
+ jump_first_sum <= '1';
+ end if;
+ end if;
+
+
+ end if;
+
+ end process total_process;
+
+ final_div_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ mult_result <= to_unsigned(0, dsp_out_width);
+ do_out <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_out <= '0';
+
+ if do_div = '1' then
+ mult_result <= sum * cst_mult;
+ do_out <= '1';
+ end if;
+ end if;
+ end process final_div_process;
+
+ pix_out <= std_logic_vector(mult_result(24 downto 17));
+ pix_out_enb <= do_out;
+
+end rtl;
+
diff --git a/checker.vhd b/checker.vhd
new file mode 100644
index 0000000..82ca1d3
--- /dev/null
+++ b/checker.vhd
@@ -0,0 +1,94 @@
+-------------------------------------------------------------------------------
+--
+-- File : checker.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a threshold on an input
+--
+--
+-- Note : The input is compared to one (or two) values and depending
+-- on the result and the type of the comparison, the check output
+-- is asserted to 1 or not.
+-- The values are fixed by generic parameter.
+-- The type of check is fixed by a generic paramter
+-- type 1 : test if lesser or equal than X
+-- type 2 : test if gretar or equal than X
+-- type 3 : test if greater or equal than X and lesser or equal than Y
+--
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity checker is
+ generic(
+ in_width : natural := 8;
+ check_type : natural := 1;
+ inf_value : natural := 0;
+ sup_value : natural := 0
+ );
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ data_in : in std_logic_vector(in_width-1 downto 0);
+ data_in_enb : in std_logic;
+ data_out : out std_logic_vector(in_width-1 downto 0);
+ data_out_enb : out std_logic;
+ check_out : out std_logic;
+ check_out_enb : out std_logic
+ );
+end checker;
+
+
+architecture rtl of checker is
+
+begin
+
+ check_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ check_out <= '0';
+ data_out <= (others => '0');
+ data_out_enb <= '0';
+ check_out_enb <= '0';
+
+ elsif rising_edge(clk) then
+
+ check_out <= '0';
+ data_out <= (others => '0');
+ data_out_enb <= '0';
+ check_out_enb <= '0';
+
+ if data_in_enb = '1' then
+
+ data_out <= data_in;
+ data_out_enb <= '1';
+ check_out_enb <= '1';
+
+ if check_type = 1 then
+ if unsigned(data_in) <= inf_value then
+ check_out <= '1';
+ end if;
+ elsif check_type = 2 then
+ if unsigned(data_in) >= inf_value then
+ check_out <= '1';
+ end if;
+ elsif check_type = 3 then
+ if unsigned(data_in) >= inf_value and unsigned(data_in) <= sup_value then
+ check_out <= '1';
+ end if;
+ end if;
+ end if;
+ end if;
+
+ end process check_process;
+
+end rtl;
+
diff --git a/deserializer_3x1.vhd b/deserializer_3x1.vhd
new file mode 100644
index 0000000..aaccecc
--- /dev/null
+++ b/deserializer_3x1.vhd
@@ -0,0 +1,96 @@
+-------------------------------------------------------------------------------
+--
+-- File : deserializer_3x1.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a deserialization of 3 element into
+-- 3 parallel outputs
+--
+--
+-- Note :
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity deserializer_3x1 is
+ generic(
+ in_width : natural := 8
+ );
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ data_in : in std_logic_vector(in_width-1 downto 0);
+ data_in_enb : in std_logic;
+ data1_out : out std_logic_vector(in_width-1 downto 0);
+ data1_out_enb : out std_logic;
+ data2_out : out std_logic_vector(in_width-1 downto 0);
+ data2_out_enb : out std_logic;
+ data3_out : out std_logic_vector(in_width-1 downto 0);
+ data3_out_enb : out std_logic
+
+ );
+end deserializer_3x1;
+
+
+architecture rtl of deserializer_3x1 is
+
+ -- Signals
+ signal do_out : std_logic;
+ signal data1_reg : std_logic_vector(in_width-1 downto 0);
+ signal data2_reg : std_logic_vector(in_width-1 downto 0);
+
+ signal count : unsigned(1 downto 0);
+
+begin
+
+ deser_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ count <= to_unsigned(0, 2);
+ data1_reg <= (others => '0');
+ data2_reg <= (others => '0');
+ data1_out <= (others => '0');
+ data2_out <= (others => '0');
+ data3_out <= (others => '0');
+ do_out <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_out <= '0';
+ data1_out <= (others => '0');
+ data2_out <= (others => '0');
+ data3_out <= (others => '0');
+
+ if data_in_enb = '1' then
+
+ if count = 0 then
+ data1_reg <= data_in;
+ count <= count + 1;
+ elsif count = 1 then
+ data2_reg <= data_in;
+ count <= count + 1;
+ elsif count = 2 then
+ data1_out <= data1_reg;
+ data2_out <= data2_reg;
+ data3_out <= data_in;
+ do_out <= '1';
+ count <= to_unsigned(0, 2);
+ end if;
+ end if;
+ end if;
+
+ end process deser_process;
+
+ data1_out_enb <= do_out;
+ data2_out_enb <= do_out;
+ data3_out_enb <= do_out;
+
+end rtl;
+
diff --git a/lib/implementations/boxfilter_3x3_impl.xml b/lib/implementations/boxfilter_3x3_impl.xml
new file mode 100644
index 0000000..6776fc1
--- /dev/null
+++ b/lib/implementations/boxfilter_3x3_impl.xml
@@ -0,0 +1,402 @@
+<!DOCTYPE boxfilter_3x3>
+<block_impl ref_name="boxfilter_3x3.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>frdfgdr</description>
+ <notes>gregre</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+component ram_dp_1024x8
+port (
+clka : in std_logic;
+wea : in std_logic_vector(0 downto 0);
+addra : in std_logic_vector(9 downto 0);
+dina : in std_logic_vector(7 downto 0);
+douta : out std_logic_vector(7 downto 0);
+clkb : in std_logic;
+web : in std_logic_vector(0 downto 0);
+addrb : in std_logic_vector(9 downto 0);
+dinb : in std_logic_vector(7 downto 0);
+doutb : out std_logic_vector(7 downto 0)
+);
+end component;
+
+-- Signals
+
+-- constant signal set tup to img limits
+signal count_col_end : unsigned (9 downto 0);
+signal count_row_end : unsigned (9 downto 0);
+
+-- for storing image rows
+signal sel_mem : unsigned (1 downto 0); -- the current memorize row
+signal wea_0 : std_logic_vector(0 downto 0); -- we for memorized row 0
+signal wea_1 : std_logic_vector(0 downto 0); -- we for memorized row 1
+signal wea_2 : std_logic_vector(0 downto 0); -- we for memorized row 2
+
+signal dina_0 : std_logic_vector(7 downto 0);
+signal dina_1 : std_logic_vector(7 downto 0);
+signal dina_2 : std_logic_vector(7 downto 0);
+signal dina : std_logic_vector(7 downto 0);
+
+signal addra_w : std_logic_vector(9 downto 0);
+signal addra_w_s : unsigned (9 downto 0);
+signal wea : std_logic;
+
+
+signal addrb_r : std_logic_vector(9 downto 0); -- addr where to store
+signal addrb_r_s : unsigned (9 downto 0); -- addr where to store
+
+signal doutb_0 : std_logic_vector(7 downto 0);
+signal doutb_1 : std_logic_vector(7 downto 0);
+signal doutb_2 : std_logic_vector(7 downto 0);
+
+signal count_row_w : unsigned (10 downto 0); -- row counter while storing
+signal store_last_pix : std_logic; -- to be sure that last pixel is stored
+signal first_row_w : std_logic; -- '1' when the first row is read so that
+-- mem_0 is filled with zeroes
+signal all_pix_stored : std_logic; -- '1' when all pixels have been stored
+
+-- for reading image rows
+signal start_read : std_logic;
+signal do_read : std_logic;
+signal count_row_r : unsigned (10 downto 0);
+signal count_row_r_dly : unsigned (10 downto 0);
+signal wea_dly : std_logic;
+signal end_read : std_logic;
+
+-- for doing sums
+signal do_sum : std_logic;
+signal sum1 : unsigned (9 downto 0);
+signal sum2 : unsigned (9 downto 0);
+signal sum3 : unsigned (9 downto 0);
+
+-- for doing total
+signal do_total : std_logic;
+signal sum : unsigned (dsp_in_width-1 downto 0);
+signal count_col_total : unsigned (10 downto 0);
+signal count_row_total : unsigned (10 downto 0);
+signal jump_first_sum : std_logic;
+
+-- for doing final division
+signal do_div : std_logic;
+signal do_out : std_logic;
+signal end_filter : std_logic;
+signal cst_mult : unsigned(dsp_in_width-1 downto 0); -- eq. 14564 (=2^17/9)
+signal mult_result : unsigned (dsp_out_width-1 downto 0);
+
+
+begin
+
+img_row_0 : ram_dp_1024x8
+port map (
+clka => @{clk},
+wea => wea_0,
+addra => addra_w,
+dina => dina_0,
+clkb => @{clk},
+web => (others => '0'),
+addrb => addrb_r,
+dinb => (others => '0'),
+doutb => doutb_0
+);
+img_row_1 : ram_dp_1024x8
+port map (
+clka => @{clk},
+wea => wea_1,
+addra => addra_w,
+dina => dina_1,
+clkb => @{clk},
+web => (others => '0'),
+addrb => addrb_r,
+dinb => (others => '0'),
+doutb => doutb_1
+);
+img_row_2 : ram_dp_1024x8
+port map (
+clka => @{clk},
+wea => wea_2,
+addra => addra_w,
+dina => dina_2,
+clkb => @{clk},
+web => (others => '0'),
+addrb => addrb_r,
+dinb => (others => '0'),
+doutb => doutb_2
+);
+
+
+cst_mult <= to_unsigned(14564, dsp_in_width);
+count_col_end <= to_unsigned(img_width-1, 10);
+count_row_end <= to_unsigned(img_height-1, 10);
+
+addra_w <= std_logic_vector(addra_w_s);
+addrb_r <= std_logic_vector(addrb_r_s);
+
+wea_0 <= "1" when ((sel_mem = 0 or first_row_w = '1') and wea = '1') else
+"0";
+wea_1 <= "1" when (sel_mem = 1 and wea = '1') else
+"0";
+wea_2 <= "1" when (sel_mem = 2 and wea = '1') else
+"0";
+
+dina_0 <= (others => '0') when (first_row_w = '1') else
+dina;
+
+dina_1 <= dina;
+dina_2 <= dina;
+
+store_row_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+sel_mem <= to_unsigned(0, 2);
+addra_w_s <= to_unsigned(img_width-1, 10);
+dina <= (others => '0');
+
+wea <= '0';
+count_row_w <= to_unsigned(0, 11);
+
+start_read <= '0';
+first_row_w <= '1';
+store_last_pix <= '0';
+all_pix_stored <= '0';
+
+elsif rising_edge(@{clk}) then
+
+wea <= '0';
+start_read <= '0';
+dina <= (others => '0');
+store_last_pix <= '0';
+
+-- @{reset} all when filter has ended
+if end_filter = '1' then
+
+count_row_w <= to_unsigned(0, 11);
+sel_mem <= to_unsigned(0, 2);
+addra_w_s <= to_unsigned(img_width-1, 10);
+first_row_w <= '1';
+all_pix_stored <= '0';
+
+elsif store_last_pix = '1' then
+addra_w_s <= to_unsigned(0, 10);
+-- select next ram
+if sel_mem = 2 then
+sel_mem <= to_unsigned(0, 2);
+else
+sel_mem <= sel_mem + 1;
+end if;
+all_pix_stored <= '1'; -- all pixels are stored
+
+elsif @{pix_in_enb} = '1' then
+
+-- prepare to write
+wea <= '1';
+-- take input
+dina <= @{pix_in};
+-- check if this is the last pixel
+if addra_w_s = img_width-2 and count_row_w = img_height then
+store_last_pix <= '1';
+end if;
+-- if at line end
+if addra_w_s = img_width-1 then
+-- back to 0
+addra_w_s <= to_unsigned(0, 10);
+-- select next ram
+if sel_mem = 2 then
+sel_mem <= to_unsigned(0, 2);
+else
+sel_mem <= sel_mem + 1;
+end if;
+-- end of first line to store
+if count_row_w = 1 then
+first_row_w <= '0';
+start_read <= '1';
+end if;
+count_row_w <= count_row_w + 1;
+else
+addra_w_s <= addra_w_s + 1;
+end if;
+end if;
+end if;
+
+end process store_row_process;
+
+read_rows_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+addrb_r_s <= to_unsigned(0, 10);
+do_read <= '0';
+wea_dly <= '0';
+
+count_row_r <= to_unsigned(0, 11);
+end_read <= '0';
+
+do_sum <= '0';
+
+elsif rising_edge(@{clk}) then
+
+wea_dly <= wea;
+do_sum <= '0';
+end_read <= '0';
+
+if end_read = '1' then
+do_sum <= '1';
+end if;
+
+if start_read = '1' then
+do_read <= '1';
+
+elsif do_read = '1' and (all_pix_stored = '1' or wea_dly = '1') then
+
+do_sum <= '1';
+-- whatever the case inc addr if not at end
+if addrb_r_s = img_width-1 then
+addrb_r_s <= to_unsigned(0, 10);
+if count_row_r = img_height-1 then
+count_row_r <= to_unsigned(0, 11);
+do_read <= '0';
+end_read <= '1';
+else
+count_row_r <= count_row_r+1;
+end if;
+else
+addrb_r_s <= addrb_r_s + 1;
+end if;
+end if;
+end if;
+
+end process read_rows_process;
+
+sum_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+sum1 <= to_unsigned(0, 10);
+sum2 <= to_unsigned(0, 10);
+sum3 <= to_unsigned(0, 10);
+count_row_r_dly <= to_unsigned(0, 11);
+do_total <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_total <= '0';
+count_row_r_dly <= count_row_r;
+
+if end_filter = '1' then
+sum1 <= to_unsigned(0, 10);
+sum2 <= to_unsigned(0, 10);
+sum3 <= to_unsigned(0, 10);
+end if;
+if do_sum = '1' then
+
+sum3 <= sum2;
+sum2 <= sum1;
+if count_row_r_dly = img_height-1 then
+if sel_mem = 0 then
+sum1 <= unsigned("00" & doutb_1) + unsigned("00" & doutb_2);
+elsif sel_mem = 1 then
+sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_2);
+elsif sel_mem = 2 then
+sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_1);
+end if;
+else
+sum1 <= unsigned("00" & doutb_0) + unsigned("00" & doutb_1) + unsigned("00" & doutb_2);
+end if;
+do_total <= '1';
+end if;
+end if;
+
+end process sum_process;
+
+total_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+sum <= to_unsigned(0, dsp_in_width);
+
+jump_first_sum <= '0';
+count_row_total <= to_unsigned(0, 11);
+count_col_total <= to_unsigned(0, 11);
+do_div <= '0';
+end_filter <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_div <= '0';
+end_filter <= '0';
+
+if do_total = '1' then
+
+if jump_first_sum = '1' then
+-- sum for the end of the line
+if count_col_total = img_width-1 then
+sum <= resize(sum2, dsp_in_width) + resize(sum3, dsp_in_width);
+count_col_total <= to_unsigned(0, 11);
+if count_row_total = img_height-1 then
+end_filter <= '1';
+count_row_total <= to_unsigned(0, 11);
+jump_first_sum <= '0';
+else
+count_row_total <= count_row_total + 1;
+end if;
+-- sum for the begining of the line
+elsif count_col_total = 0 then
+sum <= resize(sum1, dsp_in_width) + resize(sum2, dsp_in_width);
+count_col_total <= to_unsigned(1, 11);
+else
+sum <= resize(sum1, dsp_in_width) + resize(sum2, dsp_in_width) + resize(sum3, dsp_in_width);
+count_col_total <= count_col_total + 1;
+end if;
+do_div <= '1';
+else
+jump_first_sum <= '1';
+end if;
+end if;
+
+
+end if;
+
+end process total_process;
+
+final_div_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+mult_result <= to_unsigned(0, dsp_out_width);
+do_out <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_out <= '0';
+
+if do_div = '1' then
+mult_result <= sum * cst_mult;
+do_out <= '1';
+end if;
+end if;
+end process final_div_process;
+
+@{pix_out} <= std_logic_vector(mult_result(24 downto 17));
+@{pix_out_enb} <= do_out;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="$img_width*$img_height"/>
+ <consumption>
+ <input pattern="1{$img_width*$img_height}" name="pix_in_enb"/>
+ </consumption>
+ <production counter="{$img_width+2:$img_width*$img_height-($img_width+2):1},{$img_width*$img_height:$img_width+2:0}">
+ <output pattern="0{$img_width+7}1{$img_width*$img_height}" name="pix_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/implementations/checker_impl.xml b/lib/implementations/checker_impl.xml
new file mode 100644
index 0000000..2f6167a
--- /dev/null
+++ b/lib/implementations/checker_impl.xml
@@ -0,0 +1,71 @@
+<!DOCTYPE checker>
+<block_impl ref_name="checker.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>frdfgdr</description>
+ <notes>gre</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+begin
+
+check_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+@{check_out} <= '0';
+@{data_out} <= (others => '0');
+@{data_out_enb} <= '0';
+@{check_out_enb} <= '0';
+
+elsif rising_edge(@{clk}) then
+
+@{check_out} <= '0';
+@{data_out} <= (others => '0');
+@{data_out_enb} <= '0';
+@{check_out_enb} <= '0';
+
+if @{data_in_enb} = '1' then
+
+@{data_out} <= @{data_in};
+@{data_out_enb} <= '1';
+@{check_out_enb} <= '1';
+
+if check_type = 1 then
+if unsigned(@{data_in}) <= inf_value then
+@{check_out} <= '1';
+end if;
+elsif check_type = 2 then
+if unsigned(@{data_in}) >= inf_value then
+@{check_out} <= '1';
+end if;
+elsif check_type = 3 then
+if unsigned(@{data_in}) >= inf_value and unsigned(@{data_in}) <= sup_value then
+@{check_out} <= '1';
+end if;
+end if;
+end if;
+end if;
+
+end process check_process;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="1"/>
+ <consumption>
+ <input pattern="1" name="data_in_enb"/>
+ </consumption>
+ <production counter="1">
+ <output pattern="01" name="data_out_enb"/>
+ <output pattern="01" name="check_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/implementations/csvreader_impl.xml b/lib/implementations/csvreader_impl.xml
new file mode 100644
index 0000000..2ea85fe
--- /dev/null
+++ b/lib/implementations/csvreader_impl.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<block_impl ref_name="csvreader.xml" ref_md5="">
+ <comments>
+ <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
+ <date creation="2015-05-10" />
+ <related_files list=""/>
+ <description>
+ This component read data in a CSV file
+ </description>
+ <notes>
+ No notes
+ </notes>
+ </comments>
+
+ <libraries>
+ <library name="IEEE">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+
+ <architecture>
+
+ </architecture>
+
+ <patterns>
+ <delta value="$row_length*$nb_row" />
+ <consumption>
+ </consumption>
+ <production counter="1">
+ <output name="data_out_enb" pattern="$out_pattern" />
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/implementations/deserializer_3x1_impl.xml b/lib/implementations/deserializer_3x1_impl.xml
new file mode 100644
index 0000000..83971ef
--- /dev/null
+++ b/lib/implementations/deserializer_3x1_impl.xml
@@ -0,0 +1,81 @@
+<!DOCTYPE deserializer_3x1>
+<block_impl ref_name="deserializer_3x1.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>gre</description>
+ <notes>gre</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+-- Signals
+signal do_out : std_logic;
+signal data1_reg : std_logic_vector(in_width-1 downto 0);
+signal data2_reg : std_logic_vector(in_width-1 downto 0);
+
+signal count : unsigned(1 downto 0);
+
+begin
+
+deser_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+count <= to_unsigned(0, 2);
+data1_reg <= (others => '0');
+data2_reg <= (others => '0');
+@{data1_out} <= (others => '0');
+@{data2_out} <= (others => '0');
+@{data3_out} <= (others => '0');
+do_out <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_out <= '0';
+@{data1_out} <= (others => '0');
+@{data2_out} <= (others => '0');
+@{data3_out} <= (others => '0');
+
+if @{data_in_enb} = '1' then
+
+if count = 0 then
+data1_reg <= @{data_in};
+count <= count + 1;
+elsif count = 1 then
+data2_reg <= @{data_in};
+count <= count + 1;
+elsif count = 2 then
+@{data1_out} <= data1_reg;
+@{data2_out} <= data2_reg;
+@{data3_out} <= @{data_in};
+do_out <= '1';
+count <= to_unsigned(0, 2);
+end if;
+end if;
+end if;
+
+end process deser_process;
+
+@{data1_out_enb} <= do_out;
+@{data2_out_enb} <= do_out;
+@{data3_out_enb} <= do_out;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="3"/>
+ <consumption>
+ <input pattern="111" name="data_in_enb"/>
+ </consumption>
+ <production counter="3">
+ <output pattern="0001" name="data1_out_enb"/>
+ <output pattern="0001" name="data2_out_enb"/>
+ <output pattern="0001" name="data3_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/implementations/impls.bmf b/lib/implementations/impls.bmf
index 7ae3752f89f21899892faa7c712aebefe21a0e54..4c1682a3c986cd5ebd474039dbd230bbed4f6f3d 100644
GIT binary patch
literal 5582
zcmd6r%}x_h6vxk0LktT-3^t}QEQldRs6bh0*lAd}G9(&TCQVB#6rn|01vO200v0Y@
zxNu=y`vfdq`5ZoozjJS=bMJf<)ZjQ|U}o+)=brOFpBIrEKSX4j`zQAoS(Y8?%D%LC
z>Pgc)*Lhl&O*!Okmz6$m4`omEyFPF6y=gca&euI@OM}%m(hm6EGEzHm)VbU6bd20O
zt1qM~_oO06a8#hPl3VOp8}Z+jV^;Ria-Q{ZJP{?t@hdpt%O~{u_jbMkgF|%R=5IwF
zW6xTueY4P{(fW2x%WV*BAfXApqAC(_&y3y`yBd2bl}J%m<$Z!@kiyk<xNgac`N`s~
zBC{&%3Aq(^Tjw6gQesUCC+zw;2Ol(ux?`fPO&s-&H){AG%MWwlmPPOTLT%JI-v+rO
zo|;JCkvq=U9d>K8zQaoBrvttm!_me=k)NtVKV4j2=))peVI_9uHTy&|H}RqRJ}GmN
zyc_({j%S$?Z9F9R%EF@}<qX}bvM`FGbp5krYD6YASTwP^g2fV4@xzB4VsMKXXi+m?
z4&zU?)cP1jRFPGeCR#ydDc~&|K}9dq-59bo1?WnStQyhm$Hi6RLZ#hwBxTVUnZXj&
zA9F#iM@>8gvpTwFbq2LIPUoXHPh4mpJ0d%@Cw0ilFjs9gwX2xPrS)_iHaC$L;&ouE
zu&pW`_$*$}c*>*OC`MZ*1GG1Eu~|D#S~s0FcqVCm+-9&e>^4^N;wTQYI!<X=SCV{T
z#d0~_u2V8`X=|3xt(-Qx&v-h`ArckYee%dw?s)EAH)z^*A3@Z0ui%uouQ}=8Ga1w-
zVs%P;XWnclTuqIUvaxC$mv3u<u6kaLnjkv#N8}23i5=_|qcc&MQ{n7#&CDRSRz;Mm
z>%}Om=TI7bgGcC*$5f*8V8{3%%2lmn+QF0EVb08t>GZxAisY>N>=km{T8Eij@mbN$
zKb_pP-==X7MzciINcClFesUF_^6P)WGMoc0ilwFZvE0a<QKEjLbD!e8FlO>oa5Ubh
z%&h2QzR3<2^-$kvk_<5qJ6E{VfW6$g$el9P6I14VaQVCFIqkA{vHf%xtMZ7eJ?z^i
z8@Ei&tjPnq=>}G(pWx<*gDiSKu52&Uh=}G4TZ5DHTts1a9Y>)R&p%h#oz9zR!imsQ
ze@Cx8W@PQ3dP37#uW2la_t~Q9!4Zv*Dr&n|Q06U<s5vBN8pKGCY2iM0=p<I-TQAk7
zIi|EMdf&dNzs?MK;@*zBtF7~P&v>_-9QIY)S#1}54p!fCm`l=ae@n(SxV6Hpk#SG>
zKU7**tY%=B#{YL%mc*4AM|66GsA6j8n@KcZ8r~92fNvf-)ibrLPYh<Ao{Ge!*0+!*
zj#GH<bf<RrKTJ`DaVgxs;8mAk6D0DOfc3nmC&?avyVM!2FfB5)kM(`t)8ebl%6P6c
ZwDbgCG$;KQXZ(1MTD;CX#s5ad{sl#QqHq8J
delta 126
zcmX@7y+nkAfq_ebfq{WzBFAgi1wh8Ei2|jQa~ZeT+AtUZp$3B?kkkaz)eJ@qwLqRB
zkYCN9!jQ+1#1PMr!jQ;N0>mI05HtkA$#zT@n-kcjnKtus=P^xw$eT8~8i?KbGAGLk
LoZMV2%+3e^E~OhA
diff --git a/lib/implementations/logical_AND_3_impl.xml b/lib/implementations/logical_AND_3_impl.xml
new file mode 100644
index 0000000..71aedf6
--- /dev/null
+++ b/lib/implementations/logical_AND_3_impl.xml
@@ -0,0 +1,54 @@
+<!DOCTYPE logical_AND_3>
+<block_impl ref_name="logical_AND_3.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>yt</description>
+ <notes>hyjt</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+begin
+
+and_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+@{data_out} <= '0';
+@{data_out_enb} <= '0';
+
+elsif rising_edge(@{clk}) then
+
+@{data_out} <= '0';
+@{data_out_enb} <= '0';
+
+if @{data1_in_enb} = '1' and @{data2_in_enb} = '1' and @{data3_in_enb} = '1' then
+
+@{data_out} <= @{data1_in} and @{data2_in} and @{data3_in};
+@{data_out_enb} <= '1';
+
+end if;
+end if;
+
+end process and_process;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="1"/>
+ <consumption>
+ <input pattern="1" name="data1_in_enb"/>
+ <input pattern="1" name="data2_in_enb"/>
+ <input pattern="1" name="data3_in_enb"/>
+ </consumption>
+ <production counter="1">
+ <output pattern="01" name="data_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/rgb3sx8_to_gs_impl.xml b/lib/implementations/rgb3sx8_to_gs_impl.xml
similarity index 58%
rename from rgb3sx8_to_gs_impl.xml
rename to lib/implementations/rgb3sx8_to_gs_impl.xml
index 05708e3..4032757 100644
--- a/rgb3sx8_to_gs_impl.xml
+++ b/lib/implementations/rgb3sx8_to_gs_impl.xml
@@ -1,10 +1,11 @@
<!DOCTYPE rgb3sx8_to_gs>
-<block_impl ref_md5="" ref_name="rgb3sx8_to_gs.xml">
+<block_impl ref_name="rgb3sx8_to_gs.xml" ref_md5="">
<comments>
- <author mail="" lastname="" firstname=""/>
- <date creation=""/>
- <description>vcdsv</description>
- <notes>vrevgfregaqv</notes>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>fez</description>
+ <notes>fez</notes>
</comments>
<libraries>
<library name="ieee">
@@ -25,27 +26,27 @@ begin
cst_mult <= to_unsigned(87382, 18);
-accum_process : process (clk, reset)
+accum_process : process (@{clk}, @{reset})
begin
-if reset = '1' then
+if @{reset} = '1' then
count <= to_unsigned(0, 3);
accum <= to_unsigned(0, dsp_in_width);
do_mult <= '0';
-elsif rising_edge(clk) then
+elsif rising_edge(@{clk}) then
do_mult <= '0';
-if rgb_in_enb = '1' then
+if @{rgb_in_enb} = '1' then
if count = 0 then
-accum <= resize(unsigned(rgb_in), dsp_in_width);
+accum <= resize(unsigned(@{rgb_in}), dsp_in_width);
count <= to_unsigned(1, 3);
elsif count = 1 then
-accum <= accum + resize(unsigned(rgb_in), dsp_in_width);
+accum <= accum + resize(unsigned(@{rgb_in}), dsp_in_width);
count <= to_unsigned(2, 3);
elsif count = 2 then
-accum <= accum + resize(unsigned(rgb_in), dsp_in_width);
+accum <= accum + resize(unsigned(@{rgb_in}), dsp_in_width);
count <= to_unsigned(0, 3);
do_mult <= '1';
end if;
@@ -54,12 +55,12 @@ end if;
end process accum_process;
-mult_process : process (clk, reset)
+mult_process : process (@{clk}, @{reset})
begin
-if reset = '1' then
+if @{reset} = '1' then
result <= to_unsigned(0, dsp_out_width);
do_out <= '0';
-elsif rising_edge(clk) then
+elsif rising_edge(@{clk}) then
do_out <= '0';
if do_mult = '1' then
@@ -69,18 +70,18 @@ end if;
end if;
end process mult_process;
-gs_out <= std_logic_vector(result(dsp_in_width+7 downto dsp_in_width));
-gs_out_enb <= do_out;
+@{gs_out} <= std_logic_vector(result(dsp_in_width+7 downto dsp_in_width));
+@{gs_out_enb} <= do_out;
end rtl;
</architecture>
<patterns>
- <delta value="to_define"/>
+ <delta value="3"/>
<consumption>
- <input name="rgb_in_enb" pattern="to_define"/>
+ <input pattern="111" name="rgb_in_enb"/>
</consumption>
- <production counter="to_define">
- <output name="gs_out_enb" pattern="to_define"/>
+ <production counter="3">
+ <output pattern="00001" name="gs_out_enb"/>
</production>
</patterns>
</block_impl>
diff --git a/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
new file mode 100644
index 0000000..3db4b59
--- /dev/null
+++ b/lib/implementations/rgb3sx8_to_ycbcr_3DSP_impl.xml
@@ -0,0 +1,319 @@
+<!DOCTYPE rgb3sx8_to_ycbcr_3DSP>
+<block_impl ref_name="rgb3sx8_to_ycbcr_3DSP.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>fez</description>
+ <notes>fez</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+component mult_accum
+port (
+@{clk} : in std_logic;
+ce : in std_logic;
+sclr : in std_logic;
+bypass : in std_logic;
+a : in std_logic_vector(17 downto 0);
+b : in std_logic_vector(17 downto 0);
+s : out std_logic_vector(47 downto 0)
+);
+end component;
+
+-- Signals
+signal do_sum_y : std_logic;
+signal do_sum_y_dly : std_logic;
+signal do_sum_cr : std_logic;
+signal do_sum_cr_dly : std_logic;
+signal do_sum_cb : std_logic;
+signal do_sum_cb_dly : std_logic;
+signal do_out : std_logic;
+signal do_out_cr : std_logic;
+signal do_out_cb : std_logic;
+signal do_out_y : std_logic;
+signal count_y : unsigned (2 downto 0);
+signal count_cr : unsigned (2 downto 0);
+signal count_cb : unsigned (2 downto 0);
+signal y : signed(8 downto 0);
+signal y_dly1 : signed(8 downto 0);
+signal y_dly2 : signed(8 downto 0);
+signal cb : signed(8 downto 0);
+signal cb_dly1 : signed(8 downto 0);
+signal cr : signed(8 downto 0);
+signal cst_y_r : signed(17 downto 0);
+signal cst_y_g : signed(17 downto 0);
+signal cst_y_b : signed(17 downto 0);
+signal cst_cb_r : signed(17 downto 0);
+signal cst_cb_g : signed(17 downto 0);
+signal cst_cb_b : signed(17 downto 0);
+signal cst_cr_r : signed(17 downto 0);
+signal cst_cr_g : signed(17 downto 0);
+signal cst_cr_b : signed(17 downto 0);
+
+signal bypass_y : std_logic;
+signal a_y : std_logic_vector(17 downto 0);
+signal b_y : std_logic_vector(17 downto 0);
+signal s_y : std_logic_vector(47 downto 0);
+signal bypass_cr : std_logic;
+signal a_cr : std_logic_vector(17 downto 0);
+signal b_cr : std_logic_vector(17 downto 0);
+signal s_cr : std_logic_vector(47 downto 0);
+signal bypass_cb : std_logic;
+signal a_cb : std_logic_vector(17 downto 0);
+signal b_cb : std_logic_vector(17 downto 0);
+signal s_cb : std_logic_vector(47 downto 0);
+
+signal compo_out : std_logic_vector(7 downto 0);
+
+begin
+
+y_multiplier : mult_accum
+port map (
+@{clk} => @{clk},
+ce => '1',
+sclr => '0',
+bypass => bypass_y,
+a => a_y,
+b => b_y,
+s => s_y
+);
+cr_multiplier : mult_accum
+port map (
+@{clk} => @{clk},
+ce => '1',
+sclr => '0',
+bypass => bypass_cr,
+a => a_cr,
+b => b_cr,
+s => s_cr
+);
+cb_multiplier : mult_accum
+port map (
+@{clk} => @{clk},
+ce => '1',
+sclr => '0',
+bypass => bypass_cb,
+a => a_cb,
+b => b_cb,
+s => s_cb
+);
+
+
+cst_y_r <= to_signed(33658, 18);
+cst_y_g <= to_signed(66077, 18);
+cst_y_b <= to_signed(12833, 18);
+cst_cb_r <= to_signed(-19428, 18);
+cst_cb_g <= to_signed(-38141, 18);
+cst_cb_b <= to_signed(57569, 18);
+cst_cr_r <= to_signed(57569, 18);
+cst_cr_g <= to_signed(-48207, 18);
+cst_cr_b <= to_signed(-9362, 18);
+
+multy_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+a_y <= (others => '0');
+b_y <= (others => '0');
+
+count_y <= to_unsigned(0, 3);
+do_sum_y <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_sum_y <= '0';
+
+a_y <= (others => '0');
+b_y <= (others => '0');
+
+if @{rgb_in_enb} = '1' then
+
+a_y <= "0000000000" & @{rgb_in};
+
+if count_y = 0 then
+b_y <= std_logic_vector(cst_y_b);
+
+count_y <= to_unsigned(1, 3);
+
+elsif count_y = 1 then
+b_y <= std_logic_vector(cst_y_g);
+count_y <= to_unsigned(2, 3);
+
+elsif count_y = 2 then
+b_y <= std_logic_vector(cst_y_r);
+count_y <= to_unsigned(0, 3);
+do_sum_y <= '1';
+end if;
+end if;
+end if;
+end process multy_process;
+
+sumy_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+bypass_y <= '0';
+y <= to_signed(0, 9);
+y_dly1 <= to_signed(0, 9);
+y_dly2 <= to_signed(0, 9);
+
+elsif rising_edge(@{clk}) then
+bypass_y <= do_sum_y;
+do_sum_y_dly <= do_sum_y;
+y_dly1 <= y;
+y_dly2 <= y_dly1;
+
+if do_sum_y_dly = '1' then
+y <= to_signed(16, 9) + signed(s_y(25 downto 17));
+end if;
+end if;
+
+end process sumy_process;
+
+multcb_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+a_cb <= (others => '0');
+b_cb <= (others => '0');
+
+count_cb <= to_unsigned(0, 3);
+do_sum_cb <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_sum_cb <= '0';
+
+a_cb <= (others => '0');
+b_cb <= (others => '0');
+
+if @{rgb_in_enb} = '1' then
+
+a_cb <= "0000000000" & @{rgb_in};
+
+if count_cb = 0 then
+b_cb <= std_logic_vector(cst_cb_b);
+
+count_cb <= to_unsigned(1, 3);
+
+elsif count_cb = 1 then
+b_cb <= std_logic_vector(cst_cb_g);
+count_cb <= to_unsigned(2, 3);
+
+elsif count_cb = 2 then
+b_cb <= std_logic_vector(cst_cb_r);
+count_cb <= to_unsigned(0, 3);
+do_sum_cb <= '1';
+end if;
+end if;
+end if;
+end process multcb_process;
+
+sumcb_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+bypass_cb <= '0';
+cb <= to_signed(0, 9);
+cb_dly1 <= to_signed(0, 9);
+elsif rising_edge(@{clk}) then
+bypass_cb <= do_sum_cb;
+do_sum_cb_dly <= do_sum_cb;
+cb_dly1 <= cb;
+
+if do_sum_cb_dly = '1' then
+cb <= to_signed(128, 9) + signed(s_cb(25 downto 17));
+end if;
+end if;
+
+end process sumcb_process;
+
+multcr_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+a_cr <= (others => '0');
+b_cr <= (others => '0');
+
+count_cr <= to_unsigned(0, 3);
+do_sum_cr <= '0';
+
+elsif rising_edge(@{clk}) then
+
+do_sum_cr <= '0';
+
+a_cr <= (others => '0');
+b_cr <= (others => '0');
+
+if @{rgb_in_enb} = '1' then
+
+a_cr <= "0000000000" & @{rgb_in};
+
+if count_cr = 0 then
+b_cr <= std_logic_vector(cst_cr_b);
+
+count_cr <= to_unsigned(1, 3);
+
+elsif count_cr = 1 then
+b_cr <= std_logic_vector(cst_cr_g);
+count_cr <= to_unsigned(2, 3);
+
+elsif count_cr = 2 then
+b_cr <= std_logic_vector(cst_cr_r);
+count_cr <= to_unsigned(0, 3);
+do_sum_cr <= '1';
+end if;
+end if;
+end if;
+end process multcr_process;
+
+sumcr_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+bypass_cr <= '0';
+cr <= to_signed(0, 9);
+do_out_cr <= '0';
+
+elsif rising_edge(@{clk}) then
+bypass_cr <= do_sum_cr;
+do_sum_cr_dly <= do_sum_cr;
+do_out_cr <= '0';
+
+if do_sum_cr_dly = '1' then
+do_out_cr <= '1';
+cr <= to_signed(128, 9) + signed(s_cr(25 downto 17));
+end if;
+end if;
+end process sumcr_process;
+
+out_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+do_out_y <= '0';
+do_out_cb <= '0';
+elsif rising_edge(@{clk}) then
+do_out_cb <= do_out_cr;
+do_out_y <= do_out_cb;
+end if;
+end process out_process;
+
+
+@{ycbcr_out} <= std_logic_vector(y_dly2(7 downto 0)) when do_out_y = '1' else
+std_logic_vector(cb_dly1(7 downto 0)) when do_out_cb = '1' else
+std_logic_vector(cr(7 downto 0)) when do_out_cr = '1' else
+(others => '0');
+@{ycbcr_out_enb} <= do_out_y or do_out_cb or do_out_cr;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="3"/>
+ <consumption>
+ <input pattern="111" name="rgb_in_enb"/>
+ </consumption>
+ <production counter="3,3,3">
+ <output pattern="00000111" name="ycbcr_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/implementations/threshold_extctl_impl.xml b/lib/implementations/threshold_extctl_impl.xml
new file mode 100644
index 0000000..a136203
--- /dev/null
+++ b/lib/implementations/threshold_extctl_impl.xml
@@ -0,0 +1,59 @@
+<!DOCTYPE threshold_extctl>
+<block_impl ref_name="threshold_extctl.xml" ref_md5="">
+ <comments>
+ <author lastname="" mail="" firstname=""/>
+ <date creation="2018-01-10"/>
+ <related_files list=""/>
+ <description>fez</description>
+ <notes>fez</notes>
+ </comments>
+ <libraries>
+ <library name="ieee">
+ <package name="std_logic_1164" use="all"/>
+ <package name="numeric_std" use="all"/>
+ </library>
+ </libraries>
+ <architecture>
+-- Signals
+signal def_val : unsigned(in_width-1 downto 0);
+
+begin
+
+def_val <= to_unsigned(default_value, in_width);
+
+threshold_process : process (@{clk}, @{reset})
+begin
+if @{reset} = '1' then
+
+@{data_out_enb} <= '0';
+@{data_out} <= (others => '0');
+
+elsif rising_edge(@{clk}) then
+
+@{data_out_enb} <= '0';
+
+if @{data_in_enb} = '1' and @{keep_in_enb} = '1' then
+
+if @{keep_in} = '1' then
+@{data_out} <= @{data_in};
+else
+@{data_out} <= std_logic_vector(def_val);
+end if;
+@{data_out_enb} <= '1';
+end if;
+end if;
+end process threshold_process;
+
+end rtl;
+</architecture>
+ <patterns>
+ <delta value="1"/>
+ <consumption>
+ <input pattern="1" name="data_in_enb"/>
+ <input pattern="1" name="keep_in_enb"/>
+ </consumption>
+ <production counter="1">
+ <output pattern="01" name="data_out_enb"/>
+ </production>
+ </patterns>
+</block_impl>
diff --git a/lib/references/boxfilter_3x3.xml b/lib/references/boxfilter_3x3.xml
new file mode 100644
index 0000000..5e163ad
--- /dev/null
+++ b/lib/references/boxfilter_3x3.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE boxfilter_3x3>
+<block version="0.1">
+ <informations>
+ <name>boxfilter_3x3</name>
+ <category ids=""/>
+ <description>
+ <brief>frdfgdr</brief>
+ <detailed>gregre</detailed>
+ </description>
+ </informations>
+ <parameters>
+ <parameter value="128" type="natural" context="generic" name="img_width"/>
+ <parameter value="128" type="natural" context="generic" name="img_height"/>
+ <parameter value="18" type="natural" context="generic" name="dsp_in_width"/>
+ <parameter value="36" type="natural" context="generic" name="dsp_out_width"/>
+ </parameters>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="pix_in"/>
+ <control iface="pix_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="pix_out"/>
+ <control iface="pix_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/checker.xml b/lib/references/checker.xml
new file mode 100644
index 0000000..6934164
--- /dev/null
+++ b/lib/references/checker.xml
@@ -0,0 +1,31 @@
+<!DOCTYPE checker>
+<block version="0.1">
+ <informations>
+ <name>checker</name>
+ <category ids=""/>
+ <description>
+ <brief>gre</brief>
+ <detailed>gre</detailed>
+ </description>
+ </informations>
+ <parameters>
+ <parameter value="8" type="natural" context="generic" name="in_width"/>
+ <parameter value="1" type="natural" context="generic" name="check_type"/>
+ <parameter value="0" type="natural" context="generic" name="inf_value"/>
+ <parameter value="0" type="natural" context="generic" name="sup_value"/>
+ </parameters>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data_in"/>
+ <control iface="data_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data_out"/>
+ <output endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="check_out"/>
+ <control iface="data_out"/>
+ <control iface="check_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/csvreader.xml b/lib/references/csvreader.xml
new file mode 100644
index 0000000..d22ab09
--- /dev/null
+++ b/lib/references/csvreader.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<block>
+ <informations>
+ <name>
+ generator-csvreader
+ </name>
+ <category ids="6" />
+ <description>
+ <brief>
+ generates data from a csv file
+ </brief>
+ <detailed>
+ generates data from a csv file
+ </detailed>
+ </description>
+ </informations>
+
+ <parameters>
+
+ <parameter name="row_length" type="positive" value="24" context="generic"/>
+ <parameter name="nb_row" type="positive" value="8" context="generic"/>
+ <parameter name="data_width" type="positive" value="8" context="generic"/>
+ <parameter name="img_file" type="string" value="nofile.csv" context="user"/>
+ <parameter name="out_pattern_sub" type="expression" value="row" context="user"/>
+ <parameter name="out_pattern" type="expression" value="(10){$row_length*$nb_$out_pattern_sub}" context="user"/>
+ </parameters>
+
+ <interfaces>
+ <inputs>
+ <input name="clk" width="1" purpose="clock" />
+ <input name="rst" width="1" purpose="reset" />
+ </inputs>
+ <outputs>
+ <output name="data_out" width="$data_width"/>
+ <control iface="data_out"/>
+ </outputs>
+ </interfaces>
+
+</block>
diff --git a/lib/references/deserializer_3x1.xml b/lib/references/deserializer_3x1.xml
new file mode 100644
index 0000000..874ecad
--- /dev/null
+++ b/lib/references/deserializer_3x1.xml
@@ -0,0 +1,30 @@
+<!DOCTYPE deserializer_3x1>
+<block version="0.1">
+ <informations>
+ <name>deserializer_3x1</name>
+ <category ids=""/>
+ <description>
+ <brief>gre</brief>
+ <detailed>gre</detailed>
+ </description>
+ </informations>
+ <parameters>
+ <parameter value="8" type="natural" context="generic" name="in_width"/>
+ </parameters>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data_in"/>
+ <control iface="data_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data1_out"/>
+ <output endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data2_out"/>
+ <output endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data3_out"/>
+ <control iface="data1_out"/>
+ <control iface="data2_out"/>
+ <control iface="data3_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/logical_AND_3.xml b/lib/references/logical_AND_3.xml
new file mode 100644
index 0000000..99b4aea
--- /dev/null
+++ b/lib/references/logical_AND_3.xml
@@ -0,0 +1,28 @@
+<!DOCTYPE logical_AND_3>
+<block version="0.1">
+ <informations>
+ <name>logical_AND_3</name>
+ <category ids=""/>
+ <description>
+ <brief>yt</brief>
+ <detailed>hyjt</detailed>
+ </description>
+ </informations>
+ <parameters/>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="data1_in"/>
+ <input endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="data2_in"/>
+ <input endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="data3_in"/>
+ <control iface="data1_in"/>
+ <control iface="data2_in"/>
+ <control iface="data3_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="data_out"/>
+ <control iface="data_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/references.bmf b/lib/references/references.bmf
index 8ec55062480d44714e46938ae771bd122d6cc2e1..b01fb7cf634c0b6999096c5e7cca2b7b5eb1c33a 100644
GIT binary patch
literal 20338
zcmeI4%Wq^y6~@c<WEe(+HL@%VSyAN0C?X*<@%w>5@<dTkq%es>gb*9c{qV%#u@ifS
zdGJ_7C<_)53sw<g#h<{M6$^w|u;Nc(&6*8-zxujd)!p}Yx5u8&M9|jld;8vcoH}(L
zU!6MFA-sDSLYNC-@<8X=&<F?NC^W-Q!p*Q0-q!K1?(c=y!-u+mFSK=a5?b+kS68ox
z_rkG${a8=#>(?8q&wZ|&y5EX5Xf@rf>fu&+q_&~pop3uWsCGNHu^$e@UH#5=7Q(}@
zuje1??vf5ld=wt&&TE}JNAZ{MU3_~JqVbB3?XVJ-#h0zH9#+GKM#rzFu9m{0t~s~D
zny$8V-HPX3J>mYE&MRueZ9ULP+u|YIZ>gR8I(FhHTXCErT#LLoj$^&6a+6_G-%~m+
ztH%S)mD`$B+rCfB9GBHDb5TCO)cM8pYekRyo%?g)MsXKzCpuEA>0H)68mabVr<6{U
z|I$~tye&)KmY=D-r5>`py>|wATMnhXokWS_UMX=W8r8FC6P_oz+tU2Eq!TU8_o}3B
zPv5Khjr48myeau=>glp1sja`JuG&#v8+v+PxkG-=D|geP&XT?)SwEZP<+{sfu8aKT
z`t*G^xy^Oy`)qa9_2eJ*)i3jRp1I7^!^O$`oeG(M|D1ZX5UN_uQokk%#&WJk>0Xme
z+t#i|$=-;+mvp_SGAk-Y$>nHi+ff_-m!%#qK83CRk3OoYPs9c@@+4TgWAVBzbYM%}
zlApgQWYFJ!mf31tP}V3>0$3p9gen_-(e1(G%R07YVb>*ryOLI<vK1}zp6(h6aMg%*
zc~{>n@%~1XTaW?u&MT?dxbxcQFW63A`nSfg9B1%E($$dM9g0T_!iYwZ;H3rW`cXXZ
z3IXn^{Dx|Mc7gJEAkWlLd&hBp=(8<4kbZD)?)9c9ZAc?Z>ayhiK761t?5j>Gp&$wF
zfMgjN(mH6YM;c)+4XQp-jk}@;SqEt!MjkcQVp~#2*`uPyzU=?^!Vh)FE!`GMd8@;-
z=byp}&Fl+0wq@0~WYxji>l*czG-gp6wxtoT>Ng%>Sx?sE8T*faSdJx(!_|mBAgQb)
zNc$k{oS&E2`MUUjPwSQ)NkU71Ab99}QTQ2o$oIR^JY~|6+h}S&cQk`glBh|gIOmc_
z8quJVGpBU5Ma9a%vR6erYdvGI+%vpRy<gSXz-k$%<q;+n*FD0rHrLlqIg~L|ZX<E8
zzYXYticCR5T)B2V1-W)JJk}`PclQ``8CFTm89h{&xuRKx^YtaV=P6OvD;4Q}_jswx
zicaULzv(<LYSK!4LHzrv`aahAuFfHRIz}s3_Iy()?U7_ETesiUST`aB*eGZ}jNfHD
zSRwAN=r|Fk0L@Vvn?^b6Jx~c&`d()pbvQtK)M<y0RU+BrWYxfsIU>MX?0KheLNsDk
zwq>h816w-40S#HMMco4xaI8xUH=`xv$)>olrMtU&wxKIZSZ=R~E5qUm*X1vdR0{5z
z-_#|hP}ZIn|Ivsfuh^jedY9DmVrL9x{9<1<nVm+5F5B0nZ;bl9_P0c|XInu+MM>*X
zEv<>(vae)=2FFQKO?5T3t}pcYNV>Bpjvt8cX!DNd8Ep#T*JIP?dMdI`Pm9W9&HJ9L
zjs4m+U4ef5ZHv|v-AHXylCvf$u-{$OIJZ<1`D7i22f{n9t2KPhy1wz;++WwXrGGlw
zH837gE?Tx1yDJ`*5h!F5U&Jb8H^vJu$DWbh{x)XS);+bn6EPNO=|k0}<XKwzx~M;q
z<m3Mihth*SR8up5+K%Hz!$x)~a>)FdRsZ`DYnX=fY1Y*^mskn7fuveHOLTLst4I5$
zN!c0CJ^IT*-MQ0}X<XIRQI<N>J>`4bPUTc|>gTb1GtM741^Ec!mt)hG?w+%TTt3x=
ze8t$T6W~#>DLxIX%6f23-yqb6uCUlx`Ihbz6JFFc>%w)F-P64~od5$4mq1(cDs9N4
z+0o2D);xeE`nAE*(BA?&c_<2Z<crZh{BL!AJVI4{d_9^pN`0hpPCQBx@o`Chj`3OJ
zEwwX3_5IvWdcYZau@#Bl(X?S+GQkSaD15X!*ZX=IMq|>cnTp;@3&1#1S%!2&UoRK7
znX$3vzNvOjG>iBI@VoW$lQHULZ|_+*zuiNx(PWwzq6X|&-3vyN9tU^v%gFP2>%&7w
zg7AZm$gf51UK6LdTGQXM{_v2*g;>ji@Q4WEJ$57Z!`9MHzaGuT5j>P0LGhu+OBA6F
zpDnAks#dP4Cio6+Jgli*Z%YzCyS-QyLhMJDUd!T_GuM0fxMoEikqXbst&Y5PBh;5v
zf}Ot|*%Tzxs0s^-ooQ%HGddqe`J^TAMN4<t74w)&ygOIZT3svegl}lJ7Q-vyXR-}$
zv3o{d)qV5$Mors^(qD)w^e$s!YvNh=^JwGjHmJ^?jE->GxqU6p0=SG_;``#res~f&
zz7S^sTt|e=7G#`jSnN|%)a2e-$7YMs8et9VG2~YEHKVLx9ZkCvcgwrio;>rKm(}bY
zacErqAUk-YZH*fVWrvVG!3~{RGp^~})bB>T16l!zV|N_8X6JAv{#hzZEh*PcB{CmP
z^Yfb0Gg57{G8!#=`~Qm4US1PB^%s4;tl7#DB4qrYtQ~91eQ6?|;gJsT@{_Uo<wV7!
zLc9J@t6iq}k+j1xB77Nk<FW31q%)q|_Z-o-#=WJ;^>^cLBWt2VmC2fBpANdj`XJBn
zVL_!Hh&zqQkEFBq9nKRWQuJk^6B|FF;{_et8Y59&@&Fhu>uj`pLmKQ10q&C@u%V}9
zsSq1?cEFbIf_G@I)bN=OI`8)Ez5aPptx%7M(6MF>FUf2j$orOdq1ppqi)fmagd;>(
zPx~agg6+zl5c+HpI`Pps`kdL4pHmOcaO4(KY-m<}dfm}YVXEO;X$)npbgvv&S*yFh
z6dxMY-(=ofooa|$dl&k#+_Lk8?@TcwaKLZIs>Oq7$(}Q>e)ARF@H%)=^5)#Ab&aJd
zkHTsJX(b{=mK6J=TRO8NiVSbX8b~QS_@2pr{Ck#lFf#FFT1A5Ri4=Ji=?oQP+`&<m
zT*sLyXRE_5QNq%L`<bbr&GS^hLPkT8id;9-n4Z+FuKVj|T1Ty`uBZMS`O5Bzql^iM
zdL@hf8ea^yo{FqlpH{A7e;`ZYy<YUQDX*3y_;|tegbYGF=|ace5vTDk3OnWp`eXHD
zpW2At_D3p9o}ay?_sh7(FFrq%Oo$q<tiiM7_YgtDdXOEoDL+TN4Sxr3h&B^(V~+%1
zNUr9FEX%G++Q*b$uSA-qogWR?&PLz&v9t)T4O@|W$E56i?v(qZv@jWMV|RVlx8S{&
zXt0+{(K#>@D`TV%G<Z2;0QMx%t?Xyv?jS##pO=1?HcH+->%EkJs=xUj-Ec(8vHmYw
zk4;6^<3<myjz+PE`Myx>8#;Sk%IuKIks@l$8kx`glH1`itMT+Q5#=R>ZAqDR3atZy
zF6s^|O0XzieN*0?*w&_G&3ip$J(0D_P7(1aWT=$ji;4*mqxPQ9(`a$3OGGyB7ma2E
zu50eFt3-`$NvmVy%NqGbXr5z(AjIK12ZkE0oO2-R_HLouQs935%Mm{A=jZOP{&~u^
za4jryS)Zo<uCMv%tL}=U*m2etw-rfwQ|IySn&L65smPjsNuCrOaYeD%$9f-vYsO?O
zjE7?V<-O9jd=Z)1#AC=<T~aCXn(U$QUiddkFX<j@I)BJp%JDttP808}#%%P?k!ygv
zuq>n30Bwy@Bl{6#px=*-vgerNkZEL=D7ThI!#S5sBN|>Zjijz5bZ1VDiia~LsYY-6
zNhj3&3;)p94Ozk*x9N`AJk}b|`B3BB<xDiV=Pc2m)kJPmdB>UdC4HdJ?zbcQv8P*4
zel6uaI?Cg?Rmxe!JMw&A7L`m!;y!Ifl)}W58j5nZQ7e2$9DG$g{-(6(R`{AC0bkXf
z*L8>J5dAs2M06HQUE*M<b3}+Tj%=hhnyTlVO|ZAoH8G}~m5Imc&f%mz?@DxMXwtGN
zV|;Ga*{lyEjfpDfa5_3x#;Y=Qj-Am87LtfGQ7+>M$Kcx<r^m>6pPpXZ5@ImqID@RQ
zQ`oId{VhiOMMg7OO04I}0O6gKl~@J}$S7eqD(!GzlDBNAJu>U?2UyDLc#)$`!?OO+
zv@7bxYiHBj+ed3iAILHLHl`@G)gLiZGx3w!zkXT+Z+s-_!TXbK!-|Wz2f3YB#R2>n
z5`>+|SzFAN5xYl`v$(3F9lg=Gl!XN*7-orwMb0Kgp?O!oqMzuLn2htsui<6OS*FIY
z*(AQ1`l;eBd@={ilD^9<Q+KX2oAzKOBIGG$IVZ|etx;rvK2v>NPCe1ri>H|0ddr?J
z`sggi5Pmhb2;Q;K3P>CZQvcbme=^jHVkK;`(hgSlewQsxTEP&9XYF~QTDEv(p3_D*
z2TGq1!t+7JgyxO4$hJ5|^qfo`tQ$5A%S8-<hyqxQxB`3ii#ohlM*Na%#_10TZCbhv
zY8r;JjLJtThjkoY?!20hWuPC4vyP1F;SmQh-oejJXI*{tWk#0KnQX&XEmw=OZWB8P
zr=h0MzOT&d_nRH<BO<h*z4=XjC)wwn<s4goMNh1u<TLIHt)FO~vCCNH@#R)qOQH8>
zr01sids6J2{pmvW)O;y*br_Gjb-ABcr9Ss^{1x!p)L)<R2+l%b!g04X`?g&D95E8Z
z^4*L052-N%B?_~uBR>O^g6>Yjw{#y|*@_Vy=g9Jmcn(+}zs@y29?MBKsgWpe6FrX4
zKnP@l8SO4~NpGV313ho6e8#c7wE&hhmAo5e3%sCS@jCaTOyAUVvS2`eAVm76uUoo)
z7;(0HCU3*^8PkHJsz=P5SRfRhn+s@H>N{ckyv{M!WwtU}E@RO=A=<@Qz`nEvR|j#d
z<ZL(3&5v%bc_#dy4cKkVZzu3J0dXJinZq6XJiluJP5zxJXMFSl&d#w`cyFt6q**5h
z@A2XXt8^!8Vxsiz$WP-#JZOpd-MZfutK&-5Tp@R+0}F>d(=O7Cd@y$2-emoSoO|tH
z?8$FDpVu$a=4f^8D~Y??M=q-jyLD|H#4Lzxkkv}|>yp}Ie{WCMyr<yol7{a4LtArt
zmb7ggK5n|FzdBz9ZD;XSH^irE?H(oW*6-=E_f3B8#eqHajw995FeX3O*Sx3$6Rv2+
zA8Dq@0LBC3amE=lucsp8)60^Ww)Ve49O-I8zZ^*ehxxx9Y)Q6=K9f($|2N=Zr-vNM
z4WYDE{UYCqQImU#b=y@t@CNLK<uWRuWnw>He4fAggC-1*(hb9Vqr}{<b>zZ5CMl}Q
z^Pi2flA>I7*fz->Z;YHszHGyK+fAjI40Z!vt&vXN+arbmE?p7A`@V92Lil{l>!@Cx
zsiJCB=_Rj$5fSrsJa}1>N^FdX3Rk=jKu$3K(*tX|p^>xO!oCS{az0q6*{+$Zn-BDc
zW4y95FO-sJ&N5I(VUmTJiaG=2X6m;Z)wE;`zm{@;#~C&4?m5qYT^<>T0gU0j47_UT
z)6w@7dCZ8z?`yNmpYqg<BaH)k@d4hOc0f|-4EBzG?8))=L_pa8$D4my=uGlK#ARDr
zKpfF;(6Fb^s@=N6JK($r3D)2(8s`D<UJa}G^rnrqq1<^acdyF`QPr+rT7O#qa&++7
zug%Lh5L0g2;QZ{Q`S7nC<M4HN*;mSD8{Ai!&-Rk~Ggd|djW0o$=>H?hBmbd*eDU$+
zvn9M<M@!b-j5qQXd^Gadi}o3Nys7c<U%b3G$2*W4`i(uu>ahb(ya>zg|HZ^EAGVvh
z=tmycJKnyOzN)vfXraG0nP0@Eb|Z@CZHT-kp?vSVj*g`hDL!jn++2JE4=Xl4eDbt!
eV@>zaYTi3uoHT<oGjcJzezaB}1*acMg#Q9W{`#Z<
delta 731
zcma)(PiPZC7{zBM*(BZWpV%g~*<IIcNy1u;wH4~dT`B0nS_Hv*OF?WA5y6eUdD5##
zc~)A);>CjpQJElmP^_Z8c<Ies4=NU=6ngdIbOPHd_~-ELH|)GOZ@%AbF4DE8Mo9fL
zAw(yHO+D3KQhX}*V3n#^rvvC^M?|@ZnMOaNr4;!s_GDW^OO7&3&XG&Fkqw2ghK+Qe
zG@Mqg#CV^#l;uC0Itg}8qf^|^z1SfP3Mi?C-_Gl1={I~{jTyca^YWtm^cp7hV{{lT
zy_Ai~1#zP*c%|2|p_kEXxOg;L#@#@}d7~hdWh@w${I_5jT{GkwnGuc{n?@D3>EfvA
z%iWu%M%(<3xx(<S=p=C+E;XF+TqvhRfaKH7QfK+Nd-XrHZT{R_-yUJPQpWen2)ybj
znpI!Ke)GLl@)T5%IO#b%<1(rD;?*ofb(^p3Z?i=EaA*(@N_l)8D#&gglzl8iX1Ask
zCPo7BrE=Bj8FKM2d()E6hvWTBdB$6Z;&g(72K{*JTNv|HI*r%<9<j>dvLM|dK7ggb
z!fG&rU56`ZH1hNepJ?o5m<xMwUDRAy`GxI|(19H}2t_rc19E_Sk%7n2ZY=g?`O^69
Ke*?C2T|WV-cGM35
diff --git a/lib/references/rgb3sx8_to_gs.xml b/lib/references/rgb3sx8_to_gs.xml
new file mode 100644
index 0000000..9271adc
--- /dev/null
+++ b/lib/references/rgb3sx8_to_gs.xml
@@ -0,0 +1,27 @@
+<!DOCTYPE rgb3sx8_to_gs>
+<block version="0.1">
+ <informations>
+ <name>rgb3sx8_to_gs</name>
+ <category ids=""/>
+ <description>
+ <brief>fez</brief>
+ <detailed>fez</detailed>
+ </description>
+ </informations>
+ <parameters>
+ <parameter value="18" type="natural" context="generic" name="dsp_in_width"/>
+ <parameter value="36" type="natural" context="generic" name="dsp_out_width"/>
+ </parameters>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="rgb_in"/>
+ <control iface="rgb_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="gs_out"/>
+ <control iface="gs_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/rgb3sx8_to_ycbcr_3DSP.xml b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml
new file mode 100644
index 0000000..5bbc856
--- /dev/null
+++ b/lib/references/rgb3sx8_to_ycbcr_3DSP.xml
@@ -0,0 +1,24 @@
+<!DOCTYPE rgb3sx8_to_ycbcr_3DSP>
+<block version="0.1">
+ <informations>
+ <name>rgb3sx8_to_ycbcr_3DSP</name>
+ <category ids=""/>
+ <description>
+ <brief>fez</brief>
+ <detailed>fez</detailed>
+ </description>
+ </informations>
+ <parameters/>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="rgb_in"/>
+ <control iface="rgb_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="natural" purpose="data" multiplicity="1" width="7" name="ycbcr_out"/>
+ <control iface="ycbcr_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/lib/references/threshold_extctl.xml b/lib/references/threshold_extctl.xml
new file mode 100644
index 0000000..136226f
--- /dev/null
+++ b/lib/references/threshold_extctl.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE threshold_extctl>
+<block version="0.1">
+ <informations>
+ <name>threshold_extctl</name>
+ <category ids=""/>
+ <description>
+ <brief>fez</brief>
+ <detailed>fez</detailed>
+ </description>
+ </informations>
+ <parameters>
+ <parameter value="8" type="natural" context="generic" name="in_width"/>
+ <parameter value="0" type="natural" context="generic" name="default_value"/>
+ </parameters>
+ <interfaces>
+ <inputs>
+ <input endian="little" type="boolean" purpose="clock" multiplicity="1" width="1" name="clk"/>
+ <input endian="little" type="boolean" purpose="reset" multiplicity="1" width="1" name="reset"/>
+ <input endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data_in"/>
+ <input endian="little" type="boolean" purpose="data" multiplicity="1" width="1" name="keep_in"/>
+ <control iface="data_in"/>
+ <control iface="keep_in"/>
+ </inputs>
+ <outputs>
+ <output endian="little" type="expression" purpose="data" multiplicity="1" width="$in_width" name="data_out"/>
+ <control iface="data_out"/>
+ </outputs>
+ </interfaces>
+</block>
diff --git a/logical_AND_3.vhd b/logical_AND_3.vhd
new file mode 100644
index 0000000..720b733
--- /dev/null
+++ b/logical_AND_3.vhd
@@ -0,0 +1,65 @@
+-------------------------------------------------------------------------------
+--
+-- File : logical_AND_3.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a logical AND on three inputs.
+--
+--
+-- Note :
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity logical_AND_3 is
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ data1_in : in std_logic;
+ data1_in_enb : in std_logic;
+ data2_in : in std_logic;
+ data2_in_enb : in std_logic;
+ data3_in : in std_logic;
+ data3_in_enb : in std_logic;
+
+ data_out : out std_logic;
+ data_out_enb : out std_logic -- the control signal, common to all output
+ );
+end logical_AND_3;
+
+
+architecture rtl of logical_AND_3 is
+
+begin
+
+ and_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ data_out <= '0';
+ data_out_enb <= '0';
+
+ elsif rising_edge(clk) then
+
+ data_out <= '0';
+ data_out_enb <= '0';
+
+ if data1_in_enb = '1' and data2_in_enb = '1' and data3_in_enb = '1' then
+
+ data_out <= data1_in and data2_in and data3_in;
+ data_out_enb <= '1';
+
+ end if;
+ end if;
+
+ end process and_process;
+
+end rtl;
+
diff --git a/object-files.txt b/object-files.txt
index 47af6ad..9a90873 100644
--- a/object-files.txt
+++ b/object-files.txt
@@ -7,6 +7,8 @@ COMMON-OBJ = $(BUILDPATH)/AbstractBlock.o \
$(BUILDPATH)/FunctionalInterface.o \
$(BUILDPATH)/GroupInterface.o \
$(BUILDPATH)/ReferenceInterface.o \
+ $(BUILDPATH)/AbstractInputModifier.o \
+ $(BUILDPATH)/DelayInputModifier.o \
$(BUILDPATH)/BlockImplementation.o \
$(BUILDPATH)/Graph.o \
$(BUILDPATH)/AbstractBoxItem.o \
diff --git a/projectfile.xsd b/projectfile.xsd
index 811beb2..de6ec42 100644
--- a/projectfile.xsd
+++ b/projectfile.xsd
@@ -98,6 +98,12 @@
<xs:attribute ref="to" />
</xs:attributeGroup>
+ <xs:attributeGroup name="modifierAttrGroup">
+ <xs:attribute ref="id" />
+ <xs:attribute ref="type" />
+ <xs:attribute ref="params" />
+ </xs:attributeGroup>
+
<!-- déclaration des attributs -->
@@ -223,6 +229,7 @@
<xs:attribute name="ref_md5" type="xs:string"/>
<xs:attribute name="context" type="xs:string"/>
<xs:attribute name="type" type="xs:string"/>
+ <xs:attribute name="params" type="xs:string"/>
<!-- déclaration des groupes d'éléments -->
@@ -230,7 +237,8 @@
<xs:group name="rootElmtGroup">
<xs:sequence>
<xs:element ref="scenes"/>
- <xs:element ref="connections"/>
+ <xs:element ref="connections"/>
+ <xs:element ref="modifiers"/>
</xs:sequence>
</xs:group>
@@ -438,6 +446,20 @@
</xs:complexType>
</xs:element>
+ <xs:element name="modifiers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="modifier" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="modifier">
+ <xs:complexType>
+ <xs:attributeGroup ref="modifierAttrGroup"/>
+ </xs:complexType>
+ </xs:element>
+
<!-- racine du document -->
<xs:element name="blast_project">
diff --git a/reference.xsd b/reference.xsd
index b219bfa..29f5d28 100644
--- a/reference.xsd
+++ b/reference.xsd
@@ -19,6 +19,7 @@
<xs:attribute name="type" type="typeiface"/>
<xs:attribute ref="purpose"/>
<xs:attribute ref="multiplicity"/>
+ <xs:attribute name="endian" type="typeendian" use="optional"/>
</xs:attributeGroup>
@@ -47,6 +48,13 @@
<xs:enumeration value="natural"/>
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="typeendian">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="little"/>
+ <xs:enumeration value="big"/>
+ </xs:restriction>
+ </xs:simpleType>
<xs:attribute name="wishbone" type="xs:string"/>
<xs:attribute name="context" type="xs:string" />
@@ -207,9 +215,10 @@
<!-- Racine du document -->
<xs:element name="block">
- <xs:complexType>
- <xs:group ref="blockElmtGroup"/>
- </xs:complexType>
+ <xs:complexType>
+ <xs:group ref="blockElmtGroup"/>
+ <xs:attribute name="version" type="xs:string" use="optional" />
+ </xs:complexType>
</xs:element>
</xs:schema>
diff --git a/rgb3sx8_to_gs.vhd b/rgb3sx8_to_gs.vhd
new file mode 100644
index 0000000..06abc7b
--- /dev/null
+++ b/rgb3sx8_to_gs.vhd
@@ -0,0 +1,102 @@
+-------------------------------------------------------------------------------
+--
+-- File : rgb3sx8_to_gs.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a conversion from rgb24 (8 bits/serial) to grayscale
+--
+-- Note : rgb24 (8 bits/serial) pixels are composed of three 8 bits
+-- values that are consumed on port rgb_in, in the following
+-- order : blue, green, red.
+-- output value on gs_out is computed with (red+green+blue)/3
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity rgb3sx8_to_gs is
+ generic(
+ dsp_in_width : natural := 18;
+ dsp_out_width : natural := 36
+ );
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ rgb_in : in std_logic_vector(7 downto 0);
+ rgb_in_enb : in std_logic;
+ gs_out : out std_logic_vector(7 downto 0);
+ gs_out_enb : out std_logic
+
+ );
+end rgb3sx8_to_gs;
+
+
+architecture rtl of rgb3sx8_to_gs is
+
+ -- Signals
+ signal do_mult : std_logic;
+ signal do_out : std_logic;
+ signal count : unsigned (2 downto 0);
+ signal accum : unsigned(dsp_in_width-1 downto 0);
+ signal result : unsigned(dsp_out_width-1 downto 0);
+ signal cst_mult : unsigned(dsp_in_width-1 downto 0); -- eq. 87382 to do /3
+
+begin
+
+ cst_mult <= to_unsigned(87382, 18);
+
+ accum_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ count <= to_unsigned(0, 3);
+ accum <= to_unsigned(0, dsp_in_width);
+ do_mult <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_mult <= '0';
+
+ if rgb_in_enb = '1' then
+
+ if count = 0 then
+ accum <= resize(unsigned(rgb_in), dsp_in_width);
+ count <= to_unsigned(1, 3);
+ elsif count = 1 then
+ accum <= accum + resize(unsigned(rgb_in), dsp_in_width);
+ count <= to_unsigned(2, 3);
+ elsif count = 2 then
+ accum <= accum + resize(unsigned(rgb_in), dsp_in_width);
+ count <= to_unsigned(0, 3);
+ do_mult <= '1';
+ end if;
+ end if;
+ end if;
+
+ end process accum_process;
+
+ mult_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ result <= to_unsigned(0, dsp_out_width);
+ do_out <= '0';
+ elsif rising_edge(clk) then
+
+ do_out <= '0';
+ if do_mult = '1' then
+ result <= accum * cst_mult;
+ do_out <= '1';
+ end if;
+ end if;
+ end process mult_process;
+
+ gs_out <= std_logic_vector(result(dsp_in_width+7 downto dsp_in_width));
+ gs_out_enb <= do_out;
+
+end rtl;
+
diff --git a/rgb3sx8_to_gs.xml b/rgb3sx8_to_gs.xml
deleted file mode 100644
index d9583a1..0000000
--- a/rgb3sx8_to_gs.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE rgb3sx8_to_gs>
-<block version="0.1">
- <informations>
- <name>rgb3sx8_to_gs</name>
- <category ids=""/>
- <description>
- <brief>vcdsv</brief>
- <detailed>vrevgfregaqv</detailed>
- </description>
- </informations>
- <parameters>
- <parameter name="dsp_in_width" context="generic" value="18" type="natural"/>
- <parameter name="dsp_out_width" context="generic" value="36" type="natural"/>
- </parameters>
- <interfaces>
- <inputs>
- <input name="clk" width="1" endian="little" purpose="clock" type="boolean" multiplicity="1"/>
- <input name="reset" width="1" endian="little" purpose="reset" type="boolean" multiplicity="1"/>
- <input name="rgb_in" width="7" endian="little" purpose="data" type="natural" multiplicity="1"/>
- <control iface="rgb_in"/>
- </inputs>
- <outputs>
- <output name="gs_out" width="7" endian="little" purpose="data" type="natural" multiplicity="1"/>
- <control iface="gs_out"/>
- </outputs>
- </interfaces>
-</block>
diff --git a/rgb3sx8_to_ycbcr_3DSP.vhd b/rgb3sx8_to_ycbcr_3DSP.vhd
new file mode 100644
index 0000000..c2320fe
--- /dev/null
+++ b/rgb3sx8_to_ycbcr_3DSP.vhd
@@ -0,0 +1,337 @@
+-------------------------------------------------------------------------------
+--
+-- File : rgb3sx8_to_ycbcr_3DSP.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a conversion from rgb24 (8 bits/serial) to YCrCb
+--
+-- Note : rgb24 (8 bits/serial) pixels are composed of three 8 bits
+-- values that are consumed on port rgb_in, in the following
+-- order : blue, green, red.
+-- output values on ycrcb_out are produced in the following
+-- order: cb, cr, y
+-- They are computed using ITU-R BT.601 conversion principles,
+-- assuming that RGB component are digital and thus rangin
+-- from 0 to 255. Formulas are:
+-- Y = 16 + 65.738R/256 + 129.057G/256 + 25.064B/256
+-- Cb = 128 - 37.945R/256 - 74.494G/256 + 112.439B/256
+-- Cr = 128 + 112.439R/256 - 94.154G/256 - 18.285B/256
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity rgb3sx8_to_ycbcr_3DSP is
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ rgb_in : in std_logic_vector(7 downto 0);
+ rgb_in_enb : in std_logic;
+ ycbcr_out : out std_logic_vector(7 downto 0);
+ ycbcr_out_enb : out std_logic
+
+ );
+end rgb3sx8_to_ycbcr_3DSP;
+
+
+architecture rtl of rgb3sx8_to_ycbcr_3DSP is
+
+ component mult_accum
+ port (
+ clk : in std_logic;
+ ce : in std_logic;
+ sclr : in std_logic;
+ bypass : in std_logic;
+ a : in std_logic_vector(17 downto 0);
+ b : in std_logic_vector(17 downto 0);
+ s : out std_logic_vector(47 downto 0)
+ );
+ end component;
+
+-- Signals
+ signal do_sum_y : std_logic;
+ signal do_sum_y_dly : std_logic;
+ signal do_sum_cr : std_logic;
+ signal do_sum_cr_dly : std_logic;
+ signal do_sum_cb : std_logic;
+ signal do_sum_cb_dly : std_logic;
+ signal do_out : std_logic;
+ signal do_out_cr : std_logic;
+ signal do_out_cb : std_logic;
+ signal do_out_y : std_logic;
+ signal count_y : unsigned (2 downto 0);
+ signal count_cr : unsigned (2 downto 0);
+ signal count_cb : unsigned (2 downto 0);
+ signal y : signed(8 downto 0);
+ signal y_dly1 : signed(8 downto 0);
+ signal y_dly2 : signed(8 downto 0);
+ signal cb : signed(8 downto 0);
+ signal cb_dly1 : signed(8 downto 0);
+ signal cr : signed(8 downto 0);
+ signal cst_y_r : signed(17 downto 0);
+ signal cst_y_g : signed(17 downto 0);
+ signal cst_y_b : signed(17 downto 0);
+ signal cst_cb_r : signed(17 downto 0);
+ signal cst_cb_g : signed(17 downto 0);
+ signal cst_cb_b : signed(17 downto 0);
+ signal cst_cr_r : signed(17 downto 0);
+ signal cst_cr_g : signed(17 downto 0);
+ signal cst_cr_b : signed(17 downto 0);
+
+ signal bypass_y : std_logic;
+ signal a_y : std_logic_vector(17 downto 0);
+ signal b_y : std_logic_vector(17 downto 0);
+ signal s_y : std_logic_vector(47 downto 0);
+ signal bypass_cr : std_logic;
+ signal a_cr : std_logic_vector(17 downto 0);
+ signal b_cr : std_logic_vector(17 downto 0);
+ signal s_cr : std_logic_vector(47 downto 0);
+ signal bypass_cb : std_logic;
+ signal a_cb : std_logic_vector(17 downto 0);
+ signal b_cb : std_logic_vector(17 downto 0);
+ signal s_cb : std_logic_vector(47 downto 0);
+
+ signal compo_out : std_logic_vector(7 downto 0);
+
+begin
+
+ y_multiplier : mult_accum
+ port map (
+ clk => clk,
+ ce => '1',
+ sclr => '0',
+ bypass => bypass_y,
+ a => a_y,
+ b => b_y,
+ s => s_y
+ );
+ cr_multiplier : mult_accum
+ port map (
+ clk => clk,
+ ce => '1',
+ sclr => '0',
+ bypass => bypass_cr,
+ a => a_cr,
+ b => b_cr,
+ s => s_cr
+ );
+ cb_multiplier : mult_accum
+ port map (
+ clk => clk,
+ ce => '1',
+ sclr => '0',
+ bypass => bypass_cb,
+ a => a_cb,
+ b => b_cb,
+ s => s_cb
+ );
+
+
+ cst_y_r <= to_signed(33658, 18);
+ cst_y_g <= to_signed(66077, 18);
+ cst_y_b <= to_signed(12833, 18);
+ cst_cb_r <= to_signed(-19428, 18);
+ cst_cb_g <= to_signed(-38141, 18);
+ cst_cb_b <= to_signed(57569, 18);
+ cst_cr_r <= to_signed(57569, 18);
+ cst_cr_g <= to_signed(-48207, 18);
+ cst_cr_b <= to_signed(-9362, 18);
+
+ multy_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ a_y <= (others => '0');
+ b_y <= (others => '0');
+
+ count_y <= to_unsigned(0, 3);
+ do_sum_y <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_sum_y <= '0';
+
+ a_y <= (others => '0');
+ b_y <= (others => '0');
+
+ if rgb_in_enb = '1' then
+
+ a_y <= "0000000000" & rgb_in;
+
+ if count_y = 0 then
+ b_y <= std_logic_vector(cst_y_b);
+
+ count_y <= to_unsigned(1, 3);
+
+ elsif count_y = 1 then
+ b_y <= std_logic_vector(cst_y_g);
+ count_y <= to_unsigned(2, 3);
+
+ elsif count_y = 2 then
+ b_y <= std_logic_vector(cst_y_r);
+ count_y <= to_unsigned(0, 3);
+ do_sum_y <= '1';
+ end if;
+ end if;
+ end if;
+ end process multy_process;
+
+ sumy_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ bypass_y <= '0';
+ y <= to_signed(0, 9);
+ y_dly1 <= to_signed(0, 9);
+ y_dly2 <= to_signed(0, 9);
+
+ elsif rising_edge(clk) then
+ bypass_y <= do_sum_y;
+ do_sum_y_dly <= do_sum_y;
+ y_dly1 <= y;
+ y_dly2 <= y_dly1;
+
+ if do_sum_y_dly = '1' then
+ y <= to_signed(16, 9) + signed(s_y(25 downto 17));
+ end if;
+ end if;
+
+ end process sumy_process;
+
+ multcb_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ a_cb <= (others => '0');
+ b_cb <= (others => '0');
+
+ count_cb <= to_unsigned(0, 3);
+ do_sum_cb <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_sum_cb <= '0';
+
+ a_cb <= (others => '0');
+ b_cb <= (others => '0');
+
+ if rgb_in_enb = '1' then
+
+ a_cb <= "0000000000" & rgb_in;
+
+ if count_cb = 0 then
+ b_cb <= std_logic_vector(cst_cb_b);
+
+ count_cb <= to_unsigned(1, 3);
+
+ elsif count_cb = 1 then
+ b_cb <= std_logic_vector(cst_cb_g);
+ count_cb <= to_unsigned(2, 3);
+
+ elsif count_cb = 2 then
+ b_cb <= std_logic_vector(cst_cb_r);
+ count_cb <= to_unsigned(0, 3);
+ do_sum_cb <= '1';
+ end if;
+ end if;
+ end if;
+ end process multcb_process;
+
+ sumcb_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ bypass_cb <= '0';
+ cb <= to_signed(0, 9);
+ cb_dly1 <= to_signed(0, 9);
+ elsif rising_edge(clk) then
+ bypass_cb <= do_sum_cb;
+ do_sum_cb_dly <= do_sum_cb;
+ cb_dly1 <= cb;
+
+ if do_sum_cb_dly = '1' then
+ cb <= to_signed(128, 9) + signed(s_cb(25 downto 17));
+ end if;
+ end if;
+
+ end process sumcb_process;
+
+ multcr_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ a_cr <= (others => '0');
+ b_cr <= (others => '0');
+
+ count_cr <= to_unsigned(0, 3);
+ do_sum_cr <= '0';
+
+ elsif rising_edge(clk) then
+
+ do_sum_cr <= '0';
+
+ a_cr <= (others => '0');
+ b_cr <= (others => '0');
+
+ if rgb_in_enb = '1' then
+
+ a_cr <= "0000000000" & rgb_in;
+
+ if count_cr = 0 then
+ b_cr <= std_logic_vector(cst_cr_b);
+
+ count_cr <= to_unsigned(1, 3);
+
+ elsif count_cr = 1 then
+ b_cr <= std_logic_vector(cst_cr_g);
+ count_cr <= to_unsigned(2, 3);
+
+ elsif count_cr = 2 then
+ b_cr <= std_logic_vector(cst_cr_r);
+ count_cr <= to_unsigned(0, 3);
+ do_sum_cr <= '1';
+ end if;
+ end if;
+ end if;
+ end process multcr_process;
+
+ sumcr_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ bypass_cr <= '0';
+ cr <= to_signed(0, 9);
+ do_out_cr <= '0';
+
+ elsif rising_edge(clk) then
+ bypass_cr <= do_sum_cr;
+ do_sum_cr_dly <= do_sum_cr;
+ do_out_cr <= '0';
+
+ if do_sum_cr_dly = '1' then
+ do_out_cr <= '1';
+ cr <= to_signed(128, 9) + signed(s_cr(25 downto 17));
+ end if;
+ end if;
+ end process sumcr_process;
+
+ out_process : process (clk, reset)
+ begin
+ if reset = '1' then
+ do_out_y <= '0';
+ do_out_cb <= '0';
+ elsif rising_edge(clk) then
+ do_out_cb <= do_out_cr;
+ do_out_y <= do_out_cb;
+ end if;
+ end process out_process;
+
+
+ ycbcr_out <= std_logic_vector(y_dly2(7 downto 0)) when do_out_y = '1' else
+ std_logic_vector(cb_dly1(7 downto 0)) when do_out_cb = '1' else
+ std_logic_vector(cr(7 downto 0)) when do_out_cr = '1' else
+ (others => '0');
+ ycbcr_out_enb <= do_out_y or do_out_cb or do_out_cr;
+
+end rtl;
+
diff --git a/threshold_extctl.vhd b/threshold_extctl.vhd
new file mode 100644
index 0000000..90daeae
--- /dev/null
+++ b/threshold_extctl.vhd
@@ -0,0 +1,77 @@
+-------------------------------------------------------------------------------
+--
+-- File : threshold _extctl.vhd
+-- Related files :
+--
+-- Author(s) : stephane Domas (sdomas@univ-fcomte.fr)
+--
+-- Creation Date : 2017/10/16
+--
+-- Description : This IP does a threshold based on a external signal
+--
+--
+-- Note : input data is kept as is depending on the fact that
+-- the keep_in signal is asserted to 1 or not. It it is not,
+-- then input is replaced by the default_value given as a
+-- generic. Note that keep_in_enb and data_in_enb must be
+-- asserted to 1 at the same time so that the block gives an output
+--
+-------------------------------------------------------------------------------
+
+library IEEE;
+use IEEE.std_logic_1164.all;
+use IEEE.numeric_std.all;
+
+entity threshold_extctl is
+ generic(
+ in_width : natural := 8;
+ default_value : natural := 0
+ );
+ port(
+ clk : in std_logic;
+ reset : in std_logic;
+ data_in : in std_logic_vector(in_width-1 downto 0);
+ data_in_enb : in std_logic;
+ keep_in : in std_logic;
+ keep_in_enb : in std_logic;
+ data_out : out std_logic_vector(in_width-1 downto 0);
+ data_out_enb : out std_logic
+
+ );
+end threshold_extctl;
+
+
+architecture rtl of threshold_extctl is
+
+ -- Signals
+ signal def_val : unsigned(in_width-1 downto 0);
+
+begin
+
+ def_val <= to_unsigned(default_value, in_width);
+
+ threshold_process : process (clk, reset)
+ begin
+ if reset = '1' then
+
+ data_out_enb <= '0';
+ data_out <= (others => '0');
+
+ elsif rising_edge(clk) then
+
+ data_out_enb <= '0';
+
+ if data_in_enb = '1' and keep_in_enb = '1' then
+
+ if keep_in = '1' then
+ data_out <= data_in;
+ else
+ data_out <= std_logic_vector(def_val);
+ end if;
+ data_out_enb <= '1';
+ end if;
+ end if;
+ end process threshold_process;
+
+end rtl;
+
diff --git a/toto.xml b/toto.xml
deleted file mode 100644
index 90db6c9..0000000
--- a/toto.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blast_project>
- <scenes count="1">
- <scene id="0" upper_scene="-1">
- <group_item id="1" upper_item="-1" name="top group" position="0,38" dimension="343,128">
- <group_ifaces count="0"/>
- </group_item>
- <source_items count="0"/>
- <block_items functional_count="1" group_count="0">
- <bi_functional id="2" ref_xml="/home/sdomas/Projet/Blast/code/blast/lib/references/demux.xml" ref_md5="aeb14abd65f72dbd4af47b7a660cd94e" name="block demultiplexer" position="45,30" dimension="253,68">
- <bif_parameters>
- <bif_parameter name="val_width" value="0"/>
- <bif_parameter name="sel_width" value="$if_nb"/>
- </bif_parameters>
- <bif_ifaces count="5">
- <bif_iface id="1" name="clk" ref_name="clk" orientation="west" position="0"/>
- <bif_iface id="2" name="rst" ref_name="rst" orientation="west" position="0"/>
- <bif_iface id="3" name="val_i" ref_name="val_i" orientation="west" position="0.333333"/>
- <bif_iface id="4" name="sel_i" ref_name="sel_i" orientation="west" position="0.666667"/>
- <bif_iface id="5" name="val_o" ref_name="val_o" orientation="east" position="0.5"/>
- </bif_ifaces>
- </bi_functional>
- </block_items>
- </scene>
- </scenes>
- <connections/>
-</blast_project>
--
2.39.5