Changeset 144 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Timestamp:

Sep 28, 2010, 1:19:10 PM (14 years ago)

Author:

rosiere

Message:

1) compatible gcc 4.4.3
2) Translation file in MORPHEO_PREFIX directory

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Files:

• Multiplier/src/Multiplier_transition.cpp (modified) (1 diff)
• Shifter/src/Shifter.cpp (modified) (2 diffs)
• Sort/src/Sort_genMealy.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Multiplier/src/Multiplier_transition.cpp

@@ -184 +184 @@
           default :
             {
+              data.LSB = 0;
+              data.MSB = 0;
+
               break;
             }

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/src/Shifter.cpp

@@ -8 +8 @@
 #include "Behavioural/Generic/Shifter/include/Shifter.h"
 
-namespace morpheo                    {
+namespace morpheo {
 namespace behavioural {
 namespace generic {
 namespace shifter {
-
 
 #undef  FUNCTION
@@ -81 +80 @@
         sensitive << (*(in_SHIFTER_CARRY     [i]));
         if (param->_carry       == external_completion)
-          if (_param->_type_completion_bool == true)
-            sensitive << (*(in_SHIFTER_CARRY_IN  [i]));
-          else
-            sensitive << (*(in_SHIFTER_COMPLETION[i]));
+          {// BURP : ajout de la parenthèse
+            if (_param->_type_completion_bool == true)
+              sensitive << (*(in_SHIFTER_CARRY_IN  [i]));
+            else
+              sensitive << (*(in_SHIFTER_COMPLETION[i]));
+          }
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_genMealy.cpp

@@ -8 +8 @@
 
 #include "Behavioural/Generic/Sort/include/Sort.h"
+#include <algorithm>
 
 namespace morpheo                    {