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

Timestamp:

Mar 6, 2007, 3:34:04 PM (18 years ago)

Author:

kane

Message:

1) Ajout d'un "printer" XML pour la configuration de paramètres

2) Fin du composant "Two_Level_Branch_Predictor"

validation * systemc

• vhdl

Location:

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

Files:

• Counter/src/Counter_genMealy.cpp (modified) (1 diff)
• Counter/src/Parameters_print.cpp (modified) (2 diffs)
• RegisterFile/src/RegisterFile_genMealy_read.cpp (modified) (1 diff)
• RegisterFile/src/RegisterFile_transition.cpp (modified) (2 diffs)

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

@@ -21 +21 @@
     for (uint32_t i=0; i<_param._nb_port; i++)
       {
-        Tdata_t data = PORT_READ(in_COUNTER_DATA [i]);
+        Tcontrol_t addsub  = PORT_READ(in_COUNTER_ADDSUB [i]);
+        Tdata_t    data_in = PORT_READ(in_COUNTER_DATA   [i]);
+        Tdata_t    data_out= data_in;
+        log_printf(TRACE,Counter,"genMealy","before : %d %s = %d",data_in,((addsub==1)?"++":"--"),data_out);
 
         // Staturate counter
-        if (PORT_READ(in_COUNTER_ADDSUB [i]) == 1)
+        if (addsub == 1)
           {
-            if (data < _param._data_max)
-              data ++;
+            if (data_out < _param._data_max)
+              data_out++;
           }
         else
           {
-            if (data > 0)
-              data --;
+            if (data_out > 0)
+              data_out--;
           }
 
-        PORT_WRITE(out_COUNTER_DATA[i], data);
+        log_printf(TRACE,Counter,"genMealy","after   : %d %s = %d",data_in,((addsub==1)?"++":"--"),data_out);
+    
+        PORT_WRITE(out_COUNTER_DATA[i], data_out);
       }
 

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

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Counter/include/Parameters.h"
-#include <sstream>
+#include "Behavioural/include/XML.h"
 using namespace std;
 
@@ -20 +20 @@
     log_printf(FUNC,Counter,"print","Begin");
 
-    string tab = string(depth,'\t');
-    ostringstream msg;
-    msg << tab << "<counter>" << endl
-        << tab << "\t<size_data value=\"" << _size_data << "\" />" << endl
-        << tab << "\t<nb_port   value=\"" << _nb_port   << "\" />" << endl
-        << tab << "</counter>" << endl;
+    XML xml ("counter");
+
+    xml.balise_open("counter");
+    xml.  singleton_begin("size_data");
+    xml.    attribut("value",toString(_size_data));
+    xml.  singleton_end();
+    xml.  singleton_begin("nb_port  ");
+    xml.    attribut("value",toString(_nb_port));
+    xml.  singleton_end();
+    xml.balise_close();
 
     log_printf(FUNC,Counter,"print","End");
     
-    return msg.str();
+    return xml.get_body(depth);
   };
 

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

@@ -27 +27 @@
         if ( PORT_READ(in_READ_ENABLE[i]) == 1)
           {
-            log_printf(TRACE,Register_File,"genMealy_read","Read  [%d] : Have transaction, Reg[%d] -> %x",i,PORT_READ(in_READ_ADDRESS[i]),REGISTER_READ(reg_DATA[PORT_READ(in_READ_ADDRESS[i])]));
+            Taddress_t address = PORT_READ(in_READ_ADDRESS[i]);
+            Tdata_t    data    = REGISTER_READ(reg_DATA[address]);
+
+            log_printf(TRACE,Register_File,"genMealy_read","[%d] -> %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
+
 #ifdef STATISTICS
             _stat_nb_read ++;
 #endif    
             // Write in registerFile
-            PORT_WRITE(out_READ_DATA[i],REGISTER_READ(reg_DATA[PORT_READ(in_READ_ADDRESS[i])]));
+            PORT_WRITE(out_READ_DATA[i],data);
           }
         else

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

@@ -26 +26 @@
         if ( PORT_READ(in_WRITE_ENABLE[i]) == true)
           {
-            log_printf(TRACE,Register_File,"transition","Write [%d] : Have transaction, Reg[%d] <- %x",i,PORT_READ(in_WRITE_ADDRESS[i]),PORT_READ(in_WRITE_DATA   [i]));
-            
 #ifdef STATISTICS
             _stat_nb_write ++;
@@ -35 +33 @@
             Tdata_t    data    = PORT_READ(in_WRITE_DATA   [i]);
             
+            log_printf(TRACE,Register_File,"transition","[%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
+
             // Write in registerFile
             REGISTER_WRITE(reg_DATA[address],data);