Changeset 101 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/src/main.cpp

Timestamp:

Jan 15, 2009, 6:19:08 PM (15 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/src/main.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/src/main.cpp

@@ -8 +8 @@
 #include "Behavioural/Generic/Queue/SelfTest/include/test.h"
 
-#define NB_PARAMS 3
+#define NB_PARAMS 5
 
 void usage (int argc, char * argv[])
@@ -14 +14 @@
   cerr << "<Usage> " << argv[0] << " name_instance list_params" << endl
        << "list_params is :" << endl
-       << " - size_queue   (uint32_t)" << endl
-       << " - size_data    (uint32_t)" << endl
-       << " - nb_port_slot (uint32_t)" << endl
+       << " - size_queue      (uint32_t)" << endl
+       << " - size_data       (uint32_t)" << endl
+       << " - nb_port_slot    (uint32_t)" << endl
+       << " - have_port_write (bool    )" << endl
+       << " - have_port_read  (bool    )" << endl
        << "" << endl;
 
@@ -37 +39 @@
   uint32_t       x = 1;
   
-  const string   name         =      argv[x++];
-  const uint32_t size_queue   = atoi(argv[x++]);
-  const uint32_t size_data    = atoi(argv[x++]);
-  const uint32_t nb_port_slot = atoi(argv[x++]);
-
+  const string   name            =      argv[x++];
+  const uint32_t size_queue      = fromString<uint32_t>(argv[x++]);
+  const uint32_t size_data       = fromString<uint32_t>(argv[x++]);
+  const uint32_t nb_port_slot    = fromString<uint32_t>(argv[x++]);
+  const bool     have_port_write = fromString<bool>(argv[x++]);
+  const bool     have_port_read  = fromString<bool>(argv[x++]);
   try 
     {
@@ -47 +50 @@
         (size_queue,
          size_data ,
-         nb_port_slot
+         nb_port_slot,
+         have_port_write,
+         have_port_read 
         );