diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-09-12 13:53:04 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-09-12 13:53:04 -0700 |
| commit | 501c3f0b1ef7af8685b798f0f96a2711718d2167 (patch) | |
| tree | 4dd2ef2b8f1750814fb1fa57b7c94331231487d6 | |
| parent | 39c68e72e4b5f557ba2cbcb372ac28411cfc086d (diff) | |
| download | abc-501c3f0b1ef7af8685b798f0f96a2711718d2167.tar.gz abc-501c3f0b1ef7af8685b798f0f96a2711718d2167.tar.bz2 abc-501c3f0b1ef7af8685b798f0f96a2711718d2167.zip | |
Compiler warnings.
| -rw-r--r-- | src/base/wlc/wlc.h | 46 | ||||
| -rw-r--r-- | src/base/wlc/wlcBlast.c | 2 | ||||
| -rw-r--r-- | src/base/wlc/wlcNtk.c | 44 | ||||
| -rw-r--r-- | src/base/wlc/wlcWriteVer.c | 2 |
4 files changed, 47 insertions, 47 deletions
diff --git a/src/base/wlc/wlc.h b/src/base/wlc/wlc.h index c400a03c..37534f7b 100644 --- a/src/base/wlc/wlc.h +++ b/src/base/wlc/wlc.h @@ -81,51 +81,7 @@ typedef enum { WLC_OBJ_ARI_MODULUS, // 37: arithmetic modulus WLC_OBJ_ARI_POWER, // 38: arithmetic power WLC_OBJ_NUMBER // 39: unused -} Abc_ObjType_t; - -// object types -static char * Wlc_Names[WLC_OBJ_NUMBER+1] = { - NULL, // 00: unknown - "pi", // 01: primary input - "po", // 02: primary output - "bo", // 03: box output - "bi", // 04: box input - "ff", // 05: flop - "const", // 06: constant - "buf", // 07: buffer - "mux", // 08: multiplexer - ">>", // 09: shift right - ">>>", // 10: shift right (arithmetic) - "<<", // 11: shift left - "<<<", // 12: shift left (arithmetic) - "~", // 13: bitwise NOT - "&", // 14: bitwise AND - "|", // 15: bitwise OR - "^", // 16: bitwise XOR - "[:]", // 17: bit selection - "{,}", // 18: bit concatenation - "BitPad", // 19: zero padding - "SgnExt", // 20: sign extension - "!", // 21: logic NOT - "&&", // 22: logic AND - "||", // 23: logic OR - "==", // 24: compare equal - "!=", // 25: compare not equal - "<", // 26: compare less - ">", // 27: compare more - "<=", // 28: compare less or equal - ">=", // 29: compare more or equal - "&", // 30: reduction AND - "|", // 31: reduction OR - "^", // 32: reduction XOR - "+", // 33: arithmetic addition - "-", // 34: arithmetic subtraction - "*", // 35: arithmetic multiplier - "//", // 36: arithmetic division - "%%", // 37: arithmetic modulus - "**", // 38: arithmetic power - NULL // 39: unused -}; +} Wlc_ObjType_t; //////////////////////////////////////////////////////////////////////// diff --git a/src/base/wlc/wlcBlast.c b/src/base/wlc/wlcBlast.c index 1e536014..54200956 100644 --- a/src/base/wlc/wlcBlast.c +++ b/src/base/wlc/wlcBlast.c @@ -122,7 +122,7 @@ Gia_Man_t * Wlc_NtkBitBlast( Wlc_Ntk_t * p ) // create primary inputs Wlc_NtkForEachObj( p, pObj, i ) { - char * pName = Wlc_ObjName(p, i); +// char * pName = Wlc_ObjName(p, i); nRange = Wlc_ObjRange( pObj ); nRange0 = Wlc_ObjFaninNum(pObj) > 0 ? Wlc_ObjRange( Wlc_ObjFanin0(p, pObj) ) : -1; nRange1 = Wlc_ObjFaninNum(pObj) > 1 ? Wlc_ObjRange( Wlc_ObjFanin1(p, pObj) ) : -1; diff --git a/src/base/wlc/wlcNtk.c b/src/base/wlc/wlcNtk.c index 026f6b21..ac8f2e48 100644 --- a/src/base/wlc/wlcNtk.c +++ b/src/base/wlc/wlcNtk.c @@ -27,6 +27,50 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// +// object types +static char * Wlc_Names[WLC_OBJ_NUMBER+1] = { + NULL, // 00: unknown + "pi", // 01: primary input + "po", // 02: primary output + "bo", // 03: box output + "bi", // 04: box input + "ff", // 05: flop + "const", // 06: constant + "buf", // 07: buffer + "mux", // 08: multiplexer + ">>", // 09: shift right + ">>>", // 10: shift right (arithmetic) + "<<", // 11: shift left + "<<<", // 12: shift left (arithmetic) + "~", // 13: bitwise NOT + "&", // 14: bitwise AND + "|", // 15: bitwise OR + "^", // 16: bitwise XOR + "[:]", // 17: bit selection + "{,}", // 18: bit concatenation + "BitPad", // 19: zero padding + "SgnExt", // 20: sign extension + "!", // 21: logic NOT + "&&", // 22: logic AND + "||", // 23: logic OR + "==", // 24: compare equal + "!=", // 25: compare not equal + "<", // 26: compare less + ">", // 27: compare more + "<=", // 28: compare less or equal + ">=", // 29: compare more or equal + "&", // 30: reduction AND + "|", // 31: reduction OR + "^", // 32: reduction XOR + "+", // 33: arithmetic addition + "-", // 34: arithmetic subtraction + "*", // 35: arithmetic multiplier + "//", // 36: arithmetic division + "%%", // 37: arithmetic modulus + "**", // 38: arithmetic power + NULL // 39: unused +}; + //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// //////////////////////////////////////////////////////////////////////// diff --git a/src/base/wlc/wlcWriteVer.c b/src/base/wlc/wlcWriteVer.c index 57d2654a..f7a218e1 100644 --- a/src/base/wlc/wlcWriteVer.c +++ b/src/base/wlc/wlcWriteVer.c @@ -168,7 +168,7 @@ void Wlc_WriteVerInt( FILE * pFile, Wlc_Ntk_t * p ) else if ( pObj->Type == WLC_OBJ_ARI_DIVIDE ) fprintf( pFile, "//" ); else if ( pObj->Type == WLC_OBJ_ARI_MODULUS ) - fprintf( pFile, "%" ); + fprintf( pFile, "%%" ); else if ( pObj->Type == WLC_OBJ_ARI_POWER ) fprintf( pFile, "**" ); else assert( 0 ); |