Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/SelfTest

Timestamp:

Jun 26, 2009, 10:43:23 AM (15 years ago)

Author:

rosiere

Message:

1) Correct bug in link two signal
2) Fix error detected with valgrind
3) modif distexe script

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/SelfTest/src

Files:

• main.cpp (modified) (2 diffs)
• test.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/SelfTest/src/main.cpp

@@ -15 +15 @@
   err (_("<Usage> %s name_instance list_params.\n"),argv[0]);
   err (_("list_params is :\n"));
+//err (_(" * nb_thread                                                                 (uint32_t         )\n"));
   err (_(" * nb_execute_loop                                                           (uint32_t         )\n"));
   err (_(" * nb_load_store_unit [nb_execute_loop]                                      (uint32_t         )\n"));
@@ -158 +159 @@
       
       test (name,param);
+
+      delete param;
     }
   catch (morpheo::ErrorMorpheo & error)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Dcache_Access/SelfTest/src/test.cpp

@@ -54 +54 @@
   sc_clock              *  in_CLOCK  = new sc_clock ("clock", 1.0, 0.5);         
   sc_signal<Tcontrol_t> *  in_NRESET = new sc_signal<Tcontrol_t> ("NRESET");
+
+  sc_signal<Tcontrol_t        >   ** out_DCACHE_REQ_VAL         ;
+  sc_signal<Tcontrol_t        >   **  in_DCACHE_REQ_ACK         ;
+  sc_signal<Tcontext_t        >   ** out_DCACHE_REQ_THREAD_ID   ;
+  sc_signal<Tpacket_t         >   ** out_DCACHE_REQ_PACKET_ID   ;
+  sc_signal<Tdcache_address_t >   ** out_DCACHE_REQ_ADDRESS     ;
+  sc_signal<Tdcache_data_t    >   ** out_DCACHE_REQ_WDATA       ;
+  sc_signal<Tdcache_type_t    >   ** out_DCACHE_REQ_TYPE        ;
+
+  sc_signal<Tcontrol_t        >   **  in_DCACHE_RSP_VAL         ;
+  sc_signal<Tcontrol_t        >   ** out_DCACHE_RSP_ACK         ;
+  sc_signal<Tcontext_t        >   **  in_DCACHE_RSP_THREAD_ID   ;
+  sc_signal<Tpacket_t         >   **  in_DCACHE_RSP_PACKET_ID   ;
+  sc_signal<Tdcache_data_t    >   **  in_DCACHE_RSP_RDATA       ;
+  sc_signal<Tdcache_error_t   >   **  in_DCACHE_RSP_ERROR       ;
+
+  sc_signal<Tcontrol_t        > ****  in_LSQ_REQ_VAL            ;
+  sc_signal<Tcontrol_t        > **** out_LSQ_REQ_ACK            ;
+  sc_signal<Tcontext_t        > ****  in_LSQ_REQ_THREAD_ID      ;
+  sc_signal<Tpacket_t         > ****  in_LSQ_REQ_PACKET_ID      ;
+  sc_signal<Tdcache_address_t > ****  in_LSQ_REQ_ADDRESS        ;
+  sc_signal<Tdcache_data_t    > ****  in_LSQ_REQ_WDATA          ;
+  sc_signal<Tdcache_type_t    > ****  in_LSQ_REQ_TYPE           ;
+
+  sc_signal<Tcontrol_t        > **** out_LSQ_RSP_VAL            ;
+  sc_signal<Tcontrol_t        > ****  in_LSQ_RSP_ACK            ;
+  sc_signal<Tcontext_t        > **** out_LSQ_RSP_THREAD_ID      ;
+  sc_signal<Tpacket_t         > **** out_LSQ_RSP_PACKET_ID      ;
+  sc_signal<Tdcache_data_t    > **** out_LSQ_RSP_RDATA          ;
+  sc_signal<Tdcache_error_t   > **** out_LSQ_RSP_ERROR          ;
 
   ALLOC1_SC_SIGNAL(out_DCACHE_REQ_VAL         ,"out_DCACHE_REQ_VAL      ",Tcontrol_t        ,_param->_nb_dcache_port);
@@ -183 +213 @@
   in_NRESET->write(1);  
 
+#ifdef SELFTEST
   LABEL("Loop of Test");
 
@@ -280 +311 @@
       SC_START(1);
     }
+#else
+  SC_START(5);
+#endif
 
   /********************************************************