summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2015-01-26 09:14:51 -0800
committerAlan Mishchenko <alanmi@berkeley.edu>2015-01-26 09:14:51 -0800
commit65cd556b1d96a316353fdab1b681702a4bf1d419 (patch)
treefd2374b10a23764107dab7c039f43f4cf3d79410
parent24dbdbae23b35b9c578921db7a671ea80b1e2c9b (diff)
downloadabc-65cd556b1d96a316353fdab1b681702a4bf1d419.tar.gz
abc-65cd556b1d96a316353fdab1b681702a4bf1d419.tar.bz2
abc-65cd556b1d96a316353fdab1b681702a4bf1d419.zip
Outputting initial state in Wlc_Ntk_t.
-rw-r--r--src/base/wlc/wlcWriteVer.c53
1 files changed, 25 insertions, 28 deletions
diff --git a/src/base/wlc/wlcWriteVer.c b/src/base/wlc/wlcWriteVer.c
index 8352e4ac..35365e7c 100644
--- a/src/base/wlc/wlcWriteVer.c
+++ b/src/base/wlc/wlcWriteVer.c
@@ -330,30 +330,6 @@ void Wlc_WriteVerInt( FILE * pFile, Wlc_Ntk_t * p )
}
fprintf( pFile, " ;\n" );
}
- Wlc_NtkForEachCi( p, pObj, i )
- {
- char * pName = Wlc_ObjName(p, Wlc_ObjId(p, pObj));
- assert( i == Wlc_ObjCiId(pObj) );
- if ( pObj->Type == WLC_OBJ_PI )
- continue;
- fprintf( pFile, " " );
- fprintf( pFile, "CPL_FF" );
- if ( Wlc_ObjRange(pObj) > 1 )
- fprintf( pFile, "#%d%*s", Wlc_ObjRange(pObj), 4 - Abc_Base10Log(Wlc_ObjRange(pObj)+1), "" );
- else
- fprintf( pFile, " " );
- fprintf( pFile, " reg%d (", i );
- fprintf( pFile, " .q( %s ),", pName );
- fprintf( pFile, " .qbar()," );
- fprintf( pFile, " .d( %s ),", Wlc_ObjName(p, Wlc_ObjId(p, Wlc_ObjFoToFi(p, pObj))) );
- fprintf( pFile, " .clk( %s ),", "1\'b0" );
- fprintf( pFile, " .arst( %s ),", "1\'b0" );
- if ( p->vInits )
- fprintf( pFile, " .arstval( %s_init )", pName );
- else
- fprintf( pFile, " .arstval( %s )", "1\'b0" );
- fprintf( pFile, " ) ;\n" );
- }
iFanin = 0;
assert( !p->vInits || Wlc_NtkFfNum(p) == Vec_IntSize(p->vInits) );
if ( p->vInits )
@@ -378,11 +354,32 @@ void Wlc_WriteVerInt( FILE * pFile, Wlc_Ntk_t * p )
}
fprintf( pFile, ";\n" );
iFanin += Wlc_ObjRange(pObj);
-
- //printf( "%d %d %s\n", iFanin, Wlc_ObjRange(pObj), Wlc_ObjName(p, Wlc_ObjId(p, pObj)) );
}
- k = (int)strlen(p->pInits);
- //assert( !p->vInits || iFanin == (int)strlen(p->pInits) );
+ Wlc_NtkForEachCi( p, pObj, i )
+ {
+ char * pName = Wlc_ObjName(p, Wlc_ObjId(p, pObj));
+ assert( i == Wlc_ObjCiId(pObj) );
+ if ( pObj->Type == WLC_OBJ_PI )
+ continue;
+ fprintf( pFile, " " );
+ fprintf( pFile, "CPL_FF" );
+ if ( Wlc_ObjRange(pObj) > 1 )
+ fprintf( pFile, "#%d%*s", Wlc_ObjRange(pObj), 4 - Abc_Base10Log(Wlc_ObjRange(pObj)+1), "" );
+ else
+ fprintf( pFile, " " );
+ fprintf( pFile, " reg%d (", i );
+ fprintf( pFile, " .q( %s ),", pName );
+ fprintf( pFile, " .qbar()," );
+ fprintf( pFile, " .d( %s ),", Wlc_ObjName(p, Wlc_ObjId(p, Wlc_ObjFoToFi(p, pObj))) );
+ fprintf( pFile, " .clk( %s ),", "1\'b0" );
+ fprintf( pFile, " .arst( %s ),", "1\'b0" );
+ if ( p->vInits )
+ fprintf( pFile, " .arstval( %s_init )", pName );
+ else
+ fprintf( pFile, " .arstval( %s )", "1\'b0" );
+ fprintf( pFile, " ) ;\n" );
+ }
+ assert( !p->vInits || iFanin == (int)strlen(p->pInits) );
fprintf( pFile, "endmodule\n\n" );
}
void Wlc_WriteVer( Wlc_Ntk_t * p, char * pFileName )