Changeset 113 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src

Timestamp:

Apr 14, 2009, 8:39:12 PM (15 years ago)

Author:

rosiere

Message:

1) Add modelsim simulation systemC
2) Modelsim cosimulation systemC / VHDL is not finish !!!! (cf execute_queue and write_unit)
3) Add multi architecture
5) Add template for comparator, multiplier and divider
6) Change Message
Warning) Various test macro have change, many selftest can't compile

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src

Files:

• New_Component.cpp (modified) (3 diffs)
• New_Component_allocation.cpp (modified) (3 diffs)
• New_Component_deallocation.cpp (modified) (1 diff)
• New_Component_statistics_allocation.cpp (modified) (1 diff)
• Parameters.cpp (modified) (1 diff)
• Parameters_id.cpp (added)
• Parameters_msg_error.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component.cpp

@@ -29 +29 @@
     _name              (name)
     ,_param            (param)
-    ,_usage            (usage)
   {
     log_begin(@COMPONENT,FUNCTION);
 
-    usage_environment(_usage);
+    _usage = usage_environment(usage);
+
+#ifdef MODELSIM_COSIMULATION
+    if (_model.get_type(_param->_type) == MODEL_VHDL)
+      {
+        _usage = usage_cosimulation(_usage);
+      }
+#endif
 
     log_printf(INFO,@COMPONENT,FUNCTION,_("<%s> : Allocation"),_name.c_str());
@@ -63 +69 @@
 
 #ifdef SYSTEMC
-    if (usage_is_set(_usage,USE_SYSTEMC))
+    if (usage_is_set(_usage,USE_SYSTEMC_BODY))
       {
         log_printf(INFO,@COMPONENT,FUNCTION,_("<%s> : Method - transition"),_name.c_str());
@@ -85 +91 @@
 // # endif    
         
+      }
 #endif
-      }
+
     log_end(@COMPONENT,FUNCTION);
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component_allocation.cpp

@@ -10 +10 @@
 #include "Common/include/Max.h"
 
-namespace morpheo                    {
+namespace morpheo {
 namespace behavioural {
 @NAMESPACE_BEGIN
@@ -30 +30 @@
 
     Entity * entity = _component->set_entity (_name       
-                                              ,"@COMPONENT"
+                                              ,_param->_type
 #ifdef POSITION
                                               ,COMBINATORY 
@@ -58 +58 @@
 #endif
 
+#ifdef MODELSIM_COSIMULATION
+    if (usage_is_set(_usage,USE_COSIMULATION))
+      {
+        log_printf(INFO,Execute_queue,FUNCTION,_("<%s> : Create Wrapper"),_name.c_str());
+
+        _wrapper = new Wrapper_@COMPONENT (_name.c_str(),"morpheo_behavioural","work");
+      }
+#endif
+
     log_end(@COMPONENT,FUNCTION);
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component_deallocation.cpp

@@ -19 +19 @@
     log_begin(@COMPONENT,FUNCTION);
 
-    if (usage_is_set(_usage,USE_SYSTEMC))
-      {
-        delete    in_CLOCK ;
-        delete    in_NRESET;
+//    if (usage_is_set(_usage,USE_SYSTEMC_INTERFACE))
+      { 
+        DELETE0_SIGNAL( in_CLOCK ,1);
+        DELETE0_SIGNAL( in_NRESET,1);
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
     delete _component;
+
+#ifdef MODELSIM_COSIMULATION
+    if (usage_is_set(_usage,USE_COSIMULATION))
+      {
+        delete _wrapper;
+      }
+#endif
 
     log_end(@COMPONENT,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component_statistics_allocation.cpp

@@ -20 +20 @@
 
     _stat = new Stat (static_cast<std::string>(_name),
-                      "@COMPONENT",
+                      _param->_type,
                       param_statistics);
     

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/Parameters.cpp

@@ -14 +14 @@
 #undef  FUNCTION
 #define FUNCTION "@COMPONENT::Parameters"
-  Parameters::Parameters (bool is_toplevel)
+  Parameters::Parameters (bool is_toplevel):
+    behavioural::Parameters ("@COMPONENT")
   {
     log_begin(@COMPONENT,FUNCTION);

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/Parameters_msg_error.cpp

@@ -20 +20 @@
     log_begin(@COMPONENT,FUNCTION);
 
-    Parameters_test test ("@COMPONENT");
+    Parameters_test test (_type);
 
     log_end(@COMPONENT,FUNCTION);