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

In cumulus/Core2Chip.py forgot a parameter to an error message call.

This commit is contained in:
Jean-Paul Chaput 2019-07-31 19:16:40 +02:00
parent 1359fe4ba6
commit 1b444d8f49
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crlcore/python/helpers/__init__.py
View File

@ -316,3 +316,23 @@ def staticInitialization ( quiet=False ):
if not quiet: print ' - <%s>' % sysConfDir if not quiet: print ' - <%s>' % sysConfDir
initTechno( quiet ) initTechno( quiet )
return return
def netDirectionToStr ( netDir ):
flags = [ '-', '-', '-', '-', '-' ]
if netDir & Hurricane.Net.Direction.DirIn: flags[0] = 'i'
if netDir & Hurricane.Net.Direction.DirOut: flags[1] = 'o'
if netDir & Hurricane.Net.Direction.ConnTristate: flags[2] = 't'
if netDir & Hurricane.Net.Direction.ConnWiredOr: flags[3] = 'w'
s = flags[0]+flags[1]+flags[2]+flags[3]+' '
if netDir == Hurricane.Net.Direction.UNDEFINED: s += '(UNDEFINED)'
elif netDir == Hurricane.Net.Direction.IN: s += '(IN)'
elif netDir == Hurricane.Net.Direction.OUT: s += '(OUT)'
elif netDir == Hurricane.Net.Direction.INOUT: s += '(INOUT)'
elif netDir == Hurricane.Net.Direction.TRISTATE: s += '(TRISTATE)'
elif netDir == Hurricane.Net.Direction.TRANSCV: s += '(TRANSCV)'
elif netDir == Hurricane.Net.Direction.WOR_OUT: s += '(WOR_OUT)'
elif netDir == Hurricane.Net.Direction.WOR_INOUT: s += '(WOR_INOUT)'
else: s += '(UNKNOWN)'
return s

4
cumulus/src/plugins/core2chip/CoreToChip.py
View File

@ -20,6 +20,7 @@ from Hurricane import Net
from Hurricane import Instance from Hurricane import Instance
from CRL import Catalog from CRL import Catalog
from CRL import AllianceFramework from CRL import AllianceFramework
from helpers import netDirectionToStr
from helpers.io import ErrorMessage from helpers.io import ErrorMessage
@ -180,7 +181,8 @@ class CoreToChip ( object ):
def _buildStandardPad ( self, ioNet ): def _buildStandardPad ( self, ioNet ):
if not self.ioPads.has_key(ioNet.coreNet.getDirection()): if not self.ioPads.has_key(ioNet.coreNet.getDirection()):
raise ErrorMessage( 1, 'CoreToChip._buildStandardPad(): Unsupported direction %d for core net "%s".' \ raise ErrorMessage( 1, 'CoreToChip._buildStandardPad(): Unsupported direction %d for core net "%s".' \
% ioNet.coreNet.getName() ) % (netDirectionToStr(ioNet.coreNet.getDirection())
,ioNet.coreNet.getName()) )
padInfo = self.ioPads[ ioNet.coreNet.getDirection() ] padInfo = self.ioPads[ ioNet.coreNet.getDirection() ]

17
hurricane/src/isobar/PyNetDirection.cpp
View File

@ -93,11 +93,18 @@ extern "C" {
{ {
PyObject* constant; PyObject* constant;
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::UNDEFINED,"UNDEFINED"); LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::DirIn ,"DirIn" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::IN ,"IN"); LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::DirOut ,"DirOut" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::OUT ,"OUT"); LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::ConnTristate,"ConnTristate");
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::INOUT ,"INOUT"); LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::ConnWiredOr ,"ConnWiredOr" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::TRISTATE ,"TRISTATE"); LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::UNDEFINED ,"UNDEFINED" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::IN ,"IN" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::OUT ,"OUT" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::INOUT ,"INOUT" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::TRISTATE ,"TRISTATE" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::TRANSCV ,"TRANSCV" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::WOR_OUT ,"WOR_OUT" );
LoadObjectConstant(PyTypeNetDirection.tp_dict,Net::Direction::WOR_INOUT ,"WOR_INOUT" );
} }