Changeset 81 for trunk/IPs/systemC/shared

Timestamp:

Apr 15, 2008, 8:40:01 PM (16 years ago)

Author:

rosiere

Message:

• Finish Environment (and test)
• Continue predictor_unit
• Add external tools
• svn keyword "Id" set

Location:

trunk/IPs/systemC/shared

Files:

• loadexec.c (modified) (1 prop)
• macro.h (modified) (1 prop)
• mapping_memory.h (modified) (1 prop)
• soclib_caches_interfaces.h (modified) (1 prop)
• soclib_generic_fifo.h (modified) (1 prop)
• soclib_segment_table.h (modified) (13 diffs, 1 prop)

trunk/IPs/systemC/shared/soclib_segment_table.h

@@ -72 +72 @@
 
 #include <list>
-
-using namespace std;
+#include <iostream>
+// using namespace std;
 
 //////////////////////////////////////////////
@@ -174 +174 @@
 //////////////////////////////////////////////////////////
 
-using namespace std;
+// using namespace std;
 
 struct SOCLIB_SEGMENT_TABLE {
@@ -206 +206 @@
         if ((number<0)||(number>16))
                 {
-                cerr << "ERROR in the Segment Table :" << endl ;
-                cerr << "MSB number must be in the [0..16] range !" << endl ;
+                std::cerr << "ERROR in the Segment Table :" << std::endl ;
+                std::cerr << "MSB number must be in the [0..16] range !" << std::endl ;
                 //sc_stop();
                 }
@@ -218 +218 @@
         if ((number<0)||(number>16))
                 {
-                cerr << "ERROR in the Segment Table :" << endl ;
-                cerr << "LSB number must be in the [0..16] range !" << endl ;
+                std::cerr << "ERROR in the Segment Table :" << std::endl ;
+                std::cerr << "LSB number must be in the [0..16] range !" << std::endl ;
                 //sc_stop();
                 }
@@ -304 +304 @@
 void print()
         {
-        cout << "\n                 SEGMENT_TABLE\n\n" ;
+          std::cout << "\n                 SEGMENT_TABLE\n\n" ;
         std::list<SEGMENT_TABLE_ENTRY>::iterator iter;
         for (iter = segList.begin() ; iter != segList.end() ; ++iter)
@@ -310 +310 @@
                 (*iter).print();
                 }
-        cout << "\n" ;
+        std::cout << "\n" ;
         }
 
 void printMSBRoutingTable()
         {
-        cout << "\n                 MSB ROUTING_TABLE\n\n" ;
-        int size = 1 << MSBNumber+LSBNumber;
-        unsigned int    *tab = new unsigned int[size];
-        initRoutingTable(tab);
-        for(int index = 0 ; index < size ; index++) {
-                if (tab[index]!=0xFFFFFFFF){
-                        printf("TAB[%x] = %d\n", index, tab[index]);
-                }
-        }
-        cout << "\n" ;
-        };
-        
-void printLSBRoutingTable(int glt)
-        {
-        printf( "\n    LSB_ROUTING_TABLE OF GLOBAL TARGET :%d \n\n", glt );
-        int size = 1 << MSBNumber+LSBNumber;
-        unsigned int    *tab = new unsigned int[size];
-        initLocalRoutingTable(tab,glt);
-        for(int index = 0 ; index < size ; index++) {
-                if (tab[index]!=0xFFFFFFFF){
-                        printf("TAB[%d] = %d\n", index, tab[index]);
-                }
-        }
-        cout << "\n" ;
-        };
+          std::cout << "\n                 MSB ROUTING_TABLE\n\n" ;
+          int size = 1 << MSBNumber+LSBNumber;
+          unsigned int  *tab = new unsigned int[size];
+          initRoutingTable(tab);
+          for(int index = 0 ; index < size ; index++) {
+            if (tab[index]!=0xFFFFFFFF){
+              printf("TAB[%x] = %d\n", index, tab[index]);
+            }
+          }
+          std::cout << "\n" ;
+        };
+  
+  void printLSBRoutingTable(int glt)
+  {
+    printf( "\n    LSB_ROUTING_TABLE OF GLOBAL TARGET :%d \n\n", glt );
+    int size = 1 << MSBNumber+LSBNumber;
+    unsigned int        *tab = new unsigned int[size];
+    initLocalRoutingTable(tab,glt);
+    for(int index = 0 ; index < size ; index++) {
+      if (tab[index]!=0xFFFFFFFF){
+        printf("TAB[%d] = %d\n", index, tab[index]);
+      }
+    }
+    std::cout << "\n" ;
+  };
         
 
@@ -345 +345 @@
 void initRoutingTable(unsigned int* tab) {
         if (MSBNumberCalled==false) {
-                cerr << "ERROR in initMSBRoutingTable:" << endl ;
-                cerr << "MSB number has not been defined !" << endl ;
+                std::cerr << "ERROR in initMSBRoutingTable:" << std::endl ;
+                std::cerr << "MSB number has not been defined !" << std::endl ;
                 //sc_stop();
         }
         if (LSBNumberCalled==false) {
-                cout << "WARNING in initMSBRoutingTable:" << endl ;
-                cout << "LSB number has not been defined !" << endl ;
-                cout << "it is set to 0" << endl ;
-                LSBNumberCalled=true;
-                LSBNumber=0;
+          std::cout << "WARNING in initMSBRoutingTable:" << std::endl ;
+          std::cout << "LSB number has not been defined !" << std::endl ;
+          std::cout << "it is set to 0" << std::endl ;
+          LSBNumberCalled=true;
+          LSBNumber=0;
         }
         
         
         if (defaultTargetCalled==false) {
-                cerr << "ERROR in initMSBRoutingTable:" << endl ;
-                cerr << "Default Target has not been defined!" << endl ;
+                std::cerr << "ERROR in initMSBRoutingTable:" << std::endl ;
+                std::cerr << "Default Target has not been defined!" << std::endl ;
                 //sc_stop();
         }
@@ -386 +386 @@
                         if(tab[page] != 0xFFFFFFFF) {
                 //              printf("\n page n° %x can not be added to cluster %x because it is already allocated to %x\n",page,globalTarget,tab[page]);
-                                cerr << "Error in initMSBRoutingTable:" << endl ;
-                                cerr << "Segment " << name << " allocated to VCI target " << globalTarget << endl;
-                                cerr << "overlap another segment... or is in the same page" << endl;
-                                cerr << "as another segment allocated to another VCI target" << endl;
+                                std::cerr << "Error in initMSBRoutingTable:" << std::endl ;
+                                std::cerr << "Segment " << name << " allocated to VCI target " << globalTarget << std::endl;
+                                std::cerr << "overlap another segment... or is in the same page" << std::endl;
+                                std::cerr << "as another segment allocated to another VCI target" << std::endl;
                                 //sc_stop();
                         } else {
@@ -422 +422 @@
 void initGlobalRoutingTable(unsigned int* tab) {
         if (MSBNumberCalled==false) {
-                cerr << "ERROR in initMSBRoutingTable:" << endl ;
-                cerr << "MSB number has not been defined !" << endl ;
+                std::cerr << "ERROR in initMSBRoutingTable:" << std::endl ;
+                std::cerr << "MSB number has not been defined !" << std::endl ;
                 //sc_stop();
         }
         
         if (defaultTargetCalled==false) {
-                cerr << "ERROR in initMSBRoutingTable:" << endl ;
-                cerr << "Default Target has not been defined!" << endl ;
+                std::cerr << "ERROR in initMSBRoutingTable:" << std::endl ;
+                std::cerr << "Default Target has not been defined!" << std::endl ;
                 //sc_stop();
         }
@@ -455 +455 @@
                         if(tab[page] != 0xFFFFFFFF) {
                 //              printf("\n page n° %x can not be added to cluster %x because it is already allocated to %x\n",page,globalTarget,tab[page]);
-                                cerr << "Error in initGlobalRoutingTable:" << endl ;
-                                cerr << "Segment " << name << " allocated to VCI target " << globalTarget << endl;
-                                cerr << "overlap another segment... or is in the same page" << endl;
-                                cerr << "as another segment allocated to another VCI target" << endl;
+                                std::cerr << "Error in initGlobalRoutingTable:" << std::endl ;
+                                std::cerr << "Segment " << name << " allocated to VCI target " << globalTarget << std::endl;
+                                std::cerr << "overlap another segment... or is in the same page" << std::endl;
+                                std::cerr << "as another segment allocated to another VCI target" << std::endl;
                                 //sc_stop();
                         } else {
@@ -493 +493 @@
 void initLocalRoutingTable(unsigned int* tab, unsigned int cluster) {
         if (MSBNumberCalled==false) {
-                cerr << "ERROR in initLocalRoutingTable:" << endl ;
-                cerr << "MSB number has not been defined !" << endl ;
+                std::cerr << "ERROR in initLocalRoutingTable:" << std::endl ;
+                std::cerr << "MSB number has not been defined !" << std::endl ;
                 //sc_stop();
         }
                 
         if (defaultTargetCalled==false) {
-                cerr << "ERROR in initLocalRoutingTable:" << endl ;
-                cerr << "Default Target has not been defined!" << endl ;
+                std::cerr << "ERROR in initLocalRoutingTable:" << std::endl ;
+                std::cerr << "Default Target has not been defined!" << std::endl ;
                 //sc_stop();
         }
@@ -526 +526 @@
                           if(tab[page] != 0xFF) {
                           // printf("\n page n° %x ne peut etre adressée à target n°%x car elle est allouée à %x \n",page,localTarget,tab[page]);       
-                          cerr << "Error in initLocalRoutingTable:" << endl ;
-                          cerr << "Segment " << name << " allocated to VCI target " << localTarget << endl;
-                          cerr << "overlap another segment... or is in the same page" << endl;
-                          cerr << "as another segment allocated to another VCI target" << endl;
+                          std::cerr << "Error in initLocalRoutingTable:" << std::endl ;
+                          std::cerr << "Segment " << name << " allocated to VCI target " << localTarget << std::endl;
+                          std::cerr << "overlap another segment... or is in the same page" << std::endl;
+                          std::cerr << "as another segment allocated to another VCI target" << std::endl;
                           //sc_stop();
                           } else {
@@ -599 +599 @@
         if ((MSBNumberCalled==false)||(LSBNumberCalled==false))
                 {
-                cerr << "ERROR in initUncachedTable:" << endl ;
-                cerr << "MSB or LSB number has not been defined !" << endl ;
+                std::cerr << "ERROR in initUncachedTable:" << std::endl ;
+                std::cerr << "MSB or LSB number has not been defined !" << std::endl ;
                 //sc_stop();
                 }