luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow for binary input file in 'testdec' and 'testnpn'.

This commit is contained in:
Alan Mishchenko 2012-10-05 21:43:11 -07:00
parent 369b5f479a
commit 6de48109f3
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/base/abci/abc.c
View File

@ -818,6 +818,7 @@ void Abc_Init( Abc_Frame_t * pAbc )
Cmd_CommandAdd( pAbc, "Liveness", "l3s", Abc_CommandAbcLivenessToSafetyWithLTL, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&test", Abc_CommandAbc9Test, 0 );
{
extern void Dar_LibStart();
Dar_LibStart();
@ -4802,7 +4803,12 @@ int Abc_CommandTestDec( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( argc != globalUtilOptind + 1 )
{
printf( "Input file is not given.\n" );
goto usage;
return 0;
}
if ( nVarNum >= 0 && nVarNum < 6 )
{
printf( "The number of variables cannot be less than 6.\n" );
return 0;
}
// get the output file name
pFileName = argv[globalUtilOptind];
@ -4889,7 +4895,12 @@ int Abc_CommandTestNpn( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( argc != globalUtilOptind + 1 )
{
printf( "Input file is not given.\n" );
goto usage;
return 0;
}
if ( nVarNum >= 0 && nVarNum < 6 )
{
printf( "The number of variables cannot be less than 6.\n" );
return 0;
}
// get the output file name
pFileName = argv[globalUtilOptind];

3
src/base/abci/abcDec.c
View File

@ -402,10 +402,11 @@ Abc_TtStore_t * Abc_TtStoreLoad( char * pFileName, int nVarNum )
{
char * pBuffer;
int nFileSize = Abc_FileSize( pFileName );
int nBytes = (1 << nVarNum);
int nBytes = (1 << (nVarNum-3));
int nTruths = nFileSize / nBytes;
if ( nFileSize == -1 )
return NULL;
assert( nVarNum >= 6 );
if ( nFileSize % nBytes != 0 )
Abc_Print( 0, "The file size (%d) is divided by the truth table size (%d) with remainder (%d).\n",
nFileSize, nBytes, nFileSize % nBytes );