Changeset 57 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Timestamp:

Sep 28, 2007, 2:58:08 PM (17 years ago)

Author:

rosiere

Message:

• VHDL - RegisterFile_Multi_Banked (only partial_crossbar)
• SystemC - modif Component, interface and co -> ajout du type Tusage_T pour instancier un coposant mais ne demander que le VHDL ou le systemC.
• Séminaire interne

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Files:

• Component.h (modified) (3 diffs)
• Entity.h (modified) (3 diffs)
• Interface.h (modified) (7 diffs)
• Interface_fifo.h (modified) (1 diff)
• Interfaces.h (modified) (2 diffs)
• Types.h (added)
• Usage.h (added)

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

@@ -20 +20 @@
 #include "Common/include/ToString.h"
 #include "Common/include/Debug.h"
+#include "Behavioural/include/Usage.h"
 
 using namespace std;
@@ -26 +27 @@
 namespace behavioural          {
 
+  typedef uint8_t Tinstance_t;
+
+#define INSTANCE_NONE         0x0
+#define INSTANCE_LIBRARY      0x1
+#define INSTANCE_COMPONENT    0x2
+#define INSTANCE_POSITION     0x4
+#define INSTANCE_ALL          0x7
+
+  typedef struct
+  {
+    public : Tinstance_t _instance;
+    public : Entity         * _entity  ;
+  } Tcomponent_t;    
+  
   class Component
   {
     // -----[ fields ]----------------------------------------------------
+  private   : const Tusage_t        _usage;
   private   : Entity              * _entity        ;
-  private   : list<Entity *>      * _list_component;
-    
+  private   : list<Tcomponent_t*> * _list_component;
+
     // -----[ methods ]---------------------------------------------------
-  public    :                       Component         (void);
+  public    :                       Component         (Tusage_t usage=USE_ALL);
   public    :                       Component         (const Component & component);
   public    :                       ~Component        ();
@@ -52 +68 @@
                                                        ,uint32_t   size_y 
 #endif
+                                                       ,Tinstance_t instance=INSTANCE_ALL 
                                                        );
 

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

@@ -18 +18 @@
 #include "Common/include/ToString.h"
 #include "Common/include/Debug.h"
+#include "Behavioural/include/Usage.h"
 
 using namespace std;
@@ -32 +33 @@
   private   : const schema_t        _schema       ;
 #endif
+  private   : const Tusage_t        _usage;
+
   private   : Interfaces          * _interfaces   ;
 
@@ -50 +53 @@
                                                        ,schema_t      schema 
 #endif
+                                                        ,Tusage_t       usage=USE_ALL
                                                         );
   public    :                        Entity           (const Entity & entity);

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

@@ -25 +25 @@
 #include "Common/include/ErrorMorpheo.h"
 #include "Common/include/Debug.h"
+#include "Behavioural/include/Usage.h"
 
 using namespace std;
@@ -38 +39 @@
   protected : const direction_t     _direction    ;
   protected : const localisation_t  _localisation ;
+#endif
+  protected : const Tusage_t        _usage;
+
+#ifdef POSITION
   protected :       string          _comment      ;
 #endif
@@ -59 +64 @@
                                                           ,localisation_t localisation
 #endif
+                                                          ,Tusage_t       usage=USE_ALL
                                                           );
 
@@ -97 +103 @@
 
       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));
+      sc_in_clk * port;
+
+      if (_usage & USE_SYSTEMC)
+        {
+          port = new sc_in_clk (sig->_name.c_str());
+          sig->alloc<bool> (static_cast<void *>(port));
+        }
+      else
+        {
+          port = NULL;
+        }
 
       log_printf(FUNC,Behavioural,"set_signal_clk","End");
@@ -118 +132 @@
 
       Signal    * sig  = set_signal (name, IN , size, presence_port);
-      sc_in <T> * port = new sc_in <T> (sig->_name.c_str());
-
-      sig->alloc<T> (static_cast<void *>(port));
+      sc_in <T> * port;
+
+      if (_usage & USE_SYSTEMC)
+        {
+          port = new sc_in <T> (sig->_name.c_str());
+          sig->alloc<T> (static_cast<void *>(port));
+        }
+      else
+        {
+          port = NULL;
+        }
 
       log_printf(FUNC,Behavioural,"set_signal_in","End");
@@ -139 +161 @@
 
       Signal * sig = set_signal (name, OUT , size, presence_port);
-      sc_out <T> * port = new sc_out <T> (sig->_name.c_str());
-
-      sig->alloc<T> (static_cast<void *>(port));
+      sc_out <T> * port;
+
+      if (_usage & USE_SYSTEMC)
+        {
+          port = new sc_out <T> (sig->_name.c_str());
+          sig->alloc<T> (static_cast<void *>(port));
+        }
+      else
+        {
+          port = NULL;
+        }
 
       log_printf(FUNC,Behavioural,"set_signal_out","End");
@@ -155 +185 @@
 
       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));
+      sc_signal <T> * port;
+
+      if (_usage & USE_SYSTEMC)
+        {
+          port = new sc_signal <T> (sig->_name.c_str());
+          sig->alloc<T> (static_cast<void *>(port));
+        }
+      else
+        {
+          port = NULL;
+        }
 
       log_printf(FUNC,Behavioural,"set_signal_internal","End");

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

@@ -45 +45 @@
                                                           ,localisation_t localisation
 #endif
+                                                          ,Tusage_t       usage=USE_ALL
                                                           );
     

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

@@ -18 +18 @@
 #include "Behavioural/include/Vhdl.h"
 #endif
+#include "Behavioural/include/Usage.h"
 
 using namespace std;
@@ -28 +29 @@
     // -----[ fields ]----------------------------------------------------
   private   : const string               _name;
+  private   : const Tusage_t             _usage;
   private   : list<Interface_fifo*>    * _list_interface;
 
     // -----[ methods ]---------------------------------------------------
-  public    :                       Interfaces            (string name);
+  public    :                       Interfaces            (string name, 
+                                                           Tusage_t usage=USE_ALL);
   public    :                       Interfaces            (const Interfaces & interfaces);
   public    :                       ~Interfaces           ();