From 718736f825077e345ad396f78735c10e21547982 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Domas?=
<sdomas@prodigy.iut-bm.univ-fcomte.fr>
Date: Wed, 3 May 2017 17:52:22 +0200
Subject: [PATCH 1/1] added impl xsd + patterns in impls
---
Parameters.cpp | 8 +-
blast.creator.user | 8 +-
block.xsd | 188 -------------------
lib/implementations/apf27-wb-master_impl.xml | 2 +-
lib/implementations/demux_impl.xml | 2 +-
lib/implementations/impls.bmf | Bin 584 -> 784 bytes
lib/implementations/multadd_impl.xml | 9 +-
lib/references/references.bmf | Bin 5514 -> 6378 bytes
8 files changed, 11 insertions(+), 206 deletions(-)
delete mode 100644 block.xsd
diff --git a/Parameters.cpp b/Parameters.cpp
index 4fd583d..af8eb22 100644
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -529,7 +529,7 @@ void Parameters::loadReferencesFromXml() throw(Exception) {
blockXML.close();
try {
- validateXmlFile(fileName,"block.xsd",Reference);
+ validateXmlFile(fileName,"reference.xsd",Reference);
}
catch(Exception err) {
throw(err);
@@ -665,14 +665,14 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
implXML.close();
cout << "OK" << endl;
cout << "reading " << qPrintable(fileName) << " content ...";
- /*
+
try {
- validateXmlFile(fileName,"block.xsd",Implementation);
+ validateXmlFile(fileName,"implementation.xsd",Implementation);
}
catch(Exception e) {
throw(e);
}
- */
+
// reading in into QDomDocument
QDomDocument document ("FileXML");
if (!implXML.open(QIODevice::ReadOnly)) {
diff --git a/blast.creator.user b/blast.creator.user
index b7f7e1d..c87af56 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 3.2.1, 2017-05-03T08:26:25. -->
+<!-- Written by QtCreator 3.2.1, 2017-05-03T17:42:11. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{c8006d66-d34f-42be-ad10-d0207752286d}</value>
+ <value type="QByteArray">{1d077e47-e3a1-47fd-8b12-4de650e39df5}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -60,12 +60,12 @@
<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">{2c9bf876-3476-44eb-8065-1f0844704dda}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{451ee8a3-56ff-4aba-8a8e-3da882cc142e}</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>
+ <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/localhome/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">
diff --git a/block.xsd b/block.xsd
deleted file mode 100644
index a5c2c2d..0000000
--- a/block.xsd
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <!-- déclaration des groupes d'attributs -->
-
- <xs:attributeGroup name="parameterAttrGroup">
- <xs:attribute ref="name" use="required"/>
- <xs:attribute ref="type" use="required"/>
- <xs:attribute ref="wishbone" use="optional"/>
- <xs:attribute ref="core" use="optional"/>
- <xs:attribute ref="value" use="optional"/>
- <xs:attribute ref="iface" use="optional"/>
- <xs:attribute ref="width" use="optional"/>
- <xs:attribute ref="context" use="required"/>
- </xs:attributeGroup>
-
- <xs:attributeGroup name="inOutAttrGroup">
- <xs:attribute ref="name" use="required"/>
- <xs:attribute ref="width" use="required"/>
- <xs:attribute ref="type"/>
- <xs:attribute ref="purpose"/>
- <xs:attribute ref="multiplicity"/>
- </xs:attributeGroup>
-
-
- <!-- déclaration des attributs -->
-
- <xs:attribute name="ids" type="xs:string"/>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
- <xs:attribute name="core" type="xs:string"/>
- <xs:attribute name="wishbone" type="xs:string"/>
- <xs:attribute name="context" type="xs:string" />
- <xs:attribute name="multiplicity" type="xs:string" />
- <xs:attribute name="width" type="xs:string"/>
- <xs:attribute name="purpose" type="xs:string"/>
- <xs:attribute name="value" type="xs:string"/>
- <xs:attribute name="iface" type="xs:string"/>
- <xs:attribute name="path" type="xs:string" />
-
-
- <!-- déclaration des groupes d'éléments -->
-
- <xs:group name="blockElmtGroup">
- <xs:sequence>
- <xs:element ref="informations"/>
- <xs:element ref="parameters"/>
- <xs:element ref="interfaces"/>
- <xs:element ref="implementations" minOccurs="0"/>
- </xs:sequence>
- </xs:group>
-
- <xs:group name="informationsElmtGroup">
- <xs:sequence>
- <xs:element ref="name"/>
- <xs:element ref="category"/>
- <xs:element ref="description"/>
- </xs:sequence>
- </xs:group>
-
- <xs:group name="descriptionElmtGroup">
- <xs:sequence>
- <xs:element ref="brief"/>
- <xs:element ref="detailed"/>
- </xs:sequence>
- </xs:group>
-
- <xs:group name="interfacesElmtGroup">
- <xs:sequence>
- <xs:element ref="inputs" minOccurs="0"/>
- <xs:element ref="outputs" minOccurs="1"/>
- <xs:element ref="bidirs" minOccurs="0"/>
- </xs:sequence>
- </xs:group>
-
-
- <!-- déclaration des éléments -->
-
- <xs:element name="informations">
- <xs:complexType>
- <xs:group ref="informationsElmtGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="name" type="xs:string" />
-
- <xs:element name="category">
- <xs:complexType>
- <xs:attribute ref="ids" use="required"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="description">
- <xs:complexType>
- <xs:group ref="descriptionElmtGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="brief" type="xs:string" />
-
- <xs:element name="detailed" type="xs:string" />
-
- <xs:element name="parameters">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="parameter" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="parameter">
- <xs:complexType>
- <xs:attributeGroup ref="parameterAttrGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="interfaces">
- <xs:complexType>
- <xs:group ref="interfacesElmtGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="inputs">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="input" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="input">
- <xs:complexType>
- <xs:attributeGroup ref="inOutAttrGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="outputs">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="output" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="output">
- <xs:complexType>
- <xs:attributeGroup ref="inOutAttrGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="bidirs">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="bidir" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="bidir">
- <xs:complexType>
- <xs:attributeGroup ref="inOutAttrGroup"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="implementations">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="implementation" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="implementation">
- <xs:complexType>
- <xs:attribute ref="path" use="required" />
- </xs:complexType>
- </xs:element>
-
-
- <!-- Racine du document -->
-
- <xs:element name="block">
- <xs:complexType>
- <xs:group ref="blockElmtGroup"/>
- </xs:complexType>
- </xs:element>
-
-</xs:schema>
diff --git a/lib/implementations/apf27-wb-master_impl.xml b/lib/implementations/apf27-wb-master_impl.xml
index 7970abf..2b2548b 100644
--- a/lib/implementations/apf27-wb-master_impl.xml
+++ b/lib/implementations/apf27-wb-master_impl.xml
@@ -2,7 +2,7 @@
<block_impl ref_name="apf27-wb-master.xml" ref_md5="">
<comments>
<author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
- <date creation="2015/04/27" />
+ <date creation="2015-04-27" />
<related_files list="interconn.vhd,clkrstgen.vhd"/>
<description>
This component is an interface between i.MX signals
diff --git a/lib/implementations/demux_impl.xml b/lib/implementations/demux_impl.xml
index bcb7ea8..a61d4e3 100644
--- a/lib/implementations/demux_impl.xml
+++ b/lib/implementations/demux_impl.xml
@@ -2,7 +2,7 @@
<block_impl ref_name="demux.xml" ref_md5="">
<comments>
<author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
- <date creation="2015/04/27" />
+ <date creation="2015-04-27" />
<related_files list=""/>
<description>
This component is a synchronous demultiplixer with variable number of outputs
diff --git a/lib/implementations/impls.bmf b/lib/implementations/impls.bmf
index b447cd00fc83aa972d258290e90574e545720a97..7fd7598fad1ca6067e30c3313a113855cddb779d 100644
GIT binary patch
delta 76
zcmX@XGJ%bQfq|Kafq{W#BFAmkBS6Nii2|j<WelkdMGT1y=|EbS!H=PW!Fb{VQE@q-
L5EiM8S4tQGU+NH)
delta 21
ccmbQhc7lb2fq}_|fq{W}BFF8`s~J-n0WgaM?EnA(
diff --git a/lib/implementations/multadd_impl.xml b/lib/implementations/multadd_impl.xml
index fc2d10f..74a022a 100644
--- a/lib/implementations/multadd_impl.xml
+++ b/lib/implementations/multadd_impl.xml
@@ -2,7 +2,7 @@
<block_impl ref_name="multadd.xml" ref_md5="">
<comments>
<author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />
- <date creation="2015/04/27" />
+ <date creation="2015-04-27" />
<related_files list=""/>
<description>
This component is a multadd
@@ -52,12 +52,5 @@ begin
@{wb_d} <= std_logic_vector(resize(result,2*wb_data_width));
</architecture>
-
- <patterns>
- <parameters>
- <parameter name="m" value="1" />
- </parameters>
- <delta value="1" />
- </patterns>
</block_impl>
diff --git a/lib/references/references.bmf b/lib/references/references.bmf
index 4f6c352e286cae4281e5e186c692bae3e74dbad8..8108f615bc6545a56f3ed5a5f83de9044ece639e 100644
GIT binary patch
delta 522
zcmd6jElvYb6opTl2A&wufGR;2$dsY9b*!KoLDEczX)^&j(CH8y4uKuZCIHn0fkv?k
z1d1i_-Ip4|1`y}Hd(Ztp53R4ZlQupjtv<O$uycyFrI9X_E77@{iglw@GyVy`bYFc3
z+4gUCPXpa5(mwAcwbElXUE93NsVIDp>7PzbCKwxmLM77@pIs>P6RoZ!Bh#GtE?&Oe
z#CEcpRM%vr<XEM}$GiiO!Ck3zzVx3gbFy5fjyg5a0LMDw{x0{lK_A^aFk|&}h}QuT
zw}n`t*T-@bkizuf&gfCEK34kO5X+&4sWQV}M}d)sWW>ykVFF@vVy4Xmzo7$#)obnf
I<t=!3KgnHPPXGV_
delta 22
dcmaE5*rm<Ez#!Vjz`($^kz*&%W<`OM8~{Nm1+4%8
--
2.39.5