diff options
| author | Bruno Schmitt <bruno@oschmitt.com> | 2017-02-06 20:39:53 -0800 |
|---|---|---|
| committer | Bruno Schmitt <bruno@oschmitt.com> | 2017-02-06 20:39:53 -0800 |
| commit | 6ae1f35fae4eb7a8d569f88fe143faad8239c26c (patch) | |
| tree | 97699eae583f889dc9e6aa580bec46d4f6c85176 /src | |
| parent | 0fb4442a8208ccc36067db034c12a840095c0911 (diff) | |
| parent | 495a34e3ce1a0a0ac664748c991be437dd1c7ea7 (diff) | |
| download | abc-6ae1f35fae4eb7a8d569f88fe143faad8239c26c.tar.gz abc-6ae1f35fae4eb7a8d569f88fe143faad8239c26c.tar.bz2 abc-6ae1f35fae4eb7a8d569f88fe143faad8239c26c.zip | |
Merged alanmi/abc into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/opt/dsc/dsc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opt/dsc/dsc.c b/src/opt/dsc/dsc.c index ce180fe3..7ddeeed9 100644 --- a/src/opt/dsc/dsc.c +++ b/src/opt/dsc/dsc.c @@ -51,14 +51,14 @@ struct Dsc_node_t_ /// FUNCTION DEFINITIONS /// //////////////////////////////////////////////////////////////////////// -inline void xorInPlace( word * pOut, word * pIn2, int nWords) +static inline void xorInPlace( word * pOut, word * pIn2, int nWords) { int w; for ( w = 0; w < nWords; w++ ) pOut[w] ^= pIn2[w]; } -void dsc_debug_node(Dsc_node_t * pNode, int nVars, const int TRUTH_WORDS) { +static inline void dsc_debug_node(Dsc_node_t * pNode, int nVars, const int TRUTH_WORDS) { int i; printf("Node:\t%s\n",pNode->exp); printf("\tneg cof:\t");Abc_TtPrintHexRev(stdout, pNode->pNegCof, nVars); @@ -75,7 +75,7 @@ void dsc_debug_node(Dsc_node_t * pNode, int nVars, const int TRUTH_WORDS) { printf("\n"); } -inline int dsc_and_test(Dsc_node_t *ni, Dsc_node_t *nj, const int TRUTH_WORDS, int* ci, int* cj) { +static inline int dsc_and_test(Dsc_node_t *ni, Dsc_node_t *nj, const int TRUTH_WORDS, int* ci, int* cj) { if (Abc_TtEqual(ni->pNegCof, nj->pNegCof, TRUTH_WORDS)) {*ci=1; *cj=1; return 1;} else if (Abc_TtEqual(ni->pNegCof, nj->pPosCof, TRUTH_WORDS)) {*ci=1; *cj=0; return 1;} else if (Abc_TtEqual(ni->pPosCof, nj->pNegCof, TRUTH_WORDS)) {*ci=0; *cj=1; return 1;} @@ -83,11 +83,11 @@ inline int dsc_and_test(Dsc_node_t *ni, Dsc_node_t *nj, const int TRUTH_WORDS, i return 0; } -inline int dsc_xor_test(Dsc_node_t *ni, Dsc_node_t *nj, const int TRUTH_WORDS) { +static inline int dsc_xor_test(Dsc_node_t *ni, Dsc_node_t *nj, const int TRUTH_WORDS) { return Abc_TtEqual(ni->pBoolDiff, nj->pBoolDiff, TRUTH_WORDS); } -void concat(char* target, char begin, char end, char* s1, int s1Polarity, char* s2, int s2Polarity) { +static inline void concat(char* target, char begin, char end, char* s1, int s1Polarity, char* s2, int s2Polarity) { *target++ = begin; //s1 if (!s1Polarity) @@ -104,7 +104,7 @@ void concat(char* target, char begin, char end, char* s1, int s1Polarity, char* *target = '\0'; } -void cubeCofactor(word * const pTruth, const unsigned int * const cubeCof, const int TRUTH_WORDS) { +static inline void cubeCofactor(word * const pTruth, const unsigned int * const cubeCof, const int TRUTH_WORDS) { int size = cubeCof[0]; int i; for (i = 1; i <= size; i++) { @@ -117,7 +117,7 @@ void cubeCofactor(word * const pTruth, const unsigned int * const cubeCof, const } } -void merge(unsigned int * const pOut, const unsigned int * const pIn) { +static inline void merge(unsigned int * const pOut, const unsigned int * const pIn) { const int elementsToCopy = pIn[0]; int i, j; for (i = pOut[0]+1, j = 1; j <= elementsToCopy; i++, j++) { |