diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-08-04 15:34:34 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-08-04 15:34:34 -0700 |
| commit | a3a6002b3d663757dd0ca8112c29e51dced7bcfe (patch) | |
| tree | 55af85db342dcfa739050c82df76133fd07c757b /src/aig/gia | |
| parent | 1d9d6814ee20412a37fcda79a333d9d7e3fee1d4 (diff) | |
| download | abc-a3a6002b3d663757dd0ca8112c29e51dced7bcfe.tar.gz abc-a3a6002b3d663757dd0ca8112c29e51dced7bcfe.tar.bz2 abc-a3a6002b3d663757dd0ca8112c29e51dced7bcfe.zip | |
Compiler warnings.
Diffstat (limited to 'src/aig/gia')
| -rw-r--r-- | src/aig/gia/giaBalance2.c | 11 | ||||
| -rw-r--r-- | src/aig/gia/giaMf.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/aig/gia/giaBalance2.c b/src/aig/gia/giaBalance2.c index 550df2bd..73d2a6fb 100644 --- a/src/aig/gia/giaBalance2.c +++ b/src/aig/gia/giaBalance2.c @@ -34,13 +34,14 @@ ABC_NAMESPACE_IMPL_START #define BAL_CUT_MAX 8 #define BAL_SUPER 50 #define BAL_NO_LEAF 31 +#define BAL_NO_FUNC 134217727 // (1<<27)-1 typedef struct Bal_Cut_t_ Bal_Cut_t; struct Bal_Cut_t_ { word Sign; // signature int Delay; // delay - unsigned iFunc : 27; // function + unsigned iFunc : 27; // function (BAL_NO_FUNC) unsigned nLeaves : 5; // leaf number (Bal_NO_LEAF) int pLeaves[BAL_LEAF_MAX]; // leaves }; @@ -235,7 +236,7 @@ static inline int Bal_CutMergeOrder( Bal_Cut_t * pCut0, Bal_Cut_t * pCut1, Bal_C pC[i] = pC0[i]; } pCut->nLeaves = nLutSize; - pCut->iFunc = -1; + pCut->iFunc = BAL_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; pCut->Delay = Abc_MaxInt( pCut0->Delay, pCut1->Delay ); return 1; @@ -268,7 +269,7 @@ FlushCut0: while ( i < nSize0 ) pC[c++] = pC0[i++]; pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = BAL_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; pCut->Delay = Abc_MaxInt( pCut0->Delay, pCut1->Delay ); return 1; @@ -278,7 +279,7 @@ FlushCut1: while ( k < nSize1 ) pC[c++] = pC1[k++]; pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = BAL_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; pCut->Delay = Abc_MaxInt( pCut0->Delay, pCut1->Delay ); return 1; @@ -303,7 +304,7 @@ static inline int Bal_CutMergeOrderMux( Bal_Cut_t * pCut0, Bal_Cut_t * pCut1, Ba if (x2 == xMin) i2++; } pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = BAL_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign | pCut2->Sign; pCut->Delay = Abc_MaxInt( pCut0->Delay, Abc_MaxInt(pCut1->Delay, pCut2->Delay) ); return 1; diff --git a/src/aig/gia/giaMf.c b/src/aig/gia/giaMf.c index da571904..331612a2 100644 --- a/src/aig/gia/giaMf.c +++ b/src/aig/gia/giaMf.c @@ -35,6 +35,7 @@ ABC_NAMESPACE_IMPL_START #define MF_LOG_PAGE 12 #define MF_NO_LEAF 31 #define MF_TT_WORDS ((MF_LEAF_MAX > 6) ? 1 << (MF_LEAF_MAX-6) : 1) +#define MF_NO_FUNC 134217727 // (1<<27)-1 typedef struct Mf_Cut_t_ Mf_Cut_t; struct Mf_Cut_t_ @@ -42,7 +43,7 @@ struct Mf_Cut_t_ word Sign; // signature int Delay; // delay float Flow; // flow - unsigned iFunc : 27; // function + unsigned iFunc : 27; // function (MF_NO_FUNC) unsigned nLeaves : 5; // leaf number (MF_NO_LEAF) int pLeaves[MF_LEAF_MAX+1]; // leaves }; @@ -785,7 +786,7 @@ static inline int Mf_CutMergeOrder( Mf_Cut_t * pCut0, Mf_Cut_t * pCut1, Mf_Cut_t pC[i] = pC0[i]; } pCut->nLeaves = nLutSize; - pCut->iFunc = -1; + pCut->iFunc = MF_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; return 1; } @@ -819,7 +820,7 @@ FlushCut0: while ( i < nSize0 ) pC[c++] = pC0[i++]; pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = MF_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; return 1; @@ -828,7 +829,7 @@ FlushCut1: while ( k < nSize1 ) pC[c++] = pC1[k++]; pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = MF_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign; return 1; } @@ -852,7 +853,7 @@ static inline int Mf_CutMergeOrderMux( Mf_Cut_t * pCut0, Mf_Cut_t * pCut1, Mf_Cu if (x2 == xMin) i2++; } pCut->nLeaves = c; - pCut->iFunc = -1; + pCut->iFunc = MF_NO_FUNC; pCut->Sign = pCut0->Sign | pCut1->Sign | pCut2->Sign; return 1; } |