Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
abc
Commits
609be7a1
Commit
609be7a1
authored
Jul 08, 2015
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
C++ compiler typecast problem.
parent
4f2d2e0e
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
46 additions
and
46 deletions
+46
-46
src/aig/gia/giaIf.c
+1
-1
src/aig/gia/giaLf.c
+15
-15
src/aig/gia/giaMf.c
+3
-3
src/aig/gia/giaNf.c
+1
-1
src/aig/gia/giaStr.c
+1
-1
src/aig/gia/giaSweep.c
+1
-1
src/aig/saig/saigUnfold2.c
+1
-1
src/base/abci/abcDsd.c
+1
-1
src/base/cba/cbaCom.c
+1
-1
src/base/cba/cbaNtk.c
+4
-4
src/base/cba/cbaPrsBuild.c
+1
-1
src/base/cba/cbaPrsTrans.c
+1
-1
src/base/cba/cbaPtrAbc.c
+3
-3
src/base/cba/cbaWriteVer.c
+2
-2
src/base/pla/plaRead.c
+4
-4
src/base/wlc/wlcReadSmt.c
+1
-1
src/base/wlc/wlcSim.c
+2
-2
src/map/if/ifTune.c
+1
-1
src/misc/extra/extraUtilEnum.c
+1
-1
src/proof/cec/cecSplit.c
+1
-1
No files found.
src/aig/gia/giaIf.c
View file @
609be7a1
...
@@ -2123,7 +2123,7 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars )
...
@@ -2123,7 +2123,7 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars )
Gia_Man_t
*
Gia_ManPerformMapping
(
Gia_Man_t
*
p
,
void
*
pp
)
Gia_Man_t
*
Gia_ManPerformMapping
(
Gia_Man_t
*
p
,
void
*
pp
)
{
{
Gia_Man_t
*
pNew
;
Gia_Man_t
*
pNew
;
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
(
Tim_Man_t
*
)
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
{
{
pNew
=
Gia_ManDupUnnormalize
(
p
);
pNew
=
Gia_ManDupUnnormalize
(
p
);
if
(
pNew
==
NULL
)
if
(
pNew
==
NULL
)
...
...
src/aig/gia/giaLf.c
View file @
609be7a1
...
@@ -1511,12 +1511,12 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
...
@@ -1511,12 +1511,12 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
if
(
p
->
pGia
->
pManTime
!=
NULL
)
if
(
p
->
pGia
->
pManTime
!=
NULL
)
{
{
assert
(
Gia_ManBufNum
(
p
->
pGia
)
);
assert
(
Gia_ManBufNum
(
p
->
pGia
)
);
Tim_ManIncrementTravId
(
p
->
pGia
->
pManTime
);
Tim_ManIncrementTravId
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
);
if
(
p
->
pPars
->
fDoAverage
)
if
(
p
->
pPars
->
fDoAverage
)
for
(
i
=
0
;
i
<
Gia_ManCoNum
(
p
->
pGia
);
i
++
)
for
(
i
=
0
;
i
<
Gia_ManCoNum
(
p
->
pGia
);
i
++
)
Tim_ManSetCoRequired
(
p
->
pGia
->
pManTime
,
i
,
(
int
)(
Lf_ObjCoArrival
(
p
,
i
)
*
(
100
.
0
+
p
->
pPars
->
nRelaxRatio
)
/
100
.
0
)
);
Tim_ManSetCoRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
i
,
(
int
)(
Lf_ObjCoArrival
(
p
,
i
)
*
(
100
.
0
+
p
->
pPars
->
nRelaxRatio
)
/
100
.
0
)
);
else
else
Tim_ManInitPoRequiredAll
(
p
->
pGia
->
pManTime
,
Delay
);
Tim_ManInitPoRequiredAll
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Delay
);
Gia_ManForEachObjReverse1
(
p
->
pGia
,
pObj
,
i
)
Gia_ManForEachObjReverse1
(
p
->
pGia
,
pObj
,
i
)
{
{
if
(
Gia_ObjIsBuf
(
pObj
)
)
if
(
Gia_ObjIsBuf
(
pObj
)
)
...
@@ -1527,11 +1527,11 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
...
@@ -1527,11 +1527,11 @@ int Lf_ManSetMapRefs( Lf_Man_t * p )
Lf_ManSetMapRefsOne
(
p
,
i
);
Lf_ManSetMapRefsOne
(
p
,
i
);
}
}
else
if
(
Gia_ObjIsCi
(
pObj
)
)
else
if
(
Gia_ObjIsCi
(
pObj
)
)
Tim_ManSetCiRequired
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
Lf_ObjRequired
(
p
,
i
)
);
Tim_ManSetCiRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
Lf_ObjRequired
(
p
,
i
)
);
else
if
(
Gia_ObjIsCo
(
pObj
)
)
else
if
(
Gia_ObjIsCo
(
pObj
)
)
{
{
int
iDriverId
=
Gia_ObjFaninId0
(
pObj
,
i
);
int
iDriverId
=
Gia_ObjFaninId0
(
pObj
,
i
);
int
reqTime
=
Tim_ManGetCoRequired
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
int
reqTime
=
Tim_ManGetCoRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
Lf_ObjSetRequired
(
p
,
iDriverId
,
reqTime
);
Lf_ObjSetRequired
(
p
,
iDriverId
,
reqTime
);
if
(
Gia_ObjIsAndNotBuf
(
Gia_ObjFanin0
(
pObj
))
)
if
(
Gia_ObjIsAndNotBuf
(
Gia_ObjFanin0
(
pObj
))
)
Lf_ObjMapRefInc
(
p
,
iDriverId
);
Lf_ObjMapRefInc
(
p
,
iDriverId
);
...
@@ -1615,12 +1615,12 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
...
@@ -1615,12 +1615,12 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
Gia_ManCleanMark0
(
p
->
pGia
);
Gia_ManCleanMark0
(
p
->
pGia
);
if
(
p
->
pGia
->
pManTime
!=
NULL
)
if
(
p
->
pGia
->
pManTime
!=
NULL
)
{
{
Tim_ManIncrementTravId
(
p
->
pGia
->
pManTime
);
Tim_ManIncrementTravId
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
);
if
(
p
->
pPars
->
fDoAverage
)
if
(
p
->
pPars
->
fDoAverage
)
for
(
i
=
0
;
i
<
Gia_ManCoNum
(
p
->
pGia
);
i
++
)
for
(
i
=
0
;
i
<
Gia_ManCoNum
(
p
->
pGia
);
i
++
)
Tim_ManSetCoRequired
(
p
->
pGia
->
pManTime
,
i
,
(
int
)(
Lf_ObjCoArrival
(
p
,
i
)
*
(
100
.
0
+
p
->
pPars
->
nRelaxRatio
)
/
100
.
0
)
);
Tim_ManSetCoRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
i
,
(
int
)(
Lf_ObjCoArrival
(
p
,
i
)
*
(
100
.
0
+
p
->
pPars
->
nRelaxRatio
)
/
100
.
0
)
);
else
else
Tim_ManInitPoRequiredAll
(
p
->
pGia
->
pManTime
,
Delay
);
Tim_ManInitPoRequiredAll
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Delay
);
Gia_ManForEachObjReverse1
(
p
->
pGia
,
pObj
,
i
)
Gia_ManForEachObjReverse1
(
p
->
pGia
,
pObj
,
i
)
{
{
if
(
Gia_ObjIsBuf
(
pObj
)
)
if
(
Gia_ObjIsBuf
(
pObj
)
)
...
@@ -1631,10 +1631,10 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
...
@@ -1631,10 +1631,10 @@ void Lf_ManCountMapRefs( Lf_Man_t * p )
Lf_ManCountMapRefsOne
(
p
,
i
);
Lf_ManCountMapRefsOne
(
p
,
i
);
}
}
else
if
(
Gia_ObjIsCi
(
pObj
)
)
else
if
(
Gia_ObjIsCi
(
pObj
)
)
Tim_ManSetCiRequired
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
Lf_ObjRequired
(
p
,
i
)
);
Tim_ManSetCiRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
Lf_ObjRequired
(
p
,
i
)
);
else
if
(
Gia_ObjIsCo
(
pObj
)
)
else
if
(
Gia_ObjIsCo
(
pObj
)
)
{
{
int
reqTime
=
Tim_ManGetCoRequired
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
int
reqTime
=
Tim_ManGetCoRequired
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
Lf_ObjSetRequired
(
p
,
Gia_ObjFaninId0
(
pObj
,
i
),
reqTime
);
Lf_ObjSetRequired
(
p
,
Gia_ObjFaninId0
(
pObj
,
i
),
reqTime
);
}
}
else
assert
(
0
);
else
assert
(
0
);
...
@@ -2095,7 +2095,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
...
@@ -2095,7 +2095,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
if
(
p
->
pGia
->
pManTime
!=
NULL
)
if
(
p
->
pGia
->
pManTime
!=
NULL
)
{
{
assert
(
!
Gia_ManBufNum
(
p
->
pGia
)
);
assert
(
!
Gia_ManBufNum
(
p
->
pGia
)
);
Tim_ManIncrementTravId
(
p
->
pGia
->
pManTime
);
Tim_ManIncrementTravId
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
);
Gia_ManForEachObj1
(
p
->
pGia
,
pObj
,
i
)
Gia_ManForEachObj1
(
p
->
pGia
,
pObj
,
i
)
{
{
if
(
Gia_ObjIsBuf
(
pObj
)
)
if
(
Gia_ObjIsBuf
(
pObj
)
)
...
@@ -2104,13 +2104,13 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
...
@@ -2104,13 +2104,13 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
Lf_ObjMergeOrder
(
p
,
i
);
Lf_ObjMergeOrder
(
p
,
i
);
else
if
(
Gia_ObjIsCi
(
pObj
)
)
else
if
(
Gia_ObjIsCi
(
pObj
)
)
{
{
arrTime
=
Tim_ManGetCiArrival
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
arrTime
=
Tim_ManGetCiArrival
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
)
);
Lf_ObjSetCiArrival
(
p
,
Gia_ObjCioId
(
pObj
),
arrTime
);
Lf_ObjSetCiArrival
(
p
,
Gia_ObjCioId
(
pObj
),
arrTime
);
}
}
else
if
(
Gia_ObjIsCo
(
pObj
)
)
else
if
(
Gia_ObjIsCo
(
pObj
)
)
{
{
arrTime
=
Lf_ObjCoArrival
(
p
,
Gia_ObjCioId
(
pObj
)
);
arrTime
=
Lf_ObjCoArrival
(
p
,
Gia_ObjCioId
(
pObj
)
);
Tim_ManSetCoArrival
(
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
arrTime
);
Tim_ManSetCoArrival
(
(
Tim_Man_t
*
)
p
->
pGia
->
pManTime
,
Gia_ObjCioId
(
pObj
),
arrTime
);
}
}
else
assert
(
0
);
else
assert
(
0
);
}
}
...
@@ -2128,7 +2128,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
...
@@ -2128,7 +2128,7 @@ void Lf_ManComputeMapping( Lf_Man_t * p )
Lf_ManCountMapRefs
(
p
);
Lf_ManCountMapRefs
(
p
);
else
else
Lf_ManSetMapRefs
(
p
);
Lf_ManSetMapRefs
(
p
);
Lf_ManPrintStats
(
p
,
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
);
Lf_ManPrintStats
(
p
,
(
char
*
)(
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
)
);
}
}
Gia_Man_t
*
Lf_ManPerformMappingInt
(
Gia_Man_t
*
pGia
,
Jf_Par_t
*
pPars
)
Gia_Man_t
*
Lf_ManPerformMappingInt
(
Gia_Man_t
*
pGia
,
Jf_Par_t
*
pPars
)
{
{
...
@@ -2193,7 +2193,7 @@ Gia_Man_t * Lf_ManPerformMappingInt( Gia_Man_t * pGia, Jf_Par_t * pPars )
...
@@ -2193,7 +2193,7 @@ Gia_Man_t * Lf_ManPerformMappingInt( Gia_Man_t * pGia, Jf_Par_t * pPars )
Gia_Man_t
*
Lf_ManPerformMapping
(
Gia_Man_t
*
p
,
Jf_Par_t
*
pPars
)
Gia_Man_t
*
Lf_ManPerformMapping
(
Gia_Man_t
*
p
,
Jf_Par_t
*
pPars
)
{
{
Gia_Man_t
*
pNew
;
Gia_Man_t
*
pNew
;
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
(
Tim_Man_t
*
)
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
{
{
Tim_Man_t
*
pTimOld
=
(
Tim_Man_t
*
)
p
->
pManTime
;
Tim_Man_t
*
pTimOld
=
(
Tim_Man_t
*
)
p
->
pManTime
;
p
->
pManTime
=
Tim_ManDup
(
pTimOld
,
1
);
p
->
pManTime
=
Tim_ManDup
(
pTimOld
,
1
);
...
...
src/aig/gia/giaMf.c
View file @
609be7a1
...
@@ -1469,7 +1469,7 @@ void Mf_ManComputeCuts( Mf_Man_t * p )
...
@@ -1469,7 +1469,7 @@ void Mf_ManComputeCuts( Mf_Man_t * p )
Gia_ManForEachAndId
(
p
->
pGia
,
i
)
Gia_ManForEachAndId
(
p
->
pGia
,
i
)
Mf_ObjMergeOrder
(
p
,
i
);
Mf_ObjMergeOrder
(
p
,
i
);
Mf_ManSetMapRefs
(
p
);
Mf_ManSetMapRefs
(
p
);
Mf_ManPrintStats
(
p
,
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
);
Mf_ManPrintStats
(
p
,
(
char
*
)(
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
)
);
}
}
/**Function*************************************************************
/**Function*************************************************************
...
@@ -1570,7 +1570,7 @@ void Mf_ManComputeMapping( Mf_Man_t * p )
...
@@ -1570,7 +1570,7 @@ void Mf_ManComputeMapping( Mf_Man_t * p )
Gia_ManForEachAndId
(
p
->
pGia
,
i
)
Gia_ManForEachAndId
(
p
->
pGia
,
i
)
Mf_ObjComputeBestCut
(
p
,
i
);
Mf_ObjComputeBestCut
(
p
,
i
);
Mf_ManSetMapRefs
(
p
);
Mf_ManSetMapRefs
(
p
);
Mf_ManPrintStats
(
p
,
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
);
Mf_ManPrintStats
(
p
,
(
char
*
)(
p
->
fUseEla
?
"Ela "
:
(
p
->
Iter
?
"Area "
:
"Delay"
)
)
);
}
}
Gia_Man_t
*
Mf_ManPerformMapping
(
Gia_Man_t
*
pGia
,
Jf_Par_t
*
pPars
)
Gia_Man_t
*
Mf_ManPerformMapping
(
Gia_Man_t
*
pGia
,
Jf_Par_t
*
pPars
)
{
{
...
@@ -1641,7 +1641,7 @@ Cnf_Dat_t * Mf_ManGenerateCnf( Gia_Man_t * pGia, int nLutSize, int fCnfObjIds, i
...
@@ -1641,7 +1641,7 @@ Cnf_Dat_t * Mf_ManGenerateCnf( Gia_Man_t * pGia, int nLutSize, int fCnfObjIds, i
pNew
=
Mf_ManPerformMapping
(
pGia
,
pPars
);
pNew
=
Mf_ManPerformMapping
(
pGia
,
pPars
);
Gia_ManStopP
(
&
pNew
);
Gia_ManStopP
(
&
pNew
);
// Cnf_DataPrint( (Cnf_Dat_t *)pGia->pData, 1 );
// Cnf_DataPrint( (Cnf_Dat_t *)pGia->pData, 1 );
return
pGia
->
pData
;
return
(
Cnf_Dat_t
*
)
pGia
->
pData
;
}
}
void
Mf_ManDumpCnf
(
Gia_Man_t
*
p
,
char
*
pFileName
,
int
nLutSize
,
int
fCnfObjIds
,
int
fAddOrCla
,
int
fVerbose
)
void
Mf_ManDumpCnf
(
Gia_Man_t
*
p
,
char
*
pFileName
,
int
nLutSize
,
int
fCnfObjIds
,
int
fAddOrCla
,
int
fVerbose
)
{
{
...
...
src/aig/gia/giaNf.c
View file @
609be7a1
...
@@ -2126,7 +2126,7 @@ Gia_Man_t * Nf_ManPerformMapping( Gia_Man_t * pGia, Jf_Par_t * pPars )
...
@@ -2126,7 +2126,7 @@ Gia_Man_t * Nf_ManPerformMapping( Gia_Man_t * pGia, Jf_Par_t * pPars )
{
{
Nf_ManComputeMapping
(
p
);
Nf_ManComputeMapping
(
p
);
Nf_ManSetMapRefs
(
p
);
Nf_ManSetMapRefs
(
p
);
Nf_ManPrintStats
(
p
,
p
->
Iter
?
"Area "
:
"Delay"
);
Nf_ManPrintStats
(
p
,
(
char
*
)(
p
->
Iter
?
"Area "
:
"Delay"
)
);
}
}
/*
/*
p->fUseEla = 1;
p->fUseEla = 1;
...
...
src/aig/gia/giaStr.c
View file @
609be7a1
...
@@ -1379,7 +1379,7 @@ Gia_Man_t * Gia_ManLutBalance( Gia_Man_t * p, int nLutSize, int fUseMuxes, int f
...
@@ -1379,7 +1379,7 @@ Gia_Man_t * Gia_ManLutBalance( Gia_Man_t * p, int nLutSize, int fUseMuxes, int f
Str_Ntk_t
*
pNtk
;
Str_Ntk_t
*
pNtk
;
Gia_Man_t
*
pNew
;
Gia_Man_t
*
pNew
;
abctime
clk
=
Abc_Clock
();
abctime
clk
=
Abc_Clock
();
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
if
(
p
->
pManTime
&&
Tim_ManBoxNum
(
(
Tim_Man_t
*
)
p
->
pManTime
)
&&
Gia_ManIsNormalized
(
p
)
)
{
{
Tim_Man_t
*
pTimOld
=
(
Tim_Man_t
*
)
p
->
pManTime
;
Tim_Man_t
*
pTimOld
=
(
Tim_Man_t
*
)
p
->
pManTime
;
p
->
pManTime
=
Tim_ManDup
(
pTimOld
,
16
);
p
->
pManTime
=
Tim_ManDup
(
pTimOld
,
16
);
...
...
src/aig/gia/giaSweep.c
View file @
609be7a1
...
@@ -190,7 +190,7 @@ Gia_Man_t * Gia_ManDupWithBoxes( Gia_Man_t * p, int fSeq )
...
@@ -190,7 +190,7 @@ Gia_Man_t * Gia_ManDupWithBoxes( Gia_Man_t * p, int fSeq )
assert
(
p
->
pAigExtra
!=
NULL
);
assert
(
p
->
pAigExtra
!=
NULL
);
assert
(
pNew
->
pAigExtra
==
NULL
);
assert
(
pNew
->
pAigExtra
==
NULL
);
pNew
->
pAigExtra
=
Gia_ManUpdateExtraAig2
(
p
->
pManTime
,
p
->
pAigExtra
,
vBoxesLeft
);
pNew
->
pAigExtra
=
Gia_ManUpdateExtraAig2
(
p
->
pManTime
,
p
->
pAigExtra
,
vBoxesLeft
);
assert
(
Gia_ManCiNum
(
pNew
)
==
Tim_ManPiNum
(
pNew
->
pManTime
)
+
Gia_ManCoNum
(
pNew
->
pAigExtra
)
);
assert
(
Gia_ManCiNum
(
pNew
)
==
Tim_ManPiNum
(
(
Tim_Man_t
*
)
pNew
->
pManTime
)
+
Gia_ManCoNum
(
pNew
->
pAigExtra
)
);
Vec_IntFree
(
vBoxesLeft
);
Vec_IntFree
(
vBoxesLeft
);
return
pNew
;
return
pNew
;
}
}
...
...
src/aig/saig/saigUnfold2.c
View file @
609be7a1
...
@@ -450,7 +450,7 @@ Aig_Man_t * Saig_ManDupFoldConstrsFunc2( Aig_Man_t * pAig, int fCompl, int fVerb
...
@@ -450,7 +450,7 @@ Aig_Man_t * Saig_ManDupFoldConstrsFunc2( Aig_Man_t * pAig, int fCompl, int fVerb
if
(
i
+
typeII_cc
<
Aig_ManRegNum
(
pAig
))
{
if
(
i
+
typeII_cc
<
Aig_ManRegNum
(
pAig
))
{
Aig_Obj_t
*
c
=
Aig_Mux
(
pAigNew
,
Aig_Not
(
pFlopIn
),
Aig_Obj_t
*
c
=
Aig_Mux
(
pAigNew
,
Aig_Not
(
pFlopIn
),
Aig_ObjChild0Copy
(
pObjLi
)
,
Aig_ObjChild0Copy
(
pObjLi
)
,
pObjLo
->
pData
);
(
Aig_Obj_t
*
)
pObjLo
->
pData
);
Aig_ObjCreateCo
(
pAigNew
,
c
);
Aig_ObjCreateCo
(
pAigNew
,
c
);
}
else
{
}
else
{
printf
(
"skipping: reg%d
\n
"
,
i
);
printf
(
"skipping: reg%d
\n
"
,
i
);
...
...
src/base/abci/abcDsd.c
View file @
609be7a1
...
@@ -665,7 +665,7 @@ Abc_Ntk_t * Abc_NtkSparsifyInternal( Abc_Ntk_t * pNtk, int nPerc, int fVerbose )
...
@@ -665,7 +665,7 @@ Abc_Ntk_t * Abc_NtkSparsifyInternal( Abc_Ntk_t * pNtk, int nPerc, int fVerbose )
pDriver
->
pCopy
->
pData
=
bFunc
;
pDriver
->
pCopy
->
pData
=
bFunc
;
Abc_NtkDupObj
(
pNtkNew
,
pObj
,
0
);
Abc_NtkDupObj
(
pNtkNew
,
pObj
,
0
);
Abc_ObjAddFanin
(
pObj
->
pCopy
,
pDriver
->
pCopy
);
Abc_ObjAddFanin
(
pObj
->
pCopy
,
pDriver
->
pCopy
);
Abc_ObjAssignName
(
pObj
->
pCopy
,
Abc_ObjName
(
pObj
),
c
?
"_off"
:
"_on"
);
Abc_ObjAssignName
(
pObj
->
pCopy
,
Abc_ObjName
(
pObj
),
(
char
*
)(
c
?
"_off"
:
"_on"
)
);
}
}
}
}
Abc_NtkLogicMakeSimpleCos
(
pNtkNew
,
0
);
Abc_NtkLogicMakeSimpleCos
(
pNtkNew
,
0
);
...
...
src/base/cba/cbaCom.c
View file @
609be7a1
...
@@ -486,7 +486,7 @@ int Cba_CommandGet( Abc_Frame_t * pAbc, int argc, char ** argv )
...
@@ -486,7 +486,7 @@ int Cba_CommandGet( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_Print
(
1
,
"Cba_CommandGet(): There is no current mapped design.
\n
"
);
Abc_Print
(
1
,
"Cba_CommandGet(): There is no current mapped design.
\n
"
);
return
0
;
return
0
;
}
}
pNew
=
Cba_ManInsertAbc
(
p
,
pAbc
->
pNtkCur
);
pNew
=
(
Cba_Man_t
*
)
Cba_ManInsertAbc
(
p
,
pAbc
->
pNtkCur
);
}
}
else
else
{
{
...
...
src/base/cba/cbaNtk.c
View file @
609be7a1
...
@@ -130,10 +130,10 @@ static inline int Cba_GetTypeId( Cba_ObjType_t Type )
...
@@ -130,10 +130,10 @@ static inline int Cba_GetTypeId( Cba_ObjType_t Type )
}
}
void
Cba_ManSetupTypes
(
char
**
pNames
,
char
**
pSymbs
)
void
Cba_ManSetupTypes
(
char
**
pNames
,
char
**
pSymbs
)
{
{
int
Type
,
Id
;
Cba_ObjType_t
Type
;
for
(
Type
=
1
;
Type
<
CBA_BOX_UNKNOWN
;
Type
++
)
for
(
Type
=
1
;
Type
<
CBA_BOX_UNKNOWN
;
Type
++
)
{
{
Id
=
Cba_GetTypeId
(
Type
);
int
Id
=
Cba_GetTypeId
(
Type
);
pNames
[
Type
]
=
s_Types
[
Id
].
pName
;
pNames
[
Type
]
=
s_Types
[
Id
].
pName
;
pSymbs
[
Type
]
=
s_Types
[
Id
].
pSymb
;
pSymbs
[
Type
]
=
s_Types
[
Id
].
pSymb
;
}
}
...
@@ -160,7 +160,7 @@ char * Cba_NtkGenerateName( Cba_Ntk_t * p, Cba_ObjType_t Type, Vec_Int_t * vBits
...
@@ -160,7 +160,7 @@ char * Cba_NtkGenerateName( Cba_Ntk_t * p, Cba_ObjType_t Type, Vec_Int_t * vBits
Cba_ObjType_t
Cba_NameToType
(
char
*
pName
)
Cba_ObjType_t
Cba_NameToType
(
char
*
pName
)
{
{
in
t
i
;
Cba_ObjType_
t
i
;
if
(
strncmp
(
pName
,
s_Pref
,
strlen
(
s_Pref
))
)
if
(
strncmp
(
pName
,
s_Pref
,
strlen
(
s_Pref
))
)
return
0
;
return
0
;
pName
+=
strlen
(
s_Pref
);
pName
+=
strlen
(
s_Pref
);
...
@@ -332,7 +332,7 @@ void Cba_ManAssignInternWordNamesNtk( Cba_Ntk_t * p, Vec_Int_t * vMap )
...
@@ -332,7 +332,7 @@ void Cba_ManAssignInternWordNamesNtk( Cba_Ntk_t * p, Vec_Int_t * vMap )
{
{
//int Type = Cba_ObjType(p, iObj);
//int Type = Cba_ObjType(p, iObj);
int
Range
=
Cba_ObjIsPi
(
p
,
iObj
)
?
Cba_ObjPiRange
(
p
,
iObj
)
:
Cba_BoxBoRange
(
p
,
iObj
);
int
Range
=
Cba_ObjIsPi
(
p
,
iObj
)
?
Cba_ObjPiRange
(
p
,
iObj
)
:
Cba_BoxBoRange
(
p
,
iObj
);
iName
=
Cba_ManAssignInternTwo
(
p
,
nNames
++
,
nDigits
,
Cba_ObjIsPi
(
p
,
iObj
)
?
"i"
:
"n"
,
vMap
);
iName
=
Cba_ManAssignInternTwo
(
p
,
nNames
++
,
nDigits
,
(
char
*
)(
Cba_ObjIsPi
(
p
,
iObj
)
?
"i"
:
"n"
)
,
vMap
);
if
(
Range
==
1
)
if
(
Range
==
1
)
Cba_ObjSetName
(
p
,
iObj
,
Abc_Var2Lit2
(
iName
,
CBA_NAME_BIN
)
);
Cba_ObjSetName
(
p
,
iObj
,
Abc_Var2Lit2
(
iName
,
CBA_NAME_BIN
)
);
else
else
...
...
src/base/cba/cbaPrsBuild.c
View file @
609be7a1
...
@@ -235,7 +235,7 @@ void Prs_ManBuildNtk( Cba_Ntk_t * pNew, Vec_Ptr_t * vDes, Prs_Ntk_t * pNtk, Vec_
...
@@ -235,7 +235,7 @@ void Prs_ManBuildNtk( Cba_Ntk_t * pNew, Vec_Ptr_t * vDes, Prs_Ntk_t * pNtk, Vec_
}
}
else
else
{
{
iObj
=
Cba_BoxAlloc
(
pNew
,
Prs_BoxNtk
(
pNtk
,
iBox
),
Prs_BoxIONum
(
pNtk
,
iBox
)
-
1
,
1
,
-
1
);
iObj
=
Cba_BoxAlloc
(
pNew
,
(
Cba_ObjType_t
)
Prs_BoxNtk
(
pNtk
,
iBox
),
Prs_BoxIONum
(
pNtk
,
iBox
)
-
1
,
1
,
-
1
);
// consider box output
// consider box output
NameId
=
Vec_IntEntryLast
(
vSigs
);
NameId
=
Vec_IntEntryLast
(
vSigs
);
NameId
=
Prs_NtkSigName
(
pNtk
,
NameId
);
NameId
=
Prs_NtkSigName
(
pNtk
,
NameId
);
...
...
src/base/cba/cbaPrsTrans.c
View file @
609be7a1
...
@@ -167,7 +167,7 @@ static inline int Prs_ManRangeSizeConcat( Prs_Ntk_t * p, int Con )
...
@@ -167,7 +167,7 @@ static inline int Prs_ManRangeSizeConcat( Prs_Ntk_t * p, int Con )
static
inline
int
Prs_ManRangeSizeSignal
(
Prs_Ntk_t
*
p
,
int
Sig
)
static
inline
int
Prs_ManRangeSizeSignal
(
Prs_Ntk_t
*
p
,
int
Sig
)
{
{
int
Value
=
Abc_Lit2Var2
(
Sig
);
int
Value
=
Abc_Lit2Var2
(
Sig
);
Prs_ManType_t
Type
=
Abc_Lit2Att2
(
Sig
);
Prs_ManType_t
Type
=
(
Prs_ManType_t
)
Abc_Lit2Att2
(
Sig
);
if
(
Type
==
CBA_PRS_NAME
)
if
(
Type
==
CBA_PRS_NAME
)
return
Prs_ManRangeSizeName
(
p
,
Value
);
return
Prs_ManRangeSizeName
(
p
,
Value
);
if
(
Type
==
CBA_PRS_SLICE
)
if
(
Type
==
CBA_PRS_SLICE
)
...
...
src/base/cba/cbaPtrAbc.c
View file @
609be7a1
...
@@ -121,10 +121,10 @@ Vec_Ptr_t * Ptr_AbcDeriveNode( Abc_Obj_t * pObj )
...
@@ -121,10 +121,10 @@ Vec_Ptr_t * Ptr_AbcDeriveNode( Abc_Obj_t * pObj )
assert
(
Abc_ObjFaninNum
(
pObj
)
<=
2
);
assert
(
Abc_ObjFaninNum
(
pObj
)
<=
2
);
Abc_ObjForEachFanin
(
pObj
,
pFanin
,
i
)
Abc_ObjForEachFanin
(
pObj
,
pFanin
,
i
)
{
{
Vec_PtrPush
(
vNode
,
i
?
"r"
:
"l"
);
Vec_PtrPush
(
vNode
,
(
void
*
)(
i
?
"r"
:
"l"
)
);
Vec_PtrPush
(
vNode
,
Ptr_AbcObjName
(
pFanin
)
);
Vec_PtrPush
(
vNode
,
Ptr_AbcObjName
(
pFanin
)
);
}
}
Vec_PtrPush
(
vNode
,
"o"
);
Vec_PtrPush
(
vNode
,
(
void
*
)(
"o"
)
);
Vec_PtrPush
(
vNode
,
Ptr_AbcObjName
(
pObj
)
);
Vec_PtrPush
(
vNode
,
Ptr_AbcObjName
(
pObj
)
);
assert
(
Ptr_CheckArray
(
vNode
)
);
assert
(
Ptr_CheckArray
(
vNode
)
);
return
vNode
;
return
vNode
;
...
@@ -305,7 +305,7 @@ int Cba_NtkDeriveFromPtr( Cba_Ntk_t * pNtk, Vec_Ptr_t * vNtk, Vec_Int_t * vMap,
...
@@ -305,7 +305,7 @@ int Cba_NtkDeriveFromPtr( Cba_Ntk_t * pNtk, Vec_Ptr_t * vNtk, Vec_Int_t * vMap,
int
NtkId
=
Cba_ManNtkFindId
(
pNtk
->
pDesign
,
pBoxNtk
);
int
NtkId
=
Cba_ManNtkFindId
(
pNtk
->
pDesign
,
pBoxNtk
);
assert
(
Vec_PtrSize
(
vBox
)
%
2
==
0
);
assert
(
Vec_PtrSize
(
vBox
)
%
2
==
0
);
assert
(
nOutputs
>
0
&&
2
*
(
nOutputs
+
1
)
<=
Vec_PtrSize
(
vBox
)
);
assert
(
nOutputs
>
0
&&
2
*
(
nOutputs
+
1
)
<=
Vec_PtrSize
(
vBox
)
);
iObj
=
Cba_BoxAlloc
(
pNtk
,
Ptr_NameToType
(
pBoxNtk
),
nInputs
,
nOutputs
,
NtkId
);
iObj
=
Cba_BoxAlloc
(
pNtk
,
(
Cba_ObjType_t
)
Ptr_NameToType
(
pBoxNtk
),
nInputs
,
nOutputs
,
NtkId
);
if
(
NtkId
>
0
)
if
(
NtkId
>
0
)
Cba_NtkSetHost
(
Cba_ManNtk
(
pNtk
->
pDesign
,
NtkId
),
Cba_NtkId
(
pNtk
),
iObj
);
Cba_NtkSetHost
(
Cba_ManNtk
(
pNtk
->
pDesign
,
NtkId
),
Cba_NtkId
(
pNtk
),
iObj
);
Cba_ObjSetName
(
pNtk
,
iObj
,
Abc_Var2Lit2
(
Abc_NamStrFindOrAdd
(
pNtk
->
pDesign
->
pStrs
,
pBoxName
,
NULL
),
CBA_NAME_BIN
)
);
Cba_ObjSetName
(
pNtk
,
iObj
,
Abc_Var2Lit2
(
Abc_NamStrFindOrAdd
(
pNtk
->
pDesign
->
pStrs
,
pBoxName
,
NULL
),
CBA_NAME_BIN
)
);
...
...
src/base/cba/cbaWriteVer.c
View file @
609be7a1
...
@@ -55,7 +55,7 @@ void Prs_ManWriteVerilogConcat( FILE * pFile, Prs_Ntk_t * p, int Con )
...
@@ -55,7 +55,7 @@ void Prs_ManWriteVerilogConcat( FILE * pFile, Prs_Ntk_t * p, int Con )
void
Prs_ManWriteVerilogSignal
(
FILE
*
pFile
,
Prs_Ntk_t
*
p
,
int
Sig
)
void
Prs_ManWriteVerilogSignal
(
FILE
*
pFile
,
Prs_Ntk_t
*
p
,
int
Sig
)
{
{
int
Value
=
Abc_Lit2Var2
(
Sig
);
int
Value
=
Abc_Lit2Var2
(
Sig
);
Prs_ManType_t
Type
=
Abc_Lit2Att2
(
Sig
);
Prs_ManType_t
Type
=
(
Prs_ManType_t
)
Abc_Lit2Att2
(
Sig
);
if
(
Type
==
CBA_PRS_NAME
||
Type
==
CBA_PRS_CONST
)
if
(
Type
==
CBA_PRS_NAME
||
Type
==
CBA_PRS_CONST
)
fprintf
(
pFile
,
"%s"
,
Prs_NtkStr
(
p
,
Value
)
);
fprintf
(
pFile
,
"%s"
,
Prs_NtkStr
(
p
,
Value
)
);
else
if
(
Type
==
CBA_PRS_SLICE
)
else
if
(
Type
==
CBA_PRS_SLICE
)
...
@@ -110,7 +110,7 @@ void Prs_ManWriteVerilogBoxes( FILE * pFile, Prs_Ntk_t * p )
...
@@ -110,7 +110,7 @@ void Prs_ManWriteVerilogBoxes( FILE * pFile, Prs_Ntk_t * p )
Vec_Int_t
*
vBox
;
int
i
;
Vec_Int_t
*
vBox
;
int
i
;
Prs_NtkForEachBox
(
p
,
vBox
,
i
)
Prs_NtkForEachBox
(
p
,
vBox
,
i
)
{
{
in
t
NtkId
=
Prs_BoxNtk
(
p
,
i
);
Cba_ObjType_
t
NtkId
=
Prs_BoxNtk
(
p
,
i
);
if
(
NtkId
==
CBA_BOX_MUX
)
if
(
NtkId
==
CBA_BOX_MUX
)
Prs_ManWriteVerilogMux
(
pFile
,
p
,
vBox
);
Prs_ManWriteVerilogMux
(
pFile
,
p
,
vBox
);
else
if
(
Prs_BoxIsNode
(
p
,
i
)
)
// node ------- check order of fanins
else
if
(
Prs_BoxIsNode
(
p
,
i
)
)
// node ------- check order of fanins
...
...
src/base/pla/plaRead.c
View file @
609be7a1
...
@@ -177,9 +177,9 @@ void Pla_ReadAddBody( Pla_Man_t * p, Vec_Str_t * vLits )
...
@@ -177,9 +177,9 @@ void Pla_ReadAddBody( Pla_Man_t * p, Vec_Str_t * vLits )
Pla_ForEachCubeInOut
(
p
,
pCubeIn
,
pCubeOut
,
i
)
Pla_ForEachCubeInOut
(
p
,
pCubeIn
,
pCubeOut
,
i
)
{
{
Pla_CubeForEachLit
(
p
->
nIns
,
pCubeIn
,
Lit
,
k
)
Pla_CubeForEachLit
(
p
->
nIns
,
pCubeIn
,
Lit
,
k
)
Pla_CubeSetLit
(
pCubeIn
,
k
,
(
in
t
)
Vec_StrEntry
(
vLits
,
Count
++
)
);
Pla_CubeSetLit
(
pCubeIn
,
k
,
(
Pla_Lit_
t
)
Vec_StrEntry
(
vLits
,
Count
++
)
);
Pla_CubeForEachLit
(
p
->
nOuts
,
pCubeOut
,
Lit
,
k
)
Pla_CubeForEachLit
(
p
->
nOuts
,
pCubeOut
,
Lit
,
k
)
Pla_CubeSetLit
(
pCubeOut
,
k
,
(
in
t
)
Vec_StrEntry
(
vLits
,
Count
++
)
);
Pla_CubeSetLit
(
pCubeOut
,
k
,
(
Pla_Lit_
t
)
Vec_StrEntry
(
vLits
,
Count
++
)
);
}
}
assert
(
Count
==
Vec_StrSize
(
vLits
)
);
assert
(
Count
==
Vec_StrSize
(
vLits
)
);
}
}
...
@@ -195,13 +195,13 @@ Pla_Man_t * Pla_ReadPla( char * pFileName )
...
@@ -195,13 +195,13 @@ Pla_Man_t * Pla_ReadPla( char * pFileName )
Pla_ReadPlaRemoveComments
(
pBuffer
,
pLimit
);
Pla_ReadPlaRemoveComments
(
pBuffer
,
pLimit
);
if
(
Pla_ReadPlaHeader
(
pBuffer
,
pLimit
,
&
nIns
,
&
nOuts
,
&
nCubes
,
&
Type
)
)
if
(
Pla_ReadPlaHeader
(
pBuffer
,
pLimit
,
&
nIns
,
&
nOuts
,
&
nCubes
,
&
Type
)
)
{
{
vLits
=
Pla_ReadPlaBody
(
pBuffer
,
pLimit
,
Type
);
vLits
=
Pla_ReadPlaBody
(
pBuffer
,
pLimit
,
(
Pla_File_t
)
Type
);
if
(
Vec_StrSize
(
vLits
)
%
(
nIns
+
nOuts
)
==
0
)
if
(
Vec_StrSize
(
vLits
)
%
(
nIns
+
nOuts
)
==
0
)
{
{
if
(
nCubes
==
-
1
)
if
(
nCubes
==
-
1
)
nCubes
=
Vec_StrSize
(
vLits
)
/
(
nIns
+
nOuts
);
nCubes
=
Vec_StrSize
(
vLits
)
/
(
nIns
+
nOuts
);
p
=
Pla_ManAlloc
(
pFileName
,
nIns
,
nOuts
,
nCubes
);
p
=
Pla_ManAlloc
(
pFileName
,
nIns
,
nOuts
,
nCubes
);
p
->
Type
=
Type
;
p
->
Type
=
(
Pla_File_t
)
Type
;
Pla_ReadAddBody
(
p
,
vLits
);
Pla_ReadAddBody
(
p
,
vLits
);
Vec_StrFree
(
vLits
);
Vec_StrFree
(
vLits
);
ABC_FREE
(
pBuffer
);
ABC_FREE
(
pBuffer
);
...
...
src/base/wlc/wlcReadSmt.c
View file @
609be7a1
...
@@ -91,7 +91,7 @@ static inline char * Smt_GetTypeName( Smt_LineType_t Type )
...
@@ -91,7 +91,7 @@ static inline char * Smt_GetTypeName( Smt_LineType_t Type )
}
}
static
inline
void
Smt_AddTypes
(
Abc_Nam_t
*
p
)
static
inline
void
Smt_AddTypes
(
Abc_Nam_t
*
p
)
{
{
in
t
Type
;
Smt_LineType_
t
Type
;
for
(
Type
=
1
;
Type
<
SMT_PRS_END
;
Type
++
)
for
(
Type
=
1
;
Type
<
SMT_PRS_END
;
Type
++
)
Abc_NamStrFindOrAdd
(
p
,
Smt_GetTypeName
(
Type
),
NULL
);
Abc_NamStrFindOrAdd
(
p
,
Smt_GetTypeName
(
Type
),
NULL
);
assert
(
Abc_NamObjNumMax
(
p
)
==
SMT_PRS_END
);
assert
(
Abc_NamObjNumMax
(
p
)
==
SMT_PRS_END
);
...
...
src/base/wlc/wlcSim.c
View file @
609be7a1
...
@@ -169,7 +169,7 @@ Vec_Ptr_t * Wlc_NtkSimulate( Wlc_Ntk_t * p, Vec_Int_t * vNodes, int nWords, int
...
@@ -169,7 +169,7 @@ Vec_Ptr_t * Wlc_NtkSimulate( Wlc_Ntk_t * p, Vec_Int_t * vNodes, int nWords, int
for
(
k
=
0
;
k
<
nBits
;
k
++
)
for
(
k
=
0
;
k
<
nBits
;
k
++
)
{
{
int
iLit
=
Vec_IntEntry
(
&
p
->
vBits
,
iFirst
+
k
);
int
iLit
=
Vec_IntEntry
(
&
p
->
vBits
,
iFirst
+
k
);
word
*
pInfo
=
Vec_VecEntryEntry
(
(
Vec_Vec_t
*
)
vRes
,
i
,
k
);
word
*
pInfo
=
(
word
*
)
Vec_VecEntryEntry
(
(
Vec_Vec_t
*
)
vRes
,
i
,
k
);
if
(
iLit
==
-
1
)
if
(
iLit
==
-
1
)
{
{
Counter
++
;
Counter
++
;
...
@@ -220,7 +220,7 @@ void Wlc_NtkSimulatePrint( Wlc_Ntk_t * p, Vec_Int_t * vNodes, Vec_Ptr_t * vRes,
...
@@ -220,7 +220,7 @@ void Wlc_NtkSimulatePrint( Wlc_Ntk_t * p, Vec_Int_t * vNodes, Vec_Ptr_t * vRes,
int
nBits
=
Wlc_ObjRange
(
pWlcObj
);
int
nBits
=
Wlc_ObjRange
(
pWlcObj
);
for
(
k
=
nBits
-
1
;
k
>=
0
;
k
--
)
for
(
k
=
nBits
-
1
;
k
>=
0
;
k
--
)
{
{
word
*
pInfo
=
Vec_VecEntryEntry
(
(
Vec_Vec_t
*
)
vRes
,
i
,
k
);
word
*
pInfo
=
(
word
*
)
Vec_VecEntryEntry
(
(
Vec_Vec_t
*
)
vRes
,
i
,
k
);
printf
(
"%d"
,
Abc_InfoHasBit
((
unsigned
*
)
pInfo
,
iPat
)
);
printf
(
"%d"
,
Abc_InfoHasBit
((
unsigned
*
)
pInfo
,
iPat
)
);
}
}
printf
(
" "
);
printf
(
" "
);
...
...
src/map/if/ifTune.c
View file @
609be7a1
...
@@ -709,7 +709,7 @@ int If_ManSatFindCofigBits( void * pSat, Vec_Int_t * vPiVars, Vec_Int_t * vPoVar
...
@@ -709,7 +709,7 @@ int If_ManSatFindCofigBits( void * pSat, Vec_Int_t * vPiVars, Vec_Int_t * vPoVar
Vec_IntClear
(
vValues
);
Vec_IntClear
(
vValues
);
if
(
RetValue
==
0
)
if
(
RetValue
==
0
)
return
0
;
return
0
;
Ifn_ManSatDeriveOne
(
pSat
,
vPiVars
,
vValues
);
Ifn_ManSatDeriveOne
(
(
sat_solver
*
)
pSat
,
vPiVars
,
vValues
);
return
1
;
return
1
;
}
}
int
Ifn_ManSatFindCofigBitsTest
(
Ifn_Ntk_t
*
p
,
word
*
pTruth
,
int
nVars
,
word
Perm
)
int
Ifn_ManSatFindCofigBitsTest
(
Ifn_Ntk_t
*
p
,
word
*
pTruth
,
int
nVars
,
word
Perm
)
...
...
src/misc/extra/extraUtilEnum.c
View file @
609be7a1
...
@@ -259,7 +259,7 @@ void Abc_EnumPrint_rec( Vec_Int_t * vGates, int i, int nVars )
...
@@ -259,7 +259,7 @@ void Abc_EnumPrint_rec( Vec_Int_t * vGates, int i, int nVars )
{
{
int
Fan0
=
Vec_IntEntry
(
vGates
,
2
*
i
);
int
Fan0
=
Vec_IntEntry
(
vGates
,
2
*
i
);
int
Fan1
=
Vec_IntEntry
(
vGates
,
2
*
i
+
1
);
int
Fan1
=
Vec_IntEntry
(
vGates
,
2
*
i
+
1
);
char
*
pOper
=
Fan0
<
Fan1
?
""
:
"+"
;
char
*
pOper
=
(
char
*
)(
Fan0
<
Fan1
?
""
:
"+"
)
;
if
(
Fan0
>
Fan1
)
if
(
Fan0
>
Fan1
)
ABC_SWAP
(
int
,
Fan0
,
Fan1
);
ABC_SWAP
(
int
,
Fan0
,
Fan1
);
if
(
Fan0
<
nVars
)
if
(
Fan0
<
nVars
)
...
...
src/proof/cec/cecSplit.c
View file @
609be7a1
...
@@ -692,7 +692,7 @@ int Cec_GiaSplitTestInt( Gia_Man_t * p, int nProcs, int nTimeOut, int nIterMax,
...
@@ -692,7 +692,7 @@ int Cec_GiaSplitTestInt( Gia_Man_t * p, int nProcs, int nTimeOut, int nIterMax,
continue
;
continue
;
// start a new thread
// start a new thread
assert
(
ThData
[
i
].
p
==
NULL
);
assert
(
ThData
[
i
].
p
==
NULL
);
ThData
[
i
].
p
=
Vec_PtrPop
(
vStack
);
ThData
[
i
].
p
=
(
Gia_Man_t
*
)
Vec_PtrPop
(
vStack
);
ThData
[
i
].
pCnf
=
Cec_GiaDeriveGiaRemapped
(
ThData
[
i
].
p
);
ThData
[
i
].
pCnf
=
Cec_GiaDeriveGiaRemapped
(
ThData
[
i
].
p
);
ThData
[
i
].
fWorking
=
1
;
ThData
[
i
].
fWorking
=
1
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment