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

Timestamp:

Jul 17, 2007, 4:47:56 PM (17 years ago)

Author:

rosiere

Message:

Modification des classes d'encapsulation des interfaces.
Stable sur tous les composants actuels

Location:

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

Files:

• Component.h (modified) (1 diff)
• Configuration_Parameters.h (modified) (1 diff)
• Debug_component.h (modified) (1 diff)
• Direction.h (modified) (1 diff)
• Entity.h (modified) (1 diff)
• Interface.h (modified) (1 diff)
• Interfaces.h (modified) (1 diff)
• Localisation.h (modified) (1 diff)
• Parameters.h (modified) (1 diff)
• Schema.h (modified) (1 diff)
• Signal.h (modified) (5 diffs)
• Statistics.h (modified) (1 diff)
• Vhdl.h (modified) (1 diff)
• XML.h (modified) (1 diff)

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

@@ -18 +18 @@
 //#include "Behavioural/include/Description.h"
 #include "Behavioural/include/Entity.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace std;

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

@@ -13 +13 @@
 #include "Behavioural/include/XML.h"
 #include "Behavioural/include/Environnement.h"
-#include "Include/ErrorMorpheo.h"
-#include "Include/ToString.h"
+#include "Common/include/ErrorMorpheo.h"
+#include "Common/include/ToString.h"
 using namespace std;
 

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

@@ -2 +2 @@
 #define DEBUG_COMPONENT_H
 
-#define DEBUG_Behavioural                                   false
+#define DEBUG_Behavioural                                   true 
 #define   DEBUG_Generic                                     false
 #define     DEBUG_Counter                                   false 

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

@@ -2 +2 @@
 #define morpheo_behavioural_Direction_h
 
-#include "Include/ToString.h"
+#include "Common/include/ToString.h"
 
 namespace morpheo              {

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

@@ -15 +15 @@
 #include "Behavioural/include/Interfaces.h"
 #include "Behavioural/include/Schema.h"
-#include "Include/ErrorMorpheo.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ErrorMorpheo.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace std;

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

@@ -22 +22 @@
 #include "Behavioural/include/Vhdl.h"
 #endif
-#include "Include/ToString.h"
-#include "Include/ErrorMorpheo.h"
-#include "Include/Debug.h"
+#include "Common/include/ToString.h"
+#include "Common/include/ErrorMorpheo.h"
+#include "Common/include/Debug.h"
 
 using namespace std;

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

@@ -13 +13 @@
 #include <list>
 #include "Behavioural/include/Interface_fifo.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 #ifdef VHDL
 #include "Behavioural/include/Vhdl.h"

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

@@ -3 +3 @@
 #define morpheo_behavioural_Localisation_h
 
-#include "Include/ToString.h"
+#include "Common/include/ToString.h"
 
 namespace morpheo              {

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

@@ -14 +14 @@
 #include "Behavioural/Constant/Constant_OpenRISC.h"
 #include "Behavioural/include/Environnement.h"
-#include "Include/ErrorMorpheo.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ErrorMorpheo.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace morpheo::behavioural::constant;

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

@@ -4 +4 @@
 #define morpheo_behavioural_Schema_h
 
-#include "Include/ToString.h"
+#include "Common/include/ToString.h"
 
 namespace morpheo              {

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

@@ -22 +22 @@
 #include "Behavioural/include/Direction.h"
 #include "Behavioural/include/XML.h"
-#include "Include/ErrorMorpheo.h"
-#include "Include/ToBase2.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ErrorMorpheo.h"
+#include "Common/include/ToBase2.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace std;
@@ -58 +58 @@
   private   : const presence_port_t _presence_port;
 
-  private   : Signal *              _signal       ;
-  private   : bool                  _is_allocate  ;
-  private   : void *                _sc_signal    ;
-  private   : bool                  _is_map       ;
-  private   : void *                _sc_signal_map;
+  private   : Signal *              _connect_to_signal;   // the actual implementaion, this signal link with one signal (but if signal is an output, it can be connect with many signal ...)
+  private   : Signal *              _connect_from_signal; // producter of signal. If NULL, then producteur is the current entity
+  private   : bool                  _is_allocate  ; // Have allocate a sc_in or sc_out port
+  private   : void *                _sc_signal    ; // sc_in or sc_out associated at this signal
+  private   : bool                  _is_map       ; 
+  private   : void *                _sc_signal_map; // sc_out generated this signal
   private   : type_info_t           _type_info    ;
 
@@ -79 +80 @@
   public    : string            get_name        (void);
   public    : uint32_t          get_size        (void);
-  public    : Signal *          get_signal_link (void);
+  public    : bool              get_is_map      (void);
+  public    : Signal *          get_connect_to_signal (void);
+  public    : Signal *          get_connect_from_signal (void);
+  public    : direction_t       get_direction   (void);
 
   public    : bool              presence_vhdl      (void);
   public    : bool              presence_testbench (void);
 
-  public    : void              mapping         (Signal * signal);
-  public    : void              link            (Signal * signal);
+//   public    : void              mapping         (Signal * signal);
+  public    : void              link            (Signal * signal  ,
+                                                 bool     is_port_component);
 
 #ifdef SYSTEMC         
@@ -127 +132 @@
     }
 
+#undef  FUNCTION
+#define FUNCTION "Signal::alloc"
   public    : template <typename T>
-              void              alloc           (void * port)
-    {
+              void              alloc           (void * sc_signal)
+    {
+      log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
       if (_type_info != UNKNOW)
         throw (ErrorMorpheo ("Signal \""+_name+"\" : already allocate."));
 
-      _is_allocate = true;
-      _sc_signal      = port;
-      _sc_signal_map  = port;
+      _is_allocate    = true;
+      _sc_signal      = sc_signal;
+      _sc_signal_map  = sc_signal;
+
+      log_printf(TRACE,Behavioural,FUNCTION, "Allocation of %s - %.8x", _name.c_str(), (uint32_t)(_sc_signal_map));
 
       if (typeid(T) == typeid(bool    ))
@@ -153 +164 @@
       else
         _type_info = UNKNOW;
+
+      log_printf(FUNC,Behavioural,FUNCTION,"End");
     }
 #endif

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

@@ -15 +15 @@
 #include "Behavioural/include/Environnement.h"
 #include "Behavioural/include/Parameters_Statistics.h"
-#include "Include/Average.h"
-#include "Include/Percent.h"
+#include "Common/include/Average.h"
+#include "Common/include/Percent.h"
 
 using namespace std;

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

@@ -16 +16 @@
 #include "Behavioural/include/Environnement.h"
 #include "Behavioural/include/Direction.h"
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace std;

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

@@ -13 +13 @@
 #include <math.h>
 #include <list>
-#include "Include/ToString.h"
-#include "Include/Debug.h"
+#include "Common/include/ToString.h"
+#include "Common/include/Debug.h"
 
 using namespace std;