Changeset 132 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Timestamp:

Jul 11, 2009, 6:39:35 PM (15 years ago)

Author:

rosiere

Message:

1) add constant method - compatibility with SystemC
2) add Script to test sensitive list
3) fix bug in sensitive list

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Files:

• Comparator/src/Comparator.cpp (modified) (1 diff)
• Counter/src/Counter.cpp (modified) (1 diff)
• Multiplier/src/Multiplier.cpp (modified) (1 diff)
• RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (modified) (1 diff)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked.cpp (modified) (2 diffs)
• Shifter/src/Shifter.cpp (modified) (1 diff)
• Sort/src/Sort.cpp (modified) (1 diff)
• Sort/src/Sort_genMealy.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU.cpp (modified) (1 diff)

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

@@ -82 +82 @@
         dont_initialize ();
 //      sensitive << (*(in_CLOCK)).neg(); // don't need internal register
-        sensitive << (*(in_COMPARE_DATA_0))
+        sensitive << (*(in_NRESET))
+                  << (*(in_COMPARE_DATA_0))
                   << (*(in_COMPARE_DATA_1));
         

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

@@ -77 +77 @@
         SC_METHOD (genMealy);
         dont_initialize ();
+        sensitive << (*(in_NRESET));
         for (uint32_t i=0; i<_param->_nb_port; i++)
           sensitive << *(in_COUNTER_DATA   [i])

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

@@ -82 +82 @@
         dont_initialize ();
         sensitive << (*(in_CLOCK)).neg(); // need internal register
+        sensitive << (*(in_NRESET));
 
         if (_param->_latency == 0)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp

@@ -70 +70 @@
         SC_METHOD (genMealy_read);
         dont_initialize ();
-        sensitive << (*(in_CLOCK)).neg();
+        sensitive << (*(in_CLOCK)).neg()
+                  << (*(in_NRESET));
+
         for (uint32_t i=0; i<_param->_nb_port_read; i++)
           {

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked.cpp

@@ -95 +95 @@
     SC_METHOD (genMealy_read);
     dont_initialize ();
-    sensitive << (*(in_CLOCK)).neg();
+    sensitive << (*(in_CLOCK)).neg()
+              << (*(in_NRESET));
     for (uint32_t i=0; i<_param->_nb_port_read; i++)
       {
@@ -124 +125 @@
     SC_METHOD (genMealy_write);
     dont_initialize ();
-    sensitive<< (*(in_CLOCK)).neg();
+    sensitive<< (*(in_CLOCK)).neg()
+             << (*(in_NRESET));
     for (uint32_t i=0; i<_param->_nb_port_write; i++)
       {

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

@@ -67 +67 @@
     SC_METHOD (genMealy_shift);
     dont_initialize ();
-    sensitive << (*(in_CLOCK)).neg();
+    sensitive << (*(in_CLOCK)).neg()
+              << (*(in_NRESET));
     for (uint32_t i=0; i<param->_nb_port; i++)
       {

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

@@ -88 +88 @@
         dont_initialize ();
 //      sensitive << (*(in_CLOCK)).neg(); // don't use internal register
+        sensitive << (*(in_NRESET));
         for (uint32_t i=0; i<_param->_nb_input; i++)
           sensitive << (*(in_INPUT_VAL  [i]))

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_genMealy.cpp

@@ -29 +29 @@
       {
         array[i].index = i;
-        array[i].val   = PORT_READ ( in_INPUT_VAL  [i]);
-        array[i].data  = PORT_READ ( in_INPUT_DATA [i]);
+        array[i].val   = PORT_READ( in_INPUT_VAL  [i]);
+        array[i].data  = PORT_READ( in_INPUT_DATA [i]);
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU.cpp

@@ -78 +78 @@
     SC_METHOD (genMealy);
     dont_initialize ();
-    sensitive << (*(in_CLOCK)).neg();
+    sensitive << (*(in_CLOCK)).neg()
+              << (*(in_NRESET));
     for (uint32_t i=0; i<_param->_nb_access; i++)
       if (_param->_size_table>1)