jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'devel_anabatic' of file:///users/largo2/git/coriolis into devel_anabatic

This commit is contained in:
Jean-Paul Chaput (acting Coriolis) 2016-11-10 10:37:57 +01:00
parent 2dadce1957 c70a220016
commit 3ef5ced601
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stratus1/src/stratus/st_instance.py
View File

@ -346,7 +346,7 @@ class Inst :
# Not for vdd/vss in case of utilisation of SetGlobal # Not for vdd/vss in case of utilisation of SetGlobal
# The detection is done with vst driver in this case ... # The detection is done with vst driver in this case ...
for plug in self._hur_instance.getUnconnectedPlugs(): for plug in self._hur_instance.getUnconnectedPlugs():
if plug.getMasterNet().getType() not in ( TypePOWER, TypeGROUND ) : if plug.getMasterNet().getType() not in ( Net.Type.POWER, Net.Type.GROUND ) :
name = str(plug.getMasterNet().getName()) name = str(plug.getMasterNet().getName())
chaine = re.search ( "(.*)\(", name ) chaine = re.search ( "(.*)\(", name )
if chaine : name = chaine.group(1) if chaine : name = chaine.group(1)

4
stratus1/src/stratus/st_model.py
View File

@ -274,7 +274,7 @@ class Model :
direction = net.getDirection() direction = net.getDirection()
name = str(net.getName()) name = str(net.getName())
if net.getType() in ( TypePOWER, TypeGROUND, TypeCLOCK ) : if net.getType() in ( Net.Type.POWER, Net.Type.GROUND, Net.Type.CLOCK ) :
found = True found = True
continue continue
@ -1199,7 +1199,7 @@ class Model :
if plug_de_inst.getMasterNet().getDirection() == DirectionIN : if plug_de_inst.getMasterNet().getDirection() == DirectionIN :
# ignore vdd and vss # ignore vdd and vss
type = plug_de_inst.getNet().getType() type = plug_de_inst.getNet().getType()
if type not in ( TypePOWER, TypeGROUND ) : net_entree_inst.append ( plug_de_inst.getNet() ) if type not in ( Net.Type.POWER, Net.Type.GROUND ) : net_entree_inst.append ( plug_de_inst.getNet() )
### Deletion of te instance ### ### Deletion of te instance ###
# If the instance has only one output # If the instance has only one output