diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-01-30 16:15:53 +0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-01-30 16:15:53 +0700 |
| commit | 7e598cd23144ea2997a272384fb5d1788bd4b0fd (patch) | |
| tree | 624b748428bd929aac84c8780890a380883f1567 /src/map/mio | |
| parent | aaacf57304b74b37617fcd669f1c1314afebc913 (diff) | |
| download | abc-7e598cd23144ea2997a272384fb5d1788bd4b0fd.tar.gz abc-7e598cd23144ea2997a272384fb5d1788bd4b0fd.tar.bz2 abc-7e598cd23144ea2997a272384fb5d1788bd4b0fd.zip | |
Fixing compilation problems on Linux-32 related to constants of type unsigned long long.
Diffstat (limited to 'src/map/mio')
| -rw-r--r-- | src/map/mio/exp.h | 12 | ||||
| -rw-r--r-- | src/map/mio/mioRead.c | 4 | ||||
| -rw-r--r-- | src/map/mio/mioUtils.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/map/mio/exp.h b/src/map/mio/exp.h index a76f33cb..766ed38a 100644 --- a/src/map/mio/exp.h +++ b/src/map/mio/exp.h @@ -183,12 +183,12 @@ static inline word Exp_Truth6Lit( int nVars, int Lit, word * puFanins, word * pu static inline word Exp_Truth6( int nVars, Vec_Int_t * p, word * puFanins ) { static word Truth6[6] = { - 0xAAAAAAAAAAAAAAAA, - 0xCCCCCCCCCCCCCCCC, - 0xF0F0F0F0F0F0F0F0, - 0xFF00FF00FF00FF00, - 0xFFFF0000FFFF0000, - 0xFFFFFFFF00000000 + ABC_CONST(0xAAAAAAAAAAAAAAAA), + ABC_CONST(0xCCCCCCCCCCCCCCCC), + ABC_CONST(0xF0F0F0F0F0F0F0F0), + ABC_CONST(0xFF00FF00FF00FF00), + ABC_CONST(0xFFFF0000FFFF0000), + ABC_CONST(0xFFFFFFFF00000000) }; word * puNodes, Res; int i; diff --git a/src/map/mio/mioRead.c b/src/map/mio/mioRead.c index ca913380..860ce39c 100644 --- a/src/map/mio/mioRead.c +++ b/src/map/mio/mioRead.c @@ -605,8 +605,8 @@ void Mio_LibraryDetectSpecialGates( Mio_Library_t * pLib ) Mio_LibrarySortGates( pLib ); - uFuncBuf = 0xAAAAAAAAAAAAAAAA; - uFuncAnd2 = 0xAAAAAAAAAAAAAAAA & 0xCCCCCCCCCCCCCCCC; + uFuncBuf = ABC_CONST(0xAAAAAAAAAAAAAAAA); + uFuncAnd2 = ABC_CONST(0xAAAAAAAAAAAAAAAA) & ABC_CONST(0xCCCCCCCCCCCCCCCC); uFuncInv = ~uFuncBuf; uFuncNand2 = ~uFuncAnd2; diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c index a67153a5..9ddda24e 100644 --- a/src/map/mio/mioUtils.c +++ b/src/map/mio/mioUtils.c @@ -315,9 +315,9 @@ Mio_Gate_t ** Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay, continue; if ( pGate->uTruth == 0 || pGate->uTruth == ~0 ) continue; - if ( pGate->uTruth == 0xAAAAAAAAAAAAAAAA ) + if ( pGate->uTruth == ABC_CONST(0xAAAAAAAAAAAAAAAA) ) continue; - if ( pGate->uTruth == ~0xAAAAAAAAAAAAAAAA && fSkipInv ) + if ( pGate->uTruth == ~ABC_CONST(0xAAAAAAAAAAAAAAAA) && fSkipInv ) continue; if ( pGate->pTwin ) // skip multi-output gates for now continue; |