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

Timestamp:

Jul 5, 2007, 5:50:19 PM (17 years ago)

Author:

rosiere

Message:

Modification des classes d'encapsulation des interfaces :

• gère les signaux à écrire dans le vhdl
• les traces pour le testbench
• la génération des vhdl structurelles

-> test sur la Pattern History Table

File:

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

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

@@ -33 +33 @@
   class Interface
   {
-    friend class Interfaces;
-
     // -----[ fields ]----------------------------------------------------
   protected : const string          _name         ;
+#ifdef POSITION
   protected : const direction_t     _direction    ;
   protected : const localisation_t  _localisation ;
   protected :       string          _comment      ;
+#endif
 
   protected : list<Signal *>      * _list_signal  ;
@@ -54 +54 @@
     
     // -----[ methods ]---------------------------------------------------
-  public    :                       Interface            (string         name        ,
-                                                          direction_t    direction   ,
-                                                          localisation_t localisation);
+  public    :                       Interface            (string         name        
+#ifdef POSITION
+                                                          ,direction_t    direction   
+                                                          ,localisation_t localisation
+#endif
+                                                          );
 
   public    :                       Interface            (const Interface    & interface);
   public    :                       ~Interface           ();
 
+  public    : string                get_name             ();
+
+#ifdef POSITION
   public    : void                  set_comment          (string comment);
   protected : string                get_comment          (void          );
+#endif
 
   protected : string                signal_name          (string      name_interface,
                                                           string      name_signal   ,
                                                           direction_t direction     );
+
+  public    : Signal *              find_signal          (string name);
+  public    : bool                  find_signal          (Signal * signal);
 
   protected : string                get_signal           (void);
@@ -73 +83 @@
                                                           uint32_t        size     ,
                                                           presence_port_t presence_port = PORT_VHDL_YES_TESTBENCH_YES);
+  public    : list<Signal *>      * get_signal_list      (void);
 
 #ifdef SYSTEMC
@@ -85 +96 @@
         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());
+      Signal    * sig  = set_signal (name, IN , size, presence_port);
+      sc_in_clk * port = new sc_in_clk (sig->_name.c_str());
+
+      sig->alloc<bool> (static_cast<void *>(port));
 
       log_printf(FUNC,Behavioural,"set_signal_clk","End");
 
-      return signal;
+      return port;
     };
 
@@ -104 +117 @@
         throw ErrorMorpheo ("Signal \""+name+"\" is not a clock, bad presence_port.");
 
-      Signal * sig = set_signal (name, IN , size, presence_port);
+      Signal    * sig  = set_signal (name, IN , size, presence_port);
       sc_in <T> * port = new sc_in <T> (sig->_name.c_str());
-#ifdef VHDL_TESTBENCH
+
       sig->alloc<T> (static_cast<void *>(port));
-#endif
 
       log_printf(FUNC,Behavioural,"set_signal_in","End");
@@ -128 +140 @@
       Signal * sig = set_signal (name, OUT , size, presence_port);
       sc_out <T> * port = new sc_out <T> (sig->_name.c_str());
-#ifdef VHDL_TESTBENCH
+
       sig->alloc<T> (static_cast<void *>(port));
-#endif
 
       log_printf(FUNC,Behavioural,"set_signal_out","End");
@@ -136 +147 @@
       return port;
     };
+
+  public    : template <typename T>
+              sc_signal <T> *       set_signal_internal (string   name,
+                                                         uint32_t size)
+    {
+      log_printf(FUNC,Behavioural,"set_signal_internal","Begin");
+
+      Signal * sig = set_signal (name, INTERNAL , size, PORT_VHDL_NO_TESTBENCH_NO);
+      sc_signal <T> * port = new sc_signal <T> (sig->_name.c_str());
+
+      sig->alloc<T> (static_cast<void *>(port));
+
+      log_printf(FUNC,Behavioural,"set_signal_internal","End");
+
+      return port;
+    };
+
 #endif
 
 #ifdef VHDL
   public    : void                  set_port             (Vhdl * & vhdl);
-#ifdef VHDL_TESTBENCH
+#  ifdef VHDL_TESTBENCH
   public    : void                  set_signal           (Vhdl * & vhdl);
   public    : void                  get_signal           (list<string> * & list_signal);
-#endif
+#  endif
 #endif
 #ifdef VHDL_TESTBENCH
   public    : uint32_t              get_cycle            (void);
-  public    : string                get_clock            (void);
+  public    : Signal *              get_clock            (void);
+  public    : Signal *              get_reset            (void);
 
   public    : void                  testbench            (void);
   public    : void                  testbench_cycle      (void);
   public    : void                  testbench_body       (Vhdl           * & vhdl          ,
-                                                          string             counter_name  );
+                                                          string             counter_name  ,
+                                                          string             reset_name    );
   public    : string                testbench_test       (Vhdl           * & vhdl        ,
-                                                          string             counter_name);
+                                                          string             counter_name,
+                                                          string             reset_name);
   public    : string                testbench_test_ok    (Vhdl           * & vhdl        );
   protected : string                testbench_test_name   (Vhdl           * & vhdl);
   protected : string                testbench_test_ok_name(Vhdl           * & vhdl);
-
-#endif
-
-#ifdef POSITION
-  public    : void                  port_map             (void * entity,
+  protected : string                testbench_test_transaction_name(Vhdl           * & vhdl);
+#endif
+
+#ifdef POSITION
+  public    : void                  interface_map        (void * entity,
                                                           void * interface);
-#endif
-
   public    : XML                   toXML                (void);
-#ifdef POSITION
   public    : XML                   toXML_mapping        (void);
 #endif