Changeset 101 for trunk/IPs/systemC/Environment/src

Timestamp:

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

Author:

rosiere

Message:

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

Location:

trunk/IPs/systemC/Environment/src

Files:

• Cache_Access_dreq_type2cache_type.cpp (modified) (1 diff)
• Cache_Access_ireq_type2cache_type.cpp (modified) (1 diff)
• Environment_transition.cpp (modified) (5 diffs)

trunk/IPs/systemC/Environment/src/Cache_Access_dreq_type2cache_type.cpp

@@ -10 +10 @@
     switch (dreq_type)
       {
-      case DCACHE_TYPE_LOAD_8     : direction=cache::READ ; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 1; break; 
-      case DCACHE_TYPE_LOAD_16    : direction=cache::READ ; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 2; break; 
-      case DCACHE_TYPE_LOAD_32    : direction=cache::READ ; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 4; break; 
-      case DCACHE_TYPE_LOAD_64    : direction=cache::READ ; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 8; break; 
-      case DCACHE_TYPE_INVALIDATE : direction=cache::NONE ; type=cache::INVALIDATE                        ; nb_bytes = 1; break;
-      case DCACHE_TYPE_FLUSH      : direction=cache::NONE ; type=cache::FLUSH                             ; nb_bytes = 1; break;
-      case DCACHE_TYPE_PREFETCH   : direction=cache::NONE ; type=cache::INVALIDATE                        ; nb_bytes = 1; break;
-//    case DCACHE_TYPE_STORE_8_ACK: direction=cache::WRITE; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 1; break;
-      case DCACHE_TYPE_STORE_8    : direction=cache::WRITE; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 1; break;
-      case DCACHE_TYPE_STORE_16   : direction=cache::WRITE; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 2; break;
-      case DCACHE_TYPE_STORE_32   : direction=cache::WRITE; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 4; break;
-      case DCACHE_TYPE_STORE_64   : direction=cache::WRITE; type=((uncached==true)?cache::UNCACHED:cache::CACHED); nb_bytes = 8; break;
-      case DCACHE_TYPE_LOCK            :
-      case DCACHE_TYPE_SYNCHRONIZATION :
+      case DCACHE_TYPE_LOAD_8          : direction=cache::READ ;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 1;break; 
+      case DCACHE_TYPE_LOAD_16         : direction=cache::READ ;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 2;break; 
+      case DCACHE_TYPE_LOAD_32         : direction=cache::READ ;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 4;break; 
+      case DCACHE_TYPE_LOAD_64         : direction=cache::READ ;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 8;break; 
+      case DCACHE_TYPE_INVALIDATE      : direction=cache::NONE ;type=cache::INVALIDATE                               ;nb_bytes = 1;break;
+      case DCACHE_TYPE_FLUSH           : direction=cache::NONE ;type=cache::FLUSH                                    ;nb_bytes = 1;break;
+      case DCACHE_TYPE_PREFETCH        : direction=cache::NONE ;type=cache::PREFETCH                                 ;nb_bytes = 1;break;
+//    case DCACHE_TYPE_STORE_8_ACK     : direction=cache::WRITE;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 1;break;
+      case DCACHE_TYPE_STORE_8         : direction=cache::WRITE;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 1;break;
+      case DCACHE_TYPE_STORE_16        : direction=cache::WRITE;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 2;break;
+      case DCACHE_TYPE_STORE_32        : direction=cache::WRITE;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 4;break;
+      case DCACHE_TYPE_STORE_64        : direction=cache::WRITE;type=((uncached==true)?cache::UNCACHED:cache::CACHED);nb_bytes = 8;break;
+      case DCACHE_TYPE_SYNCHRONIZATION : direction=cache::NONE ;type=cache::SYNCHRONIZATION                          ;nb_bytes = 1;break;
+      case DCACHE_TYPE_LOCK            : direction=cache::NONE ;type=cache::LOCK                                     ;nb_bytes = 1;break;
       default : {std::cerr << "<ireq_type2cache_type> Unkown type (" << dreq_type << ")" << std::endl; exit(1);}
       }

trunk/IPs/systemC/Environment/src/Cache_Access_ireq_type2cache_type.cpp

@@ -13 +13 @@
       case ICACHE_TYPE_INVALIDATE : {direction=cache::NONE ; type=cache::INVALIDATE; break;}
       case ICACHE_TYPE_PREFETCH   : {direction=cache::NONE ; type=cache::PREFETCH  ; break;}
-      case ICACHE_TYPE_LOCK       :
+      case ICACHE_TYPE_LOCK       : {direction=cache::NONE ; type=cache::LOCK      ; break;}
       default : {std::cerr << "<ireq_type2cache_type> Unkown type (" << ireq_type << ")" << std::endl; exit(1);}
       }

trunk/IPs/systemC/Environment/src/Environment_transition.cpp

@@ -1 +1 @@
 #include "../include/Environment.h"
+
+#define CYCLE_MAX 0
+#include "../../processor/Morpheo/Common/include/Test.h"
 
 using namespace morpheo;
@@ -171 +174 @@
                 uint32_t          size      = param->daccess_size_data [i]/8;
 
-//              _cout(ENVIRONMENT," * information\n");
-//              _cout(ENVIRONMENT,"   * context : %d\n" ,static_cast<uint32_t>(context));
-//              _cout(ENVIRONMENT,"   * packet  : %d\n" ,static_cast<uint32_t>(packet ));
-//              _cout(ENVIRONMENT,"   * address : %.x\n",static_cast<uint32_t>(address));
-//              _cout(ENVIRONMENT,"   * type    : %d\n" ,static_cast<uint32_t>(type   ));
-//              _cout(ENVIRONMENT,"   * size    : %d\n" ,static_cast<uint32_t>(size   ));
-
-                // search the entity
-                data::Entity      entity    = component_data->entity(static_cast<uint32_t>(address),size);
-
-                std::cout << entity << std::endl;
+                _cout(ENVIRONMENT," * information\n");
+                _cout(ENVIRONMENT,"   * context : %d\n" ,static_cast<uint32_t>(context));
+                _cout(ENVIRONMENT,"   * packet  : %d\n" ,static_cast<uint32_t>(packet ));
+                _cout(ENVIRONMENT,"   * address : %.x\n",static_cast<uint32_t>(address));
+                _cout(ENVIRONMENT,"   * type    : %d\n" ,static_cast<uint32_t>(type   ));
+                _cout(ENVIRONMENT,"   * size    : %d\n" ,static_cast<uint32_t>(size   ));
 
                 bool              uncached  = false;
@@ -209 +207 @@
                   default                          :{            must_read=false; must_write=false; must_ack=false; must_ack_on_error=false; break;} 
                   }
+                
+                // search the entity
+                data::Entity      entity    = component_data->entity(static_cast<uint32_t>(address),nb_bytes);
+
+                std::cout << entity << std::endl;
                 
                 // Test the type of the address
@@ -250 +253 @@
                                        ,static_cast<uint32_t>((wdata>> 0)&0xff)
                                        );
+
+                                if (wdata == 0)
+                                  std::cout << STR_OK << std::endl;
+                                else
+                                  std::cout << STR_KO << std::endl;
 
                                 stop (context);
@@ -289 +297 @@
                               // Read
                               _cout(ENVIRONMENT," * Read  (%d bytes)\n",size);
-                              bus_error |= !component_data->read(address,size,read_dram[0]); // always read a complete word
+                              bus_error |= !component_data->read(address,nb_bytes,read_dram[0]); // always read a complete word
 
                               _cout(ENVIRONMENT," * Rdata : ");
-                              for (uint32_t i=0; i<size; i++)
+                              for (uint32_t i=0; i<nb_bytes; i++)
                                 _cout(ENVIRONMENT,"%.2x",0xff&static_cast<uint32_t>(read_dram[0][i]));
                               _cout(ENVIRONMENT,".\n");