Changeset 117 for trunk/IPs/systemC/processor/Morpheo/Common

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/processor/Morpheo/Common

Files:

• include/ErrorMorpheo.h (modified) (3 diffs)
• src/MemCheck.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Common/include/ErrorMorpheo.h

@@ -22 +22 @@
   class ErrorMorpheo : public std::exception 
   {
-    // -----[ fields ]----------------------------------------------------
+    // -----[ fields ]----------------------------------------------------
   private : std::string _msg;
     
-    // -----[ methods ]---------------------------------------------------
+    // -----[ methods ]---------------------------------------------------
   public  :             ErrorMorpheo  ()                throw() {_msg = toString("%s ",MSG_ERROR); _msg+="Exception detected ...";}
   public  :             ErrorMorpheo  (std::string msg) throw() {_msg = toString("%s ",MSG_ERROR); _msg+=msg;}
@@ -34 +34 @@
     { 
 #ifdef DEBUG
-      _msg = toString(_("%s <%s> at line %d, in file %s : %s"),MSG_ERROR,funcname.c_str(),line,file.c_str(),msg.c_str());
+      _msg = toString(_("\n%s at line %d, in file %s"),MSG_ERROR,line,file.c_str());
+      _msg = toString(_("\n%s <%s> %s"),MSG_ERROR,funcname.c_str(),msg.c_str());
 #else
-      _msg = toString(_("%s %s"),MSG_ERROR,msg.c_str());
+      _msg = toString(_("\n%s %s"),MSG_ERROR,msg.c_str());
 #endif
     }
@@ -44 +45 @@
   };
 
-  class TestMorpheo : public std::exception 
-  {
-    // -----[ fields ]----------------------------------------------------
-  private : std::string _msg;
+//   class TestMorpheo : public std::exception 
+//   {
+//     // -----[ fields ]----------------------------------------------------
+//   private : std::string _msg;
     
-    // -----[ methods ]---------------------------------------------------
-  public  :             TestMorpheo   ()                throw() {_msg=_("Test error ...");}
-  public  :             TestMorpheo   (std::string msg) throw() {_msg=msg;}
-  public  :             ~TestMorpheo  (void)            throw() {}
-  public  : const char* what          ()    const       throw() { return ( _msg.c_str() );}
-  };
+//     // -----[ methods ]---------------------------------------------------
+//   public  :             TestMorpheo   ()                throw() {_msg=_("Test error ...");}
+//   public  :             TestMorpheo   (std::string msg) throw() {_msg=msg;}
+//   public  :             ~TestMorpheo  (void)            throw() {}
+//   public  : const char* what          ()    const       throw() { return ( _msg.c_str() );}
+//   };
 
 }; // end namespace morpheo              

trunk/IPs/systemC/processor/Morpheo/Common/src/MemCheck.cpp

@@ -14 +14 @@
 
 // Global flags set by macros in MemCheck.h
-bool traceFlag  = true;
+bool traceFlag  = false;
 bool activeFlag = false;
 
@@ -137 +137 @@
 void operator delete(void* p) 
 {
-  memMap_it it = findPtr(p);
+  bool can_free = true;
   
-  if (it != memMap.end())
+  if (activeFlag)
     {
+      memMap_it it = findPtr(p);
+      
+      if (it != memMap.end())
+        {
+          // this pointer is previously allocated
+          delPtr(p);
+          
+        }
+      else
+        {
+          // this pointer is not previously allocated
+
+          can_free = false;
+          msgError("Attempt to delete unknown pointer: %p\n", p);
+        }
+    }
+
+  
+  if (can_free)
+    {
+      if(traceFlag)
+        msgInformation("Deleted memory at address %p\n", p);
+      
       free(p);
-      delPtr(p);
-
-      if(traceFlag)
-        msgInformation("Deleted memory at address %p\n", p);
     }
-  else 
-    if(!p && activeFlag)
-      msgError("Attempt to delete unknown pointer: %p\n", p);
 }