Changeset 117 for trunk/IPs/systemC/Environment/include

Timestamp:

May 16, 2009, 4:42:39 PM (16 years ago)

Author:

rosiere

Message:

1) Platforms : add new organization for test
2) Load_Store_Unit : add array to count nb_check in store_queue
3) Issue_queue and Core_Glue : rewrite the issue network
4) Special_Register_Unit : add reset value to register CID
5) Softwares : add multicontext test
6) Softwares : add SPECINT
7) Softwares : add MiBench?
7) Read_queue : inhib access for r0
8) Change Core_Glue (network) - dont yet support priority and load balancing scheme

Location:

trunk/IPs/systemC/Environment/include

Files:

• Environment.h (modified) (5 diffs)
• Environment_Parameters.h (modified) (3 diffs)

trunk/IPs/systemC/Environment/include/Environment.h

@@ -2 +2 @@
 #define ENVIRONMENT_H
 
+#include "../Common/include/Debug.h"
 #include "../Cache/include/Cache.h"
 #include "../Data/include/Data.h"
@@ -108 +109 @@
     {
       _cout(ENVIRONMENT,"<itoa> : size : %d, ",size);
-      _cout(ENVIRONMENT,"src : %.8x ",static_cast<uint32_t>(src));
-      _cout(ENVIRONMENT,"dest : ");
+      __cout(ENVIRONMENT,"src : %.8x ",static_cast<uint32_t>(src));
+      __cout(ENVIRONMENT,"dest : ");
 
       for (uint32_t i=0; i<size; i++)
@@ -117 +118 @@
           src >>= 8; // shift byte
 
-          _cout(ENVIRONMENT,"%.2x",0xff&static_cast<uint32_t>(dest [j]));
+          __cout(ENVIRONMENT,"%.2x",0xff&static_cast<uint32_t>(dest [j]));
 
         }
-      _cout(ENVIRONMENT,".\n");
+      __cout(ENVIRONMENT,".\n");
     }
     
@@ -128 +129 @@
     {
       dest = 0;
-
+      
       _cout(ENVIRONMENT,"<atoi> : size : %d, ",size);
-      _cout(ENVIRONMENT,"src : ");
+      __cout(ENVIRONMENT,"src : ");
 
       for (uint32_t i=0; i<size; i++)
@@ -138 +139 @@
           dest |= (static_cast<T>(src [j]) & 0xFF);
 
-          _cout(ENVIRONMENT,"%.2x",0xff&static_cast<uint32_t>(src [j]));
+          __cout(ENVIRONMENT,"%.2x",0xff&static_cast<uint32_t>(src [j]));
         }
-      _cout(ENVIRONMENT," dest : %.8x\n",static_cast<uint32_t>(dest));
+      __cout(ENVIRONMENT," dest : %.8x\n",static_cast<uint32_t>(dest));
     }
   };

trunk/IPs/systemC/Environment/include/Environment_Parameters.h

@@ -14 +14 @@
   class Parameters
   {
+  public : uint32_t                nb_thread               ;
   public : uint32_t                nb_iport                ;
   public : uint32_t                nb_dport                ;
@@ -53 +54 @@
 
   public : Parameters (// General
+                       uint32_t    nb_thread,
                        uint32_t    nb_cache_dedicated,
                        
@@ -114 +116 @@
                        )
     {
+      this->nb_thread                = nb_thread;
       this->nb_entity                = nb_cache_dedicated;