Changeset 41 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interface.h

Timestamp:

Jun 7, 2007, 9:13:47 PM (17 years ago)

Author:

rosiere

Message:

Vhdl_Testbench : Modification du testbench. Maintenant complétement encapsuler dans la classe "Interfaces".
Suppression de la class Vhdl_Testbench dans un avenir proche :D
Suppression du répertoire Configuration.old

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interface.h (modified) (7 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interface.h

@@ -21 +21 @@
 #ifdef VHDL
 #include "Behavioural/include/Vhdl.h"
-#endif
-#ifdef VHDL_TESTBENCH
-#include "Behavioural/include/Vhdl_Testbench.h"
 #endif
 #include "Include/ToString.h"
@@ -53 +50 @@
 
 #ifdef VHDL_TESTBENCH
-  private   : list<string>        * _list_cycle   ;
+  private   : uint32_t              _nb_cycle     ;
 #endif
     
@@ -80 +77 @@
   public    : sc_in_clk *           set_signal_clk       (string          name     ,
                                                           uint32_t        size     ,
-                                                          presence_port_t presence_port=PORT_VHDL_YES_TESTBENCH_YES)
+                                                          presence_port_t presence_port=CLOCK_VHDL_YES)
     {
       log_printf(FUNC,Behavioural,"set_signal_clk","Begin");
 
-      Signal * sig = set_signal (name, IN , size, presence_port);
+      if ((presence_port != CLOCK_VHDL_YES) and
+          (presence_port != CLOCK_VHDL_NO ))
+        throw ErrorMorpheo ("Signal \""+name+"\" is a clock, bad presence_port.");
+
+      Signal    * sig    = set_signal (name, IN , size, presence_port);
       sc_in_clk * signal = new sc_in_clk (sig->_name.c_str());
 
@@ -98 +99 @@
     {
       log_printf(FUNC,Behavioural,"set_signal_in","Begin");
+
+      if ((presence_port == CLOCK_VHDL_YES) or 
+          (presence_port == CLOCK_VHDL_NO ))
+        throw ErrorMorpheo ("Signal \""+name+"\" is not a clock, bad presence_port.");
 
       Signal * sig = set_signal (name, IN , size, presence_port);
@@ -117 +122 @@
       log_printf(FUNC,Behavioural,"set_signal_out","Begin");
 
+      if ((presence_port == CLOCK_VHDL_YES) or 
+          (presence_port == CLOCK_VHDL_NO ))
+        throw ErrorMorpheo ("Signal \""+name+"\" is not a clock, bad presence_port.");
+
       Signal * sig = set_signal (name, OUT , size, presence_port);
       sc_out <T> * port = new sc_out <T> (sig->_name.c_str());
@@ -131 +140 @@
 #ifdef VHDL
   public    : void                  set_port             (Vhdl * & vhdl);
+#ifdef VHDL_TESTBENCH
+  public    : void                  set_signal           (Vhdl * & vhdl);
+  public    : void                  get_signal           (list<string> * & list_signal);
+#endif
 #endif
 #ifdef VHDL_TESTBENCH
-  public    : void                  set_port             (Vhdl_Testbench * & vhdl_testbench);
+  public    : uint32_t              get_cycle            (void);
+  public    : string                get_clock            (void);
+
+  public    : void                  testbench            (void);
+  public    : void                  testbench_cycle      (void);
+  public    : void                  testbench_body       (Vhdl           * & vhdl          ,
+                                                          string             counter_name  );
+  public    : string                testbench_test       (Vhdl           * & vhdl        ,
+                                                          string             counter_name);
+  public    : string                testbench_test_ok    (Vhdl           * & vhdl        );
+  protected : string                testbench_test_name   (Vhdl           * & vhdl);
+  protected : string                testbench_test_ok_name(Vhdl           * & vhdl);
+
 #endif
 
@@ -139 +164 @@
   public    : void                  port_map             (void * entity,
                                                           void * interface);
-#endif
-
-#ifdef VHDL_TESTBENCH
-  public    : void                  testbench_cycle      (void);
-  public    : void                  testbench            (Vhdl_Testbench * & vhdl_testbench);
 #endif