added impl xsd + patterns in impls

diff --git a/Parameters.cpp b/Parameters.cpp
index 4fd583d614d70201cb92fff7132b4c06c7fb381c..af8eb220462f28523e0584f026633c7300659ba3 100644 (file)
--- a/Parameters.cpp
+++ b/Parameters.cpp
@@ -529,7 +529,7 @@ void Parameters::loadReferencesFromXml() throw(Exception) {
 \r
       blockXML.close();\r
       try {\r
 \r
       blockXML.close();\r
       try {\r

-        validateXmlFile(fileName,"block.xsd",Reference);\r
+        validateXmlFile(fileName,"reference.xsd",Reference);\r

       }\r
       catch(Exception err) {\r
         throw(err);\r
       }\r
       catch(Exception err) {\r
         throw(err);\r


@@ -665,14 +665,14 @@ void Parameters::loadImplementationsFromXml() throw(Exception) {
       implXML.close();\r
       cout << "OK" << endl;\r
       cout << "reading " << qPrintable(fileName) << " content ...";\r
       implXML.close();\r
       cout << "OK" << endl;\r
       cout << "reading " << qPrintable(fileName) << " content ...";\r

-      /*\r
+\r

       try {\r
       try {\r

-        validateXmlFile(fileName,"block.xsd",Implementation);\r
+        validateXmlFile(fileName,"implementation.xsd",Implementation);\r

       }\r
       catch(Exception e) {\r
         throw(e);\r
       }\r
       }\r
       catch(Exception e) {\r
         throw(e);\r
       }\r

-      */\r
+\r

       // reading in into QDomDocument\r
       QDomDocument document ("FileXML");\r
       if (!implXML.open(QIODevice::ReadOnly)) {\r
       // reading in into QDomDocument\r
       QDomDocument document ("FileXML");\r
       if (!implXML.open(QIODevice::ReadOnly)) {\r

diff --git a/blast.creator.user b/blast.creator.user
index b7f7e1d9bc01fac06a04454c131f7b3ba3f71696..c87af5669790d79df0039e777bb87114da87943c 100755 (executable)
--- a/blast.creator.user
+++ b/blast.creator.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
 <?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>
 <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>
  </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>
   <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="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">
     <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 (file)
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 7970abf209cc35de631845a25e34d0f2a8c0a90a..2b2548ba8b4ddaec55b3a30ad2adc4a54e281e5e 100644 (file)
--- 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" />
 <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
     <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 bcb7ea8a14938725666e8ebc9cbce8e6a4caa6d2..a61d4e3c76f84c6dac988f06b90376d097017878 100644 (file)
--- 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" />
 <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
     <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 (file)
Binary files a/lib/implementations/impls.bmf and b/lib/implementations/impls.bmf differ

diff --git a/lib/implementations/multadd_impl.xml b/lib/implementations/multadd_impl.xml
index fc2d10f785eba295da5703dd6a7c8a08ce35953f..74a022a3207db0beb475b904143c447e33bb1045 100644 (file)
--- a/lib/implementations/multadd_impl.xml
+++ b/lib/implementations/multadd_impl.xml
@@ -2,7 +2,7 @@
 <block_impl ref_name="multadd.xml" ref_md5="">\r
   <comments>\r
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />\r
 <block_impl ref_name="multadd.xml" ref_md5="">\r
   <comments>\r
     <author firstname="stephane" lastname="Domas" mail="sdomas@univ-fcomte.fr" />\r

-    <date creation="2015/04/27" />\r
+    <date creation="2015-04-27" />\r

     <related_files list=""/>\r
     <description>\r
       This component is a multadd\r
     <related_files list=""/>\r
     <description>\r
       This component is a multadd\r


@@ -52,12 +52,5 @@ begin
   @{wb_d} &lt;= std_logic_vector(resize(result,2*wb_data_width));\r
   \r
   </architecture>\r
   @{wb_d} &lt;= std_logic_vector(resize(result,2*wb_data_width));\r
   \r
   </architecture>\r

-\r
-  <patterns>\r
-    <parameters>\r
-      <parameter name="m" value="1" />\r
-    </parameters>    \r
-    <delta value="1" />\r
-  </patterns>\r

   \r
 </block_impl>\r
   \r
 </block_impl>\r

diff --git a/lib/references/references.bmf b/lib/references/references.bmf
index 4f6c352e286cae4281e5e186c692bae3e74dbad8..8108f615bc6545a56f3ed5a5f83de9044ece639e 100644 (file)
Binary files a/lib/references/references.bmf and b/lib/references/references.bmf differ