From afe83178aec1f6d3bd71d9693fa54047e10fb1cb Mon Sep 17 00:00:00 2001
From: Sophie Belloeil <alliance-users@asim.lip6.fr>
Date: Mon, 6 Sep 2010 11:15:41 +0000
Subject: [PATCH]     Remove of fulladder.vst, step two ...

---
 stratus1/src/stratus/st_bool.py     | 17 ++++++++++++++---
 stratus1/src/stratus/st_instance.py |  3 +--
 stratus1/src/stratus/st_parser.py   |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/stratus1/src/stratus/st_bool.py b/stratus1/src/stratus/st_bool.py
index 19ff8350..1b1e5af7 100644
--- a/stratus1/src/stratus/st_bool.py
+++ b/stratus1/src/stratus/st_bool.py
@@ -119,8 +119,16 @@ class Bool ( Model ) :
         boolMap[self.dictInOut['i0']]   = self._i0[i]
         boolMap[self.dictInOut['i1']]   = self._i1[i]
       elif self.m in A :
-        boolMap[self.dictInOut['a']]    = self._a[i]
-        boolMap[self.dictInOut['b']]    = self._b[i]
+        # sxlib fulladder:
+        import types
+        if type ( self.dictInOut['a'] ) == types.ListType :
+          for realpin in self.dictInOut['a'] : boolMap[realpin] = self._a[i]
+        else :
+          boolMap[self.dictInOut['a']]    = self._a[i]
+        if type ( self.dictInOut['b'] ) == types.ListType :
+          for realpin in self.dictInOut['b'] : boolMap[realpin] = self._b[i]
+        else :
+          boolMap[self.dictInOut['b']]    = self._b[i]
 
       if self.m in I2 :
         boolMap[self.dictInOut['i2']]   = self._i2[i]
@@ -128,7 +136,10 @@ class Bool ( Model ) :
         boolMap[self.dictInOut['i3']]   = self._i3[i]
 
       if self.m in CIN :
-        boolMap[self.dictInOut['cin']]  = self._cin[i]
+        if type ( self.dictInOut['cin'] ) == types.ListType :
+          for realpin in self.dictInOut['cin'] : boolMap[realpin] = self._cin[i]
+        else :
+          boolMap[self.dictInOut['cin']]    = self._cin[i]
       if self.m in CMD :
         boolMap[self.dictInOut['cmd']]  = self._cmd
       elif self.m in CMD0 :
diff --git a/stratus1/src/stratus/st_instance.py b/stratus1/src/stratus/st_instance.py
index bba21550..878efb01 100644
--- a/stratus1/src/stratus/st_instance.py
+++ b/stratus1/src/stratus/st_instance.py
@@ -110,7 +110,6 @@ class Inst :
     if BV == [] : InitBV()
     
     if model in BV : model, self._inout = GetRealModel ( model )
-    print "inout récupéré:", self._inout
 
     ##### Attributes of the instance #####
     self._model        = model.lower()
@@ -169,7 +168,7 @@ class Inst :
       if self._model == c._name :
         self._st_masterCell = c
         break
-    if not( self._hur_masterCell or self._st_masterCell ) : print "\n[Stratus Warning] Inst : no master cell found for instance" + self._name
+    if not( self._hur_masterCell or self._st_masterCell ) : print "\n[Stratus Warning] Inst : no master cell found for instance " + self._name
 
     # Creation of the hurricane instance 
     if CELLS[0]._hur_plug : self.create_hur_inst ( model )
diff --git a/stratus1/src/stratus/st_parser.py b/stratus1/src/stratus/st_parser.py
index 0230ef7a..28e44f02 100644
--- a/stratus1/src/stratus/st_parser.py
+++ b/stratus1/src/stratus/st_parser.py
@@ -85,7 +85,7 @@ class Parser :
   #########################################
   def start_element ( self, name, attrs ) :
     # Print which the technology is
-    if   name == 'technology' : print "  - Stratus virtual technology targets:", attrs['name']
+#    if   name == 'technology' : print "  - Stratus virtual technology targets:", attrs['name']
 
     # Modification of attributes
     if name == 'model' :