summaryrefslogtreecommitdiffstats
path: root/src/bdd/reo
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2010-11-01 01:35:04 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2010-11-01 01:35:04 -0700
commit6130e39b18b5f53902e4eab14f6d5cdde5219563 (patch)
tree0db0628479a1b750e9af1f66cb8379ebd0913d31 /src/bdd/reo
parentf0e77f6797c0504b0da25a56152b707d3357f386 (diff)
downloadabc-6130e39b18b5f53902e4eab14f6d5cdde5219563.tar.gz
abc-6130e39b18b5f53902e4eab14f6d5cdde5219563.tar.bz2
abc-6130e39b18b5f53902e4eab14f6d5cdde5219563.zip
initial commit of public abc
Diffstat (limited to 'src/bdd/reo')
-rw-r--r--src/bdd/reo/reo.h16
-rw-r--r--src/bdd/reo/reoApi.c5
-rw-r--r--src/bdd/reo/reoCore.c7
-rw-r--r--src/bdd/reo/reoProfile.c5
-rw-r--r--src/bdd/reo/reoShuffle.c5
-rw-r--r--src/bdd/reo/reoSift.c5
-rw-r--r--src/bdd/reo/reoSwap.c9
-rw-r--r--src/bdd/reo/reoTest.c5
-rw-r--r--src/bdd/reo/reoTransfer.c7
-rw-r--r--src/bdd/reo/reoUnits.c11
10 files changed, 62 insertions, 13 deletions
diff --git a/src/bdd/reo/reo.h b/src/bdd/reo/reo.h
index 2f9c421e..9d82329c 100644
--- a/src/bdd/reo/reo.h
+++ b/src/bdd/reo/reo.h
@@ -19,6 +19,7 @@
#ifndef __REO_H__
#define __REO_H__
+
#include <stdio.h>
#include <stdlib.h>
#include "extra.h"
@@ -27,9 +28,10 @@
/// MACRO DEFINITIONS ///
////////////////////////////////////////////////////////////////////////
-#ifdef __cplusplus
-extern "C" {
-#endif
+
+
+ABC_NAMESPACE_HEADER_START
+
// reordering parameters
#define REO_REORDER_LIMIT 1.15 // determines the quality/runtime trade-off
@@ -219,9 +221,11 @@ extern DdNode * Extra_ReorderCudd( DdManager * dd, DdNode * aFunc, int pPermut
extern int Extra_bddReorderTest( DdManager * dd, DdNode * bF );
extern int Extra_addReorderTest( DdManager * dd, DdNode * aF );
-#ifdef __cplusplus
-}
-#endif
+
+
+ABC_NAMESPACE_HEADER_END
+
+
#endif
diff --git a/src/bdd/reo/reoApi.c b/src/bdd/reo/reoApi.c
index 000489ed..d6c7430e 100644
--- a/src/bdd/reo/reoApi.c
+++ b/src/bdd/reo/reoApi.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -287,3 +290,5 @@ void Extra_ReorderArray( reo_man * p, DdManager * dd, DdNode * Funcs[], DdNode *
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoCore.c b/src/bdd/reo/reoCore.c
index a37bae13..d0535ff9 100644
--- a/src/bdd/reo/reoCore.c
+++ b/src/bdd/reo/reoCore.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -315,7 +318,7 @@ void reoResizeStructures( reo_man * p, int nDdVarsMax, int nNodesMax, int nFuncs
}
else if ( p->nNodesMaxAlloc < nNodesMax )
{
- void * pTemp;
+ reo_unit ** pTemp;
int nMemChunksAllocPrev = p->nMemChunksAlloc;
p->nNodesMaxAlloc = nNodesMax;
@@ -434,3 +437,5 @@ int reoCheckLevels( reo_man * p )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoProfile.c b/src/bdd/reo/reoProfile.c
index 8a48d809..68d4b3cc 100644
--- a/src/bdd/reo/reoProfile.c
+++ b/src/bdd/reo/reoProfile.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -363,3 +366,5 @@ void reoProfileWidthVerifyLevel( reo_plane * pPlane, int Level )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoShuffle.c b/src/bdd/reo/reoShuffle.c
index 8dab67a4..8d43cb3b 100644
--- a/src/bdd/reo/reoShuffle.c
+++ b/src/bdd/reo/reoShuffle.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -222,3 +225,5 @@ clk = clock();
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoSift.c b/src/bdd/reo/reoSift.c
index 93d82f08..b30a8f60 100644
--- a/src/bdd/reo/reoSift.c
+++ b/src/bdd/reo/reoSift.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -339,3 +342,5 @@ void reoReorderSift( reo_man * p )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoSwap.c b/src/bdd/reo/reoSwap.c
index 0e829407..a78fc88d 100644
--- a/src/bdd/reo/reoSwap.c
+++ b/src/bdd/reo/reoSwap.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -233,7 +236,7 @@ double reoReorderSwapAdjacentVars( reo_man * p, int lev0, int fMovingUp )
// (2) walk through the uppoer level, and tranform all the remaning nodes
// while employing cache for the new lower level
// (3) walk through the old lower level, find those nodes whose ref counters are not zero,
- // and move them to the new uppoer level, ABC_FREE other nodes
+ // and move them to the new uppoer level, free other nodes
// (1) walk through the upper level, find units without cofactors in the lower level
// and move them to the new lower level (while adding to the cache)
@@ -759,7 +762,7 @@ double reoReorderSwapAdjacentVars( reo_man * p, int lev0, int fMovingUp )
}
// (3) walk through the old lower level, find those nodes whose ref counters are not zero,
- // and move them to the new uppoer level, ABC_FREE other nodes
+ // and move them to the new uppoer level, free other nodes
for ( pLoop = pListOld1; pLoop; )
{
pUnit = pLoop;
@@ -898,3 +901,5 @@ finish:
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoTest.c b/src/bdd/reo/reoTest.c
index f0e70cf9..f59da1a7 100644
--- a/src/bdd/reo/reoTest.c
+++ b/src/bdd/reo/reoTest.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -249,3 +252,5 @@ int Extra_addReorderTest( DdManager * dd, DdNode * aF )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoTransfer.c b/src/bdd/reo/reoTransfer.c
index ec02ac0c..7fd64d75 100644
--- a/src/bdd/reo/reoTransfer.c
+++ b/src/bdd/reo/reoTransfer.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -89,7 +92,7 @@ reo_unit * reoTransferNodesToUnits_rec( reo_man * p, DdNode * F )
// add to the hash table
if ( F->ref != 1 )
{
- // the next ABC_FREE entry is already found - it is pointed to by HKey
+ // the next free entry is already found - it is pointed to by HKey
// while we traversed the diagram, the hash entry to which HKey points,
// might have been used. Make sure that its signature is different.
for ( ; p->HTable[HKey].Sign == p->Signature; HKey = (HKey+1) % p->nTableSize );
@@ -199,3 +202,5 @@ DdNode * reoTransferUnitsToNodes_rec( reo_man * p, reo_unit * pUnit )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/bdd/reo/reoUnits.c b/src/bdd/reo/reoUnits.c
index f8bca7ad..70be8b82 100644
--- a/src/bdd/reo/reoUnits.c
+++ b/src/bdd/reo/reoUnits.c
@@ -18,6 +18,9 @@
#include "reo.h"
+ABC_NAMESPACE_IMPL_START
+
+
////////////////////////////////////////////////////////////////////////
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
@@ -30,7 +33,7 @@ static void reoUnitsAddToFreeUnitList( reo_man * p );
/**Function*************************************************************
- Synopsis [Extract the next unit from the ABC_FREE unit list.]
+ Synopsis [Extract the next unit from the free unit list.]
Description []
@@ -54,7 +57,7 @@ reo_unit * reoUnitsGetNextUnit(reo_man * p )
/**Function*************************************************************
- Synopsis [Returns the unit to the ABC_FREE unit list.]
+ Synopsis [Returns the unit to the free unit list.]
Description []
@@ -72,7 +75,7 @@ void reoUnitsRecycleUnit( reo_man * p, reo_unit * pUnit )
/**Function*************************************************************
- Synopsis [Returns the list of units to the ABC_FREE unit list.]
+ Synopsis [Returns the list of units to the free unit list.]
Description []
@@ -182,3 +185,5 @@ void reoUnitsAddToFreeUnitList( reo_man * p )
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
+ABC_NAMESPACE_IMPL_END
+