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

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include/Environment.h (modified) (1 diff)
• include/Types.h (modified) (1 diff)
• src/Environment.cpp (modified) (2 diffs)

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

@@ -48 +48 @@
   extern std::string MORPHEO_HOME;
   extern std::string MORPHEO_TOPLEVEL;
+  extern std::string MORPHEO_VERSION;
+  extern std::string MORPHEO_HEADER;
+  extern std::string MORPHEO_DATE;
   
   void environment (void);

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

@@ -42 +42 @@
 #  define SC_OUT(type)             sc_out   <type >
                                  
-#  define PORT_READ(sig)                                      sig->read()
-#  define PORT_WRITE(sig,val)      do {DEBUG_SIGNAL_ACCESS(sig); sig->write(val);} while(0)
+#  define PORT_READ(sig)           sig->read()
+#  define PORT_WRITE(sig,val)      do {DEBUG_SIGNAL_WRITE(sig); sig->write(val);} while(0)
 //#define INTERNAL_READ(sig)       (*sig)
 //#define INTERNAL_WRITE(sig,val)  (*sig) = val

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

@@ -17 +17 @@
 std::string MORPHEO_HOME;
 std::string MORPHEO_TOPLEVEL;
+std::string MORPHEO_VERSION;
+std::string MORPHEO_HEADER;
+std::string MORPHEO_DATE;
 
 #undef  FUNCTION
@@ -25 +28 @@
     {
       {
-        char * toplevel = getenv("MORPHEO_TOPLEVEL");
+        char * TOPLEVEL = getenv("MORPHEO_TOPLEVEL");
         
-        if (toplevel == NULL)
+        if (TOPLEVEL == NULL)
           throw ERRORMORPHEO(FUNCTION,_("Error morpheo environment is not positioned.\n"));
 
-        MORPHEO_TOPLEVEL = toplevel;
+        MORPHEO_TOPLEVEL = TOPLEVEL;
       }
 
       {
-        char * home = getenv("MORPHEO_HOME");
+        char * HOME = getenv("MORPHEO_HOME");
         
-        if (home == NULL)
+        if (HOME == NULL)
           throw ERRORMORPHEO(FUNCTION,_("Error morpheo environment is not positioned.\n"));
 
-        MORPHEO_HOME = home;
+        MORPHEO_HOME = HOME;
+      }
+
+      {
+        char * MAJOR_VERSION = getenv("MORPHEO_MAJOR_VERSION");
+        char * MINOR_VERSION = getenv("MORPHEO_MINOR_VERSION");
+        char * REVISION      = getenv("MORPHEO_REVISION");
+        char * CODENAME      = getenv("MORPHEO_CODENAME");
+        char * DATE_DAY      = getenv("MORPHEO_DATE_DAY");
+        char * DATE_MONTH    = getenv("MORPHEO_DATE_MONTH");
+        char * DATE_YEAR     = getenv("MORPHEO_DATE_YEAR");
+
+        if ((MAJOR_VERSION == NULL) or
+            (MINOR_VERSION == NULL) or
+            (REVISION      == NULL) or
+            (CODENAME      == NULL) or
+            (DATE_DAY      == NULL) or
+            (DATE_MONTH    == NULL) or
+            (DATE_YEAR     == NULL))
+          throw ERRORMORPHEO(FUNCTION,_("Error morpheo environment is not positioned.\n"));
+
+        MORPHEO_VERSION = toString(MAJOR_VERSION)+"."+toString(MINOR_VERSION)+"."+toString(REVISION);
+        MORPHEO_HEADER  = MORPHEO_VERSION+" - "+toString(CODENAME);
+        MORPHEO_DATE    = toString(DATE_YEAR)+"/"+toString(DATE_MONTH)+"/"+toString(DATE_DAY);
       }