diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abc/abcNtk.c | 14 | ||||
| -rw-r--r-- | src/base/abci/abcIf.c | 2 | ||||
| -rw-r--r-- | src/base/cmd/cmdPlugin.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/base/abc/abcNtk.c b/src/base/abc/abcNtk.c index 4c990c6a..6a20bf91 100644 --- a/src/base/abc/abcNtk.c +++ b/src/base/abc/abcNtk.c @@ -1643,11 +1643,11 @@ void Abc_NtkPermute( Abc_Ntk_t * pNtk, int fInputs, int fOutputs, int fFlops ) Vec_IntWriteEntry( vInputs, i, Vec_IntEntry(vInputs, k) ); Vec_IntWriteEntry( vInputs, k, Entry ); // swap PIs - pTemp = Vec_PtrEntry( pNtk->vPis, i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vPis, i ); Vec_PtrWriteEntry( pNtk->vPis, i, Vec_PtrEntry(pNtk->vPis, k) ); Vec_PtrWriteEntry( pNtk->vPis, k, pTemp ); // swap CIs - pTemp = Vec_PtrEntry( pNtk->vCis, i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vCis, i ); Vec_PtrWriteEntry( pNtk->vCis, i, Vec_PtrEntry(pNtk->vCis, k) ); Vec_PtrWriteEntry( pNtk->vCis, k, pTemp ); //printf( "Swapping PIs %d and %d.\n", i, k ); @@ -1662,11 +1662,11 @@ void Abc_NtkPermute( Abc_Ntk_t * pNtk, int fInputs, int fOutputs, int fFlops ) Vec_IntWriteEntry( vOutputs, i, Vec_IntEntry(vOutputs, k) ); Vec_IntWriteEntry( vOutputs, k, Entry ); // swap POs - pTemp = Vec_PtrEntry( pNtk->vPos, i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vPos, i ); Vec_PtrWriteEntry( pNtk->vPos, i, Vec_PtrEntry(pNtk->vPos, k) ); Vec_PtrWriteEntry( pNtk->vPos, k, pTemp ); // swap COs - pTemp = Vec_PtrEntry( pNtk->vCos, i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vCos, i ); Vec_PtrWriteEntry( pNtk->vCos, i, Vec_PtrEntry(pNtk->vCos, k) ); Vec_PtrWriteEntry( pNtk->vCos, k, pTemp ); //printf( "Swapping POs %d and %d.\n", i, k ); @@ -1682,15 +1682,15 @@ void Abc_NtkPermute( Abc_Ntk_t * pNtk, int fInputs, int fOutputs, int fFlops ) Vec_IntWriteEntry( vFlops, i, Vec_IntEntry(vFlops, k) ); Vec_IntWriteEntry( vFlops, k, Entry ); // swap flops - pTemp = Vec_PtrEntry( pNtk->vBoxes, i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vBoxes, i ); Vec_PtrWriteEntry( pNtk->vBoxes, i, Vec_PtrEntry(pNtk->vBoxes, k) ); Vec_PtrWriteEntry( pNtk->vBoxes, k, pTemp ); // swap CIs - pTemp = Vec_PtrEntry( pNtk->vCis, Abc_NtkPiNum(pNtk)+i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vCis, Abc_NtkPiNum(pNtk)+i ); Vec_PtrWriteEntry( pNtk->vCis, Abc_NtkPiNum(pNtk)+i, Vec_PtrEntry(pNtk->vCis, Abc_NtkPiNum(pNtk)+k) ); Vec_PtrWriteEntry( pNtk->vCis, Abc_NtkPiNum(pNtk)+k, pTemp ); // swap COs - pTemp = Vec_PtrEntry( pNtk->vCos, Abc_NtkPoNum(pNtk)+i ); + pTemp = (Abc_Obj_t *)Vec_PtrEntry( pNtk->vCos, Abc_NtkPoNum(pNtk)+i ); Vec_PtrWriteEntry( pNtk->vCos, Abc_NtkPoNum(pNtk)+i, Vec_PtrEntry(pNtk->vCos, Abc_NtkPoNum(pNtk)+k) ); Vec_PtrWriteEntry( pNtk->vCos, Abc_NtkPoNum(pNtk)+k, pTemp ); diff --git a/src/base/abci/abcIf.c b/src/base/abci/abcIf.c index 95ff6c4f..fcd4a368 100644 --- a/src/base/abci/abcIf.c +++ b/src/base/abci/abcIf.c @@ -1217,7 +1217,7 @@ void Abc_NtkRecreatePoDrivers( If_Man_t * p, Abc_Ntk_t * pNtkNew ) if ( numPo == ~0 ) continue; // get the node and the complemented bit - pFaninNew = Vec_PtrEntry( vDriversNew, numPo ); + pFaninNew = (Abc_Obj_t *)Vec_PtrEntry( vDriversNew, numPo ); fCompl = Vec_IntEntry( vDriverInvs, numPo ); if ( fCompl ) pFaninNew = Abc_NtkCreateNodeInv( pNtkNew, pFaninNew ); diff --git a/src/base/cmd/cmdPlugin.c b/src/base/cmd/cmdPlugin.c index 45533589..8649d465 100644 --- a/src/base/cmd/cmdPlugin.c +++ b/src/base/cmd/cmdPlugin.c @@ -706,8 +706,8 @@ int Cmd_CommandAbcLoadPlugIn( Abc_Frame_t * pAbc, int argc, char ** argv ) pBuffer[strlen(pBuffer)-1] = 0; Cmd_CommandAdd( pAbc, pStrSection, pBuffer, Cmd_CommandAbcPlugIn, 1 ); // plugin_commands.push(Pair(cmd_name, binary_name)); - Vec_PtrPush( pAbc->vPlugInComBinPairs, strdup(pBuffer) ); - Vec_PtrPush( pAbc->vPlugInComBinPairs, strdup(pStrDirBin) ); + Vec_PtrPush( pAbc->vPlugInComBinPairs, Extra_UtilStrsav(pBuffer) ); + Vec_PtrPush( pAbc->vPlugInComBinPairs, Extra_UtilStrsav(pStrDirBin) ); printf( "Creating command %s with binary %s\n", pBuffer, pStrDirBin ); } fclose( pFile ); |