Changeset 115 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/main.cpp

Timestamp:

Apr 20, 2009, 11:29:17 PM (15 years ago)

Author:

rosiere

Message:

1) Write queue with mealy
2) Network : fix bug
3) leak memory

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/main.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/src/main.cpp

@@ -8 +8 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/SelfTest/include/top.h"
 
+<<<<<<< .mine
+#define NB_PARAMS 11
+
+void usage (int argc, char * argv[])
+{
+  err (_("<Usage> %s name_instance list_params.\n"),argv[0]);
+  err (_("list_params is :\n"));
+  err (_(" * size_queue          (uint32_t             )\n"));
+  err (_(" * nb_context          (uint32_t             )\n"));
+  err (_(" * nb_front_end        (uint32_t             )\n"));
+  err (_(" * nb_ooo_engine       (uint32_t             )\n"));
+  err (_(" * nb_packet           (uint32_t             )\n"));
+  err (_(" * size_general_data   (uint32_t             )\n"));
+  err (_(" * nb_general_register (uint32_t             )\n"));
+  err (_(" * size_special_data   (uint32_t             )\n"));
+  err (_(" * nb_special_register (uint32_t             )\n"));
+  err (_(" * nb_bypass_write     (uint32_t             )\n"));
+  err (_(" * queue_scheme        (Twrite_queue_scheme_t)\n"));
+
+  exit (1);
+}
+
+#ifndef SYSTEMC
+=======
 #ifndef MTI_SYSTEMC
 # ifndef SYSTEMC
+>>>>>>> .r113
 int main    (int argc, char * argv[])
 # else
@@ -17 +42 @@
   int _return = EXIT_SUCCESS;
 
+<<<<<<< .mine
+  uint32_t       x = 1;
+
+  const string                name                =      argv[x++];
+  const uint32_t              size_queue          = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_context          = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_front_end        = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_ooo_engine       = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_packet           = fromString<uint32_t>(argv[x++]);
+  const uint32_t              size_general_data   = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_general_register = fromString<uint32_t>(argv[x++]);
+  const uint32_t              size_special_data   = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_special_register = fromString<uint32_t>(argv[x++]);
+  const uint32_t              nb_bypass_write     = fromString<uint32_t>(argv[x++]);
+  const Twrite_queue_scheme_t queue_scheme        = fromString<Twrite_queue_scheme_t>(argv[x++]);
+
+=======
+>>>>>>> .r113
   try 
     {
+<<<<<<< .mine
+      morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_write_unit::write_unit::write_queue::Parameters * param = new morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_write_unit::write_unit::write_queue::Parameters
+        (size_queue         ,
+         nb_context         ,
+         nb_front_end       ,
+         nb_ooo_engine      ,
+         nb_packet          ,
+         size_general_data  ,
+         nb_general_register,
+         size_special_data  ,
+         nb_special_register,
+         nb_bypass_write    ,
+         queue_scheme       ,
+         true // is_toplevel
+         );
+      
+      msg(_("%s"),param->print(1).c_str());
+      
+      test (name,param);
+=======
       top * my_top = new top ("my_top",argc,argv);
 
@@ -24 +87 @@
 
       delete my_top;
+>>>>>>> .r113
     }
   catch (morpheo::ErrorMorpheo & error)