Changeset 113 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/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/Generic/Comparator/src

Files:

• Comparator.cpp (modified) (1 diff)
• Comparator_allocation.cpp (modified) (1 diff)
• Comparator_deallocation.cpp (modified) (1 diff)
• Comparator_genMealy.cpp (added)
• Comparator_vhdl.cpp (modified) (1 diff)
• Comparator_vhdl_xilinx_body.cpp (added)
• Comparator_vhdl_xilinx_declaration.cpp (added)
• Parameters.cpp (modified) (3 diffs)
• Parameters_msg_error.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Comparator.cpp

@@ -77 +77 @@
 # endif    
 
-//      log_printf(INFO,Comparator,FUNCTION,_("<%s> : Method - genMoore"),_name.c_str());
+        log_printf(INFO,Comparator,FUNCTION,_("<%s> : Method - genMealy"),_name.c_str());
 
-//      SC_METHOD (genMoore);
-//      dont_initialize ();
-//      sensitive << (*(in_CLOCK)).neg(); // need internal register
+        SC_METHOD (genMealy);
+        dont_initialize ();
+//      sensitive << (*(in_CLOCK)).neg(); // don't need internal register
+        sensitive << (*(in_COMPARE_DATA_0))
+                  << (*(in_COMPARE_DATA_1));
         
-// # ifdef SYSTEMCASS_SPECIFIC
-//      // List dependency information
-// # endif    
+# ifdef SYSTEMCASS_SPECIFIC
+        // List dependency information
+# endif    
         
 #endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Comparator_allocation.cpp

@@ -53 +53 @@
       in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1, RESET_VHDL_YES);
     }
+
+    // ~~~~~[ Interface : "compare" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    {
+      ALLOC0_INTERFACE_BEGIN("compare",IN,SOUTH,_("Compare interface"));
+
+      ALLOC0_SIGNAL_IN ( in_COMPARE_DATA_0,"DATA_0",Tdata_t   ,_param->_size_data);
+      ALLOC0_SIGNAL_IN ( in_COMPARE_DATA_1,"DATA_1",Tdata_t   ,_param->_size_data);
+      ALLOC0_SIGNAL_OUT(out_COMPARE_TEST  ,"TEST"  ,Tcontrol_t,1);
+
+      ALLOC0_INTERFACE_END();
+    }
+
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Comparator_deallocation.cpp

@@ -25 +25 @@
         delete    in_CLOCK ;
         delete    in_NRESET;
+
+        DELETE0_SIGNAL( in_COMPARE_DATA_0,_param->_size_data);
+        DELETE0_SIGNAL( in_COMPARE_DATA_1,_param->_size_data);
+        DELETE0_SIGNAL(out_COMPARE_TEST  ,1);
       }
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Comparator_vhdl.cpp

@@ -27 +27 @@
     _component->vhdl_instance(vhdl);
 
+    // default architecture
     vhdl_declaration (vhdl);
     vhdl_body        (vhdl);
+
+    // Xilinx architecture
+    vhdl->set_architecture("xilinx");
+    vhdl_xilinx_declaration (vhdl);
+    vhdl_xilinx_body        (vhdl);
 
     vhdl->generate_file();

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Parameters.cpp

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Comparator/include/Parameters.h"
+#include "Common/include/BitManipulation.h"
 
 namespace morpheo {
@@ -12 +13 @@
 namespace generic {
 namespace comparator {
-
 
 #undef  FUNCTION
@@ -28 +28 @@
 
     test();
+
+    _extends   = gen_mask_not<int64_t>(_size_data);
+    _mask_sign = (1<<(_size_data-1));
 
     if (is_toplevel)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/src/Parameters_msg_error.cpp

@@ -24 +24 @@
     Parameters_test test ("Comparator");
 
+    if (_size_data > 64)
+      test.error(_("Max size is 64 bits.\n"));
+
     log_end(Comparator,FUNCTION);