Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/SelfTest/src/test.cpp

Timestamp:

Jan 31, 2008, 6:46:41 PM (16 years ago)

Author:

rosiere

Message:

Update all component (except front_end) to :

• new statistics model
• no namespace std

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/SelfTest/src/test.cpp (modified) (5 diffs)

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

@@ -33 +33 @@
       exit (EXIT_FAILURE);
     }
+
+#ifdef STATISTICS
+  morpheo::behavioural::Parameters_Statistics * param_stat = new morpheo::behavioural::Parameters_Statistics(5,50);
+#endif
   Shifter * _Shifter = new Shifter (name.c_str(),
 #ifdef STATISTICS
-                                             morpheo::behavioural::Parameters_Statistics(5,50),
-#endif
-                                             param);
+                                    param_stat,
+#endif
+                                    param);
   
 #ifdef SYSTEMC
@@ -48 +52 @@
   sc_signal <Tshift_t    >                 SHIFTER_SHIFT     [param._nb_port];
   sc_signal <Tdirection_t>                 SHIFTER_DIRECTION [param._nb_port];
-  sc_signal <Ttype_t     >                 SHIFTER_TYPE      [param._nb_port];
+  sc_signal <morpheo::behavioural::generic::shifter::Ttype_t     >                 SHIFTER_TYPE      [param._nb_port];
   sc_signal <Tcarry_t    >                 SHIFTER_CARRY     [param._nb_port];
   sc_signal <Tcontrol_t  >                 SHIFTER_CARRY_IN  [param._nb_port];
@@ -96 +100 @@
 
   Tdirection_t   direction       ;
-  Ttype_t        type            ;
+  morpheo::behavioural::generic::shifter::Ttype_t        type            ;
   Tcarry_t       carry           ; 
   const Tdata_t  data_max        = (1<<param._size_data);
@@ -271 +275 @@
                        << hex
                        << data_in[i] << op
-                       << dec 
+                       << std::dec 
                        << shift      << " = " 
-                       << hex
+                       << std::hex
                        << SHIFTER_DATA_OUT [i].read()
                        << " - completion : "
                        << data_completion [i]
-                       << dec ;
+                       << std::dec ;
                   
                   TEST(Tdata_t,SHIFTER_DATA_OUT [i].read(),data_out[i]);
@@ -298 +302 @@
 
   delete _Shifter;
+
+#ifdef STATISTICS
+  delete param_stat;
+#endif
 }