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

Timestamp:

Apr 14, 2009, 8:39:12 PM (15 years ago)

Author:

rosiere

Message:

1) Add modelsim simulation systemC
2) Modelsim cosimulation systemC / VHDL is not finish !!!! (cf execute_queue and write_unit)
3) Add multi architecture
5) Add template for comparator, multiplier and divider
6) Change Message
Warning) Various test macro have change, many selftest can't compile

File:

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

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

@@ -91 +91 @@
 
 #ifdef SYSTEMC
+
+#undef  FUNCTION
+#define FUNCTION "Interface::set_signal_clk"
   public    : sc_in_clk *           set_signal_clk       (std::string     name     ,
                                                           uint32_t        size     ,
                                                           presence_port_t presence_port=CLOCK_VHDL_YES)
     {
-      log_printf(FUNC,Behavioural,"set_signal_clk","Begin");
+      log_begin(Behavioural,FUNCTION);
 
       if ((presence_port != CLOCK_VHDL_YES) and
@@ -101 +104 @@
         throw ErrorMorpheo ("Signal \""+name+"\" is a clock, bad presence_port.");
 
+      LowerCase(name);
+
       Signal    * sig  = set_signal (name, IN , size, presence_port);
       sc_in_clk * port;
 
-      if (_usage & USE_SYSTEMC)
+      if (_usage & USE_SYSTEMC_INTERFACE)
         {
           port = new sc_in_clk (sig->_name.c_str());
@@ -114 +119 @@
         }
 
-      log_printf(FUNC,Behavioural,"set_signal_clk","End");
-
-      return port;
-    };
-
+      log_end(Behavioural,FUNCTION);
+
+      return port;
+    };
+
+#undef  FUNCTION
+#define FUNCTION "Interface::set_signal_in"
   public    : template <typename T>
               sc_in <T> *           set_signal_in       (std::string     name     ,
@@ -124 +131 @@
                                                          presence_port_t presence_port=PORT_VHDL_YES_TESTBENCH_YES)
     {
-      log_printf(FUNC,Behavioural,"set_signal_in","Begin");
+      log_begin(Behavioural,FUNCTION);
 
       if ((presence_port == CLOCK_VHDL_YES) or 
@@ -130 +137 @@
         throw ErrorMorpheo ("Signal \""+name+"\" is not a clock, bad presence_port.");
 
+      LowerCase(name);
+
       Signal    * sig  = set_signal (name, IN , size, presence_port);
       sc_in <T> * port;
 
-      if (_usage & USE_SYSTEMC)
+      if (_usage & USE_SYSTEMC_INTERFACE)
         {
           port = new sc_in <T> (sig->_name.c_str());
@@ -143 +152 @@
         }
 
-      log_printf(FUNC,Behavioural,"set_signal_in","End");
-
-      return port;
-    };
-
+      log_end(Behavioural,FUNCTION);
+
+      return port;
+    };
+
+#undef  FUNCTION
+#define FUNCTION "Interface::set_signal_out"
   public    : template <typename T>
               sc_out <T> *          set_signal_out      (std::string     name     ,
@@ -153 +164 @@
                                                          presence_port_t presence_port=PORT_VHDL_YES_TESTBENCH_YES)
     {
-      log_printf(FUNC,Behavioural,"set_signal_out","Begin");
+      log_begin(Behavioural,FUNCTION);
+
+      LowerCase(name);
 
       if ((presence_port == CLOCK_VHDL_YES) or 
@@ -162 +175 @@
       sc_out <T> * port;
 
-      if (_usage & USE_SYSTEMC)
+      if (_usage & USE_SYSTEMC_INTERFACE)
         {
           port = new sc_out <T> (sig->_name.c_str());
@@ -172 +185 @@
         }
 
-      log_printf(FUNC,Behavioural,"set_signal_out","End");
-
-      return port;
-    };
-
+      log_end(Behavioural,FUNCTION);
+
+      return port;
+    };
+
+#undef  FUNCTION
+#define FUNCTION "Interface::set_signal_internal"
   public    : template <typename T>
               sc_signal <T> *       set_signal_internal (std::string   name,
                                                          uint32_t size)
     {
-      log_printf(FUNC,Behavioural,"set_signal_internal","Begin");
+      log_begin(Behavioural,FUNCTION);
+
+      LowerCase(name);
 
       Signal * sig = set_signal (name, INTERNAL , size, PORT_VHDL_NO_TESTBENCH_NO);
       sc_signal <T> * port;
 
-      if (_usage & USE_SYSTEMC)
+      if (_usage & USE_SYSTEMC_INTERFACE)
         {
           port = new sc_signal <T> (sig->_name.c_str());
@@ -196 +213 @@
         }
 
-      log_printf(FUNC,Behavioural,"set_signal_internal","End");
+      log_end(Behavioural,FUNCTION);
 
       return port;