Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Common/src

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/processor/Morpheo/Common/src

Files:

• Debug.cpp (modified) (3 diffs)
• Environment.cpp (added)
• Message.cpp (added)
• Translation.cpp (modified) (1 diff)

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

@@ -7 +7 @@
 
 #include "Common/include/Debug.h"
+#include "Common/include/Environment.h"
+
+namespace morpheo {
 
 static uint32_t _debug_depth = 0;
 
+#undef  FUNCTION
+#define FUNCTION "debug_tab"
 std::string debug_tab (void)
 {
@@ -15 +20 @@
 }
 
+#undef  FUNCTION
+#define FUNCTION "debug_tab_inc"
 void debug_tab_inc (void)
 {
@@ -20 +27 @@
 }
 
+#undef  FUNCTION
+#define FUNCTION "debug_tab_dec"
 void debug_tab_dec (void)
 {
 //   _debug_depth --;
 }
+
+}; // end namespace morpheo

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

@@ -6 +6 @@
  */
 
-#include "../include/Translation.h"
-#include "../include/ErrorMorpheo.h"
+#include "Common/include/Environment.h"
+#include "Common/include/Translation.h"
+#include "Common/include/ErrorMorpheo.h"
 
 namespace morpheo {
 
-  Translation:: Translation (void)
+  static bool translation_initialized;
+
+  void translation (void)
   {
-#ifndef NO_TRANSLATION
-    char * top_level = getenv("MORPHEO_TOPLEVEL");
-    
-    if (top_level == NULL)
-      throw ERRORMORPHEO("Translation","Error morpheo environment is not positioned\n");
-  
-    std::string dirname = top_level;
-    dirname += "IPs/systemC/processor/Morpheo/locale";
+#ifdef TRANSLATION
+    if (not translation_initialized)
+      {
+        environment();
+        
+        std::string dirname = MORPHEO_TOPLEVEL;
+        dirname += "/IPs/systemC/processor/Morpheo/locale";
 
-    bindtextdomain(MORPHEO_PACKAGE,dirname.c_str());
+        if (bindtextdomain(MORPHEO_PACKAGE,dirname.c_str()) == NULL)
+          throw ERRORMORPHEO("Translation","Error in set directory containing message catalogs.\n");
+        
+        translation_initialized = true;
+      }
 #endif    
   }
 
-  Translation::~Translation (void)
-  {
-
-  }
-
 }; // end namespace morpheo