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
66eb3cf4
Commit
66eb3cf4
authored
Mar 09, 2012
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silencing remaining gcc warnings.
parent
8388f065
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
src/misc/util/utilBridge.c
+2
-2
src/proof/live/liveness.c
+9
-9
src/proof/live/liveness_sim.c
+4
-4
No files found.
src/misc/util/utilBridge.c
View file @
66eb3cf4
...
@@ -202,7 +202,7 @@ void Gia_ManFromBridgeUnknown( FILE * pFile )
...
@@ -202,7 +202,7 @@ void Gia_ManFromBridgeUnknown( FILE * pFile )
}
}
void
Gia_ManFromBridgeCex
(
FILE
*
pFile
,
Abc_Cex_t
*
pCex
)
void
Gia_ManFromBridgeCex
(
FILE
*
pFile
,
Abc_Cex_t
*
pCex
)
{
{
int
i
,
f
,
iBit
,
RetValue
;
int
i
,
f
,
iBit
;
//
, RetValue;
Vec_Str_t
*
vStr
=
Vec_StrAlloc
(
1000
);
Vec_Str_t
*
vStr
=
Vec_StrAlloc
(
1000
);
Vec_StrPush
(
vStr
,
(
char
)
BRIDGE_VALUE_0
);
// false
Vec_StrPush
(
vStr
,
(
char
)
BRIDGE_VALUE_0
);
// false
Vec_StrPush
(
vStr
,
(
char
)
1
);
// size of vector (Armin's encoding)
Vec_StrPush
(
vStr
,
(
char
)
1
);
// size of vector (Armin's encoding)
...
@@ -381,7 +381,7 @@ int Gia_ManFromBridgeReadPackage( FILE * pFile, int * pType, int * pSize, unsign
...
@@ -381,7 +381,7 @@ int Gia_ManFromBridgeReadPackage( FILE * pFile, int * pType, int * pSize, unsign
*
pType
=
atoi
(
Temp
);
*
pType
=
atoi
(
Temp
);
*
pSize
=
atoi
(
Temp
+
7
);
*
pSize
=
atoi
(
Temp
+
7
);
*
ppBuffer
=
ABC_ALLOC
(
char
,
*
pSize
);
*
ppBuffer
=
ABC_ALLOC
(
unsigned
char
,
*
pSize
);
RetValue
=
fread
(
*
ppBuffer
,
*
pSize
,
1
,
pFile
);
RetValue
=
fread
(
*
ppBuffer
,
*
pSize
,
1
,
pFile
);
if
(
RetValue
!=
1
&&
*
pSize
!=
0
)
if
(
RetValue
!=
1
&&
*
pSize
!=
0
)
{
{
...
...
src/proof/live/liveness.c
View file @
66eb3cf4
...
@@ -221,7 +221,7 @@ Vec_Ptr_t *vecLos, *vecLoNames;
...
@@ -221,7 +221,7 @@ Vec_Ptr_t *vecLos, *vecLoNames;
int
Aig_ManPiCleanupBiere
(
Aig_Man_t
*
p
)
int
Aig_ManPiCleanupBiere
(
Aig_Man_t
*
p
)
{
{
int
k
=
0
,
nPisOld
=
Aig_ManPiNum
(
p
);
int
nPisOld
=
Aig_ManPiNum
(
p
);
p
->
nObjs
[
AIG_OBJ_PI
]
=
Vec_PtrSize
(
p
->
vPis
);
p
->
nObjs
[
AIG_OBJ_PI
]
=
Vec_PtrSize
(
p
->
vPis
);
if
(
Aig_ManRegNum
(
p
)
)
if
(
Aig_ManRegNum
(
p
)
)
...
@@ -233,7 +233,7 @@ int Aig_ManPiCleanupBiere( Aig_Man_t * p )
...
@@ -233,7 +233,7 @@ int Aig_ManPiCleanupBiere( Aig_Man_t * p )
int
Aig_ManPoCleanupBiere
(
Aig_Man_t
*
p
)
int
Aig_ManPoCleanupBiere
(
Aig_Man_t
*
p
)
{
{
int
k
=
0
,
nPosOld
=
Aig_ManPoNum
(
p
);
int
nPosOld
=
Aig_ManPoNum
(
p
);
p
->
nObjs
[
AIG_OBJ_PO
]
=
Vec_PtrSize
(
p
->
vPos
);
p
->
nObjs
[
AIG_OBJ_PO
]
=
Vec_PtrSize
(
p
->
vPos
);
if
(
Aig_ManRegNum
(
p
)
)
if
(
Aig_ManRegNum
(
p
)
)
...
@@ -257,7 +257,7 @@ Aig_Man_t * LivenessToSafetyTransformation( int mode, Abc_Ntk_t * pNtk, Aig_Man_
...
@@ -257,7 +257,7 @@ Aig_Man_t * LivenessToSafetyTransformation( int mode, Abc_Ntk_t * pNtk, Aig_Man_
Aig_Obj_t
*
pObjOriginalSafetyPropertyOutput
;
Aig_Obj_t
*
pObjOriginalSafetyPropertyOutput
;
Aig_Obj_t
*
pDriverImage
,
*
pArgument
,
*
collectiveAssertSafety
,
*
collectiveAssumeSafety
;
Aig_Obj_t
*
pDriverImage
,
*
pArgument
,
*
collectiveAssertSafety
,
*
collectiveAssumeSafety
;
char
*
nodeName
;
char
*
nodeName
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
piVecIndex
=
0
,
liveLatch
=
0
,
fairLatch
=
0
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
liveLatch
=
0
,
fairLatch
=
0
;
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
...
@@ -545,9 +545,9 @@ Aig_Man_t * LivenessToSafetyTransformationAbs( int mode, Abc_Ntk_t * pNtk, Aig_M
...
@@ -545,9 +545,9 @@ Aig_Man_t * LivenessToSafetyTransformationAbs( int mode, Abc_Ntk_t * pNtk, Aig_M
Aig_Man_t
*
pNew
;
Aig_Man_t
*
pNew
;
int
i
,
nRegCount
,
iEntry
;
int
i
,
nRegCount
,
iEntry
;
Aig_Obj_t
*
pObjSavePi
;
Aig_Obj_t
*
pObjSavePi
;
Aig_Obj_t
*
pObjSavedL
o
,
*
pObjSavedLi
;
Aig_Obj_t
*
pObjSavedL
i
,
*
pObjSavedLo
;
Aig_Obj_t
*
pObj
,
*
pMatch
;
Aig_Obj_t
*
pObj
,
*
pMatch
;
Aig_Obj_t
*
pObjSave
OrSaved
,
*
pObjSaveAndNotSaved
,
*
pObjSavedLoAndEquality
;
Aig_Obj_t
*
pObjSave
dLoAndEquality
,
*
pObjSaveOrSaved
,
*
pObjSaveAndNotSaved
;
Aig_Obj_t
*
pObjShadowLo
,
*
pObjShadowLi
,
*
pObjShadowLiDriver
;
Aig_Obj_t
*
pObjShadowLo
,
*
pObjShadowLi
,
*
pObjShadowLiDriver
;
Aig_Obj_t
*
pObjXor
,
*
pObjXnor
,
*
pObjAndAcc
;
Aig_Obj_t
*
pObjXor
,
*
pObjXnor
,
*
pObjAndAcc
;
Aig_Obj_t
*
pObjLive
,
*
pObjFair
,
*
pObjSafetyGate
;
Aig_Obj_t
*
pObjLive
,
*
pObjFair
,
*
pObjSafetyGate
;
...
@@ -857,7 +857,7 @@ Aig_Man_t * LivenessToSafetyTransformationOneStepLoop( int mode, Abc_Ntk_t * pNt
...
@@ -857,7 +857,7 @@ Aig_Man_t * LivenessToSafetyTransformationOneStepLoop( int mode, Abc_Ntk_t * pNt
Aig_Obj_t
*
collectiveAssertSafety
,
*
collectiveAssumeSafety
;
Aig_Obj_t
*
collectiveAssertSafety
,
*
collectiveAssumeSafety
;
char
*
nodeName
;
char
*
nodeName
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
piVecIndex
=
0
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
;
//
, liCreated = 0, loCreated = 0, piVecIndex = 0;
if
(
Aig_ManRegNum
(
p
)
==
0
)
if
(
Aig_ManRegNum
(
p
)
==
0
)
{
{
...
@@ -1814,7 +1814,7 @@ Aig_Man_t * LivenessToSafetyTransformationWithLTL( int mode, Abc_Ntk_t * pNtk, A
...
@@ -1814,7 +1814,7 @@ Aig_Man_t * LivenessToSafetyTransformationWithLTL( int mode, Abc_Ntk_t * pNtk, A
Aig_Obj_t
*
pNegatedSafetyConjunction
=
NULL
;
Aig_Obj_t
*
pNegatedSafetyConjunction
=
NULL
;
Aig_Obj_t
*
pObjSafetyAndLiveToSafety
;
Aig_Obj_t
*
pObjSafetyAndLiveToSafety
;
char
*
nodeName
,
*
pFormula
;
char
*
nodeName
,
*
pFormula
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
piVecIndex
=
0
,
liveLatch
=
0
,
fairLatch
=
0
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
liveLatch
=
0
;
//, piVecIndex
= 0, fairLatch = 0;
Vec_Ptr_t
*
vSignal
,
*
vTopASTNodeArray
;
Vec_Ptr_t
*
vSignal
,
*
vTopASTNodeArray
;
ltlNode
*
pEnrtyGLOBALLY
;
ltlNode
*
pEnrtyGLOBALLY
;
ltlNode
*
topNodeOfAST
,
*
tempTopASTNode
;
ltlNode
*
topNodeOfAST
,
*
tempTopASTNode
;
...
@@ -2273,8 +2273,8 @@ int Abc_CommandAbcLivenessToSafetyWithLTL( Abc_Frame_t * pAbc, int argc, char **
...
@@ -2273,8 +2273,8 @@ int Abc_CommandAbcLivenessToSafetyWithLTL( Abc_Frame_t * pAbc, int argc, char **
int
c
;
int
c
;
Vec_Ptr_t
*
vLive
,
*
vFair
,
*
vAssertSafety
,
*
vAssumeSafety
;
Vec_Ptr_t
*
vLive
,
*
vFair
,
*
vAssertSafety
,
*
vAssumeSafety
;
int
directive
=
-
1
;
int
directive
=
-
1
;
char
*
ltfFormulaString
=
NULL
;
//
char *ltfFormulaString = NULL;
int
LTL_FLAG
=
0
,
numOfLtlPropOutput
;
int
numOfLtlPropOutput
;
//, LTL_FLAG = 0
;
Vec_Ptr_t
*
ltlBuffer
;
Vec_Ptr_t
*
ltlBuffer
;
pNtk
=
Abc_FrameReadNtk
(
pAbc
);
pNtk
=
Abc_FrameReadNtk
(
pAbc
);
...
...
src/proof/live/liveness_sim.c
View file @
66eb3cf4
...
@@ -174,7 +174,7 @@ extern Vec_Ptr_t *vecLos, *vecLoNames;
...
@@ -174,7 +174,7 @@ extern Vec_Ptr_t *vecLos, *vecLoNames;
static
int
Aig_ManPiCleanupBiere
(
Aig_Man_t
*
p
)
static
int
Aig_ManPiCleanupBiere
(
Aig_Man_t
*
p
)
{
{
int
k
=
0
,
nPisOld
=
Aig_ManPiNum
(
p
);
int
nPisOld
=
Aig_ManPiNum
(
p
);
p
->
nObjs
[
AIG_OBJ_PI
]
=
Vec_PtrSize
(
p
->
vPis
);
p
->
nObjs
[
AIG_OBJ_PI
]
=
Vec_PtrSize
(
p
->
vPis
);
if
(
Aig_ManRegNum
(
p
)
)
if
(
Aig_ManRegNum
(
p
)
)
...
@@ -186,7 +186,7 @@ static int Aig_ManPiCleanupBiere( Aig_Man_t * p )
...
@@ -186,7 +186,7 @@ static int Aig_ManPiCleanupBiere( Aig_Man_t * p )
static
int
Aig_ManPoCleanupBiere
(
Aig_Man_t
*
p
)
static
int
Aig_ManPoCleanupBiere
(
Aig_Man_t
*
p
)
{
{
int
k
=
0
,
nPosOld
=
Aig_ManPoNum
(
p
);
int
nPosOld
=
Aig_ManPoNum
(
p
);
p
->
nObjs
[
AIG_OBJ_PO
]
=
Vec_PtrSize
(
p
->
vPos
);
p
->
nObjs
[
AIG_OBJ_PO
]
=
Vec_PtrSize
(
p
->
vPos
);
if
(
Aig_ManRegNum
(
p
)
)
if
(
Aig_ManRegNum
(
p
)
)
...
@@ -208,7 +208,7 @@ static Aig_Man_t * LivenessToSafetyTransformationSim( Abc_Ntk_t * pNtk, Aig_Man_
...
@@ -208,7 +208,7 @@ static Aig_Man_t * LivenessToSafetyTransformationSim( Abc_Ntk_t * pNtk, Aig_Man_
Aig_Obj_t
*
pObjSafetyPropertyOutput
;
Aig_Obj_t
*
pObjSafetyPropertyOutput
;
Aig_Obj_t
*
pDriverImage
;
Aig_Obj_t
*
pDriverImage
;
char
*
nodeName
;
char
*
nodeName
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
piVecIndex
=
0
,
liveLatch
=
0
,
fairLatch
=
0
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
liveLatch
=
0
,
fairLatch
=
0
;
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
...
@@ -491,7 +491,7 @@ static Aig_Man_t * LivenessToSafetyTransformationOneStepLoopSim( Abc_Ntk_t * pNt
...
@@ -491,7 +491,7 @@ static Aig_Man_t * LivenessToSafetyTransformationOneStepLoopSim( Abc_Ntk_t * pNt
char
*
nodeName
;
char
*
nodeName
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
,
liCreated
=
0
,
loCreated
=
0
,
piVecIndex
=
0
;
int
piCopied
=
0
,
liCopied
=
0
,
loCopied
=
0
;
//
, liCreated = 0, loCreated = 0, piVecIndex = 0;
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPis
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
1
);
vecPiNames
=
Vec_PtrAlloc
(
Saig_ManPiNum
(
p
)
+
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