Changeset 95 for trunk/IPs/systemC/processor/Morpheo/Behavioural/src

Timestamp:

Dec 16, 2008, 5:24:26 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table - New architecture (systemC) done (and tested) -> need change interface in top level
2) Change documentation on VHDL generation
3) Change VHDL constant (case std_logic and std_logic_vector)

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/src

Files:

• Component_vhdl_instance.cpp (modified) (3 diffs)
• Interface_testbench_test.cpp (modified) (1 diff)
• Interface_testbench_test_ok.cpp (modified) (1 diff)
• Signal_testbench_test_ok.cpp (modified) (1 diff)
• Vhdl_set_constant.cpp (modified) (2 diffs)
• Vhdl_set_signal.cpp (modified) (2 diffs)
• Vhdl_std_logic.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Component_vhdl_instance.cpp

@@ -27 +27 @@
       std::list<Interface_fifo *>         * list_interface = (_entity)->get_interfaces_list()->get_interface_list();
       std::list<Interface_fifo *>::iterator j              = list_interface->begin();
+      bool print_comment = false;
       if (not list_interface->empty())
         {
-          vhdl->set_body ("------------------------------------------------------");
-          vhdl->set_body ("-- Output's Buffer");
-          vhdl->set_body ("------------------------------------------------------");
-          
           while (j != list_interface->end())
             {
@@ -48 +45 @@
                            (signal->get_connect_from_signal () != NULL) )
                         {
+                          if (not print_comment)
+                            {
+                              vhdl->set_body ("------------------------------------------------------");
+                              vhdl->set_body ("-- Output's Buffer");
+                              vhdl->set_body ("------------------------------------------------------");
+                             
+                              print_comment = true;
+                            }
+
                           // Create name
                           std::string signal_name = "signal_"+toString(cpt++);
@@ -67 +73 @@
               ++j;
             }
-          vhdl->set_body ("");
-          vhdl->set_body ("------------------------------------------------------");
-          vhdl->set_body ("");
+
+          if (print_comment)
+            {
+              vhdl->set_body ("");
+              vhdl->set_body ("------------------------------------------------------");
+              vhdl->set_body ("");
+            }
         }
     }

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Interface_testbench_test.cpp

@@ -24 +24 @@
 
     std::string test_name    = testbench_test_name(vhdl);
-    std::string test_name_ok = testbench_test_ok     (vhdl);
+    std::string test_name_ok = testbench_test_ok  (vhdl);
 
     vhdl->set_body(test_name + " <= '1' when ("+reset_name+" = '0') else "+test_name_ok+";");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Interface_testbench_test_ok.cpp

@@ -24 +24 @@
     if (_list_signal->empty()== false)
       {
-        std::list<Signal*>::iterator i     = _list_signal->begin();
+        std::list<Signal*>::iterator i = _list_signal->begin();
 
         while (i != _list_signal->end())

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Signal_testbench_test_ok.cpp

@@ -19 +19 @@
     if (_direction == OUT)
       vhdl->set_body ("\tand "+_name+" = "+_name+"_test");
-
+    
     log_printf(FUNC,Behavioural,"testbench_test_ok","End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_constant.cpp

@@ -27 +27 @@
 
   void Vhdl::set_constant (std::string      name     ,
-                           uint32_t    size     ,
+                           uint32_t         size     ,
                            std::string      init)
   {
@@ -35 +35 @@
   };
 
-  void Vhdl::set_constant (std::string      name     ,
+  void Vhdl::set_constant (std::string name     ,
                            uint32_t    size     ,
                            uint32_t    init)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_constant(name,std_logic(size),std_logic_conv(size,init));
+    set_constant(name,std_logic(size),std_logic_cst(size,init));
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_signal.cpp

@@ -9 +9 @@
 
 #include "Behavioural/include/Vhdl.h"
-
+#include "Common/include/ToBase2.h"
 #include <sstream>
 
@@ -56 +56 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_signal(name,std_logic(size),std_logic_conv(size,init));
+    set_signal(name,std_logic(size),std_logic_cst(size,init));
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_std_logic.cpp

@@ -10 +10 @@
 #include <math.h>
 #include "Behavioural/include/Vhdl.h"
+#include "Common/include/ToBase2.h"
 
 namespace morpheo              {
@@ -57 +58 @@
 
     return _return;
+  };
+
+#undef  FUNCTION
+#define FUNCTION "Vhdl::std_logic_cst"
+  std::string std_logic_cst (uint32_t size, uint32_t value)
+  {
+    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
+    std::string conv;
+
+    if (size == 1)
+      conv = "'"+toString(value&1)+"'";
+    else
+      conv = "\""+toBase2<uint32_t>(value,size)+"\"";
+
+    log_printf(FUNC,Behavioural,FUNCTION,"End");
+
+    return conv;
   };