Changeset 66 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/src/main.cpp

Timestamp:

Dec 6, 2007, 11:03:00 AM (17 years ago)

Author:

rosiere

Message:

• un pas de plus vers la compatibilite avec systemC
• modification de l'interface de read_queue : context_id devient context_id, front_end_id et ooo_engine_id

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/src/main.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/src/main.cpp

@@ -8 +8 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/SelfTest/include/test.h"
 
-#define NB_PARAMS 0
+#define NB_PARAMS 13
 
 void usage (int argc, char * argv[])
@@ -16 +16 @@
        << " - size_queue          (unsigned int)" << endl
        << " - nb_context          (unsigned int)" << endl
+       << " - nb_front_end        (unsigned int)" << endl
+       << " - nb_ooo_engine       (unsigned int)" << endl
        << " - nb_packet           (unsigned int)" << endl
        << " - size_general_data   (unsigned int)" << endl
@@ -40 +42 @@
 #endif
 {
-  if (argc < 2+NB_PARAMS)
+  if (argc != 2+NB_PARAMS)
     usage (argc, argv);
 
-  const string   name                = argv[1];
-  const uint32_t size_queue          = atoi(argv[ 2]);
-  const uint32_t nb_context          = atoi(argv[ 3]);
-  const uint32_t nb_packet           = atoi(argv[ 4]);
-  const uint32_t size_general_data   = atoi(argv[ 5]);
-  const uint32_t size_special_data   = atoi(argv[ 6]);
-  const uint32_t nb_general_register = atoi(argv[ 7]);
-  const uint32_t nb_special_register = atoi(argv[ 8]);
-  const uint32_t nb_operation        = atoi(argv[ 9]);
-  const uint32_t nb_type             = atoi(argv[10]);
-  const uint32_t nb_gpr_write        = atoi(argv[11]);
-  const uint32_t nb_spr_write        = atoi(argv[12]);
+  uint32_t x=1;
+  const string   name                =      argv[x++];
+  const uint32_t size_queue          = atoi(argv[x++]);
+  const uint32_t nb_context          = atoi(argv[x++]);
+  const uint32_t nb_front_end        = atoi(argv[x++]);
+  const uint32_t nb_ooo_engine       = atoi(argv[x++]);
+  const uint32_t nb_packet           = atoi(argv[x++]);
+  const uint32_t size_general_data   = atoi(argv[x++]);
+  const uint32_t size_special_data   = atoi(argv[x++]);
+  const uint32_t nb_general_register = atoi(argv[x++]);
+  const uint32_t nb_special_register = atoi(argv[x++]);
+  const uint32_t nb_operation        = atoi(argv[x++]);
+  const uint32_t nb_type             = atoi(argv[x++]);
+  const uint32_t nb_gpr_write        = atoi(argv[x++]);
+  const uint32_t nb_spr_write        = atoi(argv[x++]);
 
   try 
@@ -61 +66 @@
         ( size_queue    
          ,nb_context         
+         ,nb_front_end       
+         ,nb_ooo_engine
          ,nb_packet          
          ,size_general_data