summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2017-03-17 16:23:44 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2017-03-17 16:23:44 -0700
commit1ccf3218f05c1cc7b4a69fd41103674e45fdcba4 (patch)
tree1e66b898f6e5d6660aadae99344a7f5728ea954a
parent60aa7baa47dbdb5258f57402732f9c7d346656df (diff)
downloadabc-1ccf3218f05c1cc7b4a69fd41103674e45fdcba4.tar.gz
abc-1ccf3218f05c1cc7b4a69fd41103674e45fdcba4.tar.bz2
abc-1ccf3218f05c1cc7b4a69fd41103674e45fdcba4.zip
Synthesis for mesh of LUTs.
-rw-r--r--src/sat/bmc/bmcMesh.c10
-rw-r--r--src/sat/bmc/bmcMesh2.c8
2 files changed, 9 insertions, 9 deletions
diff --git a/src/sat/bmc/bmcMesh.c b/src/sat/bmc/bmcMesh.c
index ff443711..6d85a6a1 100644
--- a/src/sat/bmc/bmcMesh.c
+++ b/src/sat/bmc/bmcMesh.c
@@ -31,10 +31,10 @@ ABC_NAMESPACE_IMPL_START
#define NCPARS 16
-inline int Bmc_MeshTVar( int Me[102][102], int x, int y ) { return Me[x][y]; }
-inline int Bmc_MeshGVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100]; }
-inline int Bmc_MeshCVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101]; }
-inline int Bmc_MeshUVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101] + NCPARS; }
+static inline int Bmc_MeshTVar( int Me[102][102], int x, int y ) { return Me[x][y]; }
+static inline int Bmc_MeshGVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100]; }
+static inline int Bmc_MeshCVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101]; }
+static inline int Bmc_MeshUVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101] + NCPARS; }
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
@@ -51,7 +51,7 @@ inline int Bmc_MeshUVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me
SeeAlso []
***********************************************************************/
-static inline Bmc_MeshVarValue( satoko_t * p, int v )
+static inline int Bmc_MeshVarValue( satoko_t * p, int v )
{
int value = var_value(p, v) != VAR_UNASSING ? var_value(p, v) : var_polarity(p, v);
return value == LIT_TRUE;
diff --git a/src/sat/bmc/bmcMesh2.c b/src/sat/bmc/bmcMesh2.c
index a1644eba..e6662d7c 100644
--- a/src/sat/bmc/bmcMesh2.c
+++ b/src/sat/bmc/bmcMesh2.c
@@ -32,10 +32,10 @@ ABC_NAMESPACE_IMPL_START
#define NCPARS 16
-inline int Bmc_MeshTVar( int Me[102][102], int x, int y ) { return Me[x][y]; }
-inline int Bmc_MeshGVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100]; }
-inline int Bmc_MeshCVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101]; }
-inline int Bmc_MeshUVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101] + NCPARS; }
+static inline int Bmc_MeshTVar( int Me[102][102], int x, int y ) { return Me[x][y]; }
+static inline int Bmc_MeshGVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100]; }
+static inline int Bmc_MeshCVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101]; }
+static inline int Bmc_MeshUVar( int Me[102][102], int x, int y ) { return Me[x][y] + Me[101][100] + Me[101][101] + NCPARS; }
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///