Changeset 131 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration

Timestamp:

Jul 8, 2009, 8:40:08 PM (15 years ago)

Author:

rosiere

Message:

1) add constant method
2) test with systemc 2.2.0

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration

Files:

• SelfTest/src/test.cpp (modified) (1 diff)
• src/Generator_toXML.cpp (modified) (2 diffs)
• src/Instance_toXML.cpp (modified) (2 diffs)
• src/Simulator_toXML.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/SelfTest/src/test.cpp

@@ -59 +59 @@
     cout << "------------------------------------------------------" << endl;
 
-    Instance * instance = new Instance ("../../../Files/Instance_x2_w1_6.cfg",
+    Instance * instance = new Instance ("../../../Files/Instance_x4_w8_1.cfg",
+                                        generator1,
+                                        _get_custom_information
+                                        );
+    instance->toFile("data_out");
+    
+    delete instance;
+  }
+
+  {
+    cout << "------------------------------------------------------" << endl;
+
+    Instance * instance = new Instance ("../../../Files/Instance_x4_w8_2.cfg",
                                         generator1,
                                         _get_custom_information

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Generator_toXML.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Configuration/include/Generator.h"
+#include "Common/include/Basename.h"
 
 namespace morpheo {
@@ -16 +17 @@
   XML Generator::toXML (void)
   {
-    XML xml (basename(_filename.c_str()));
-    xml.filename_extension("");
+    XML xml (basename(_filename,false).c_str());
+    xml.filename_extension("gen");
     
     xml.balise_open("parameters");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_toXML.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Configuration/include/Instance.h"
+#include "Common/include/Basename.h"
 
 namespace morpheo {
@@ -16 +17 @@
   XML Instance::toXML (void)
   {
-    XML xml (basename(_filename.c_str()));
-    xml.filename_extension("");
+    XML xml (basename(_filename,false).c_str());
+    xml.filename_extension("cfg");
     
     xml.balise_open_begin("core");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_toXML.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Configuration/include/Simulator.h"
+#include "Common/include/Basename.h"
 
 namespace morpheo {
@@ -16 +17 @@
   XML Simulator::toXML (void)
   {
-    XML xml (basename(_filename.c_str()));
-    xml.filename_extension("");
+    XML xml (basename(_filename,false).c_str());
+    xml.filename_extension("sim");
     
     xml.balise_open("parameters");