summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgignore5
-rw-r--r--abcexe.dsp4
-rw-r--r--abclib.dsp12
-rw-r--r--src/base/abci/abc.c36
-rw-r--r--src/base/cmd/cmdUtils.c8
-rw-r--r--src/misc/vec/vecPtr.h2
6 files changed, 61 insertions, 6 deletions
diff --git a/.hgignore b/.hgignore
index 777fab98..6ed7d35b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,10 +19,13 @@ src/xxx/
src/aig/au/
src/aig/ssm/
src/aig/ddb/
+src/sat/bsat2/
src/base/abc2/
src/base/abc2d/
-
+src/base/abc3/
+src/base/abc4/
+
src/base/pcm/
src/base/ply/
diff --git a/abcexe.dsp b/abcexe.dsp
index c430d214..cc4b61bd 100644
--- a/abcexe.dsp
+++ b/abcexe.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
diff --git a/abclib.dsp b/abclib.dsp
index 54b7c916..a8406221 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "ReleaseLib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "src" /D "WIN32" /D "WINDOWS" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "DebugLib"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "src" /D "WIN32" /D "WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D ABC_DLL=ABC_DLLEXPORT /D "_CRT_SECURE_NO_DEPRECATE" /D "ABC_USE_PTHREADS" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -774,6 +774,10 @@ SOURCE=.\src\base\wlc\wlcReadVer.c
SOURCE=.\src\base\wlc\wlcWriteVer.c
# End Source File
# End Group
+# Begin Group "abc3"
+
+# PROP Default_Filter ""
+# End Group
# End Group
# Begin Group "bdd"
@@ -1522,6 +1526,10 @@ SOURCE=.\src\sat\bmc\bmcMulti.c
SOURCE=.\src\sat\bmc\bmcUnroll.c
# End Source File
# End Group
+# Begin Group "bsat2"
+
+# PROP Default_Filter ""
+# End Group
# End Group
# Begin Group "opt"
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 7fa843a5..1c3bf4da 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -66,6 +66,8 @@ ABC_NAMESPACE_IMPL_START
/// DECLARATIONS ///
////////////////////////////////////////////////////////////////////////
+//#define USE_MINISAT22
+
static int Abc_CommandPrintStats ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandPrintExdc ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandPrintIo ( Abc_Frame_t * pAbc, int argc, char ** argv );
@@ -190,6 +192,9 @@ static int Abc_CommandSendStatus ( Abc_Frame_t * pAbc, int argc, cha
static int Abc_CommandBackup ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandRestore ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Abc_CommandMinisat ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Abc_CommandMinisimp ( Abc_Frame_t * pAbc, int argc, char ** argv );
+
static int Abc_CommandIStrash ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandICut ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandIRewrite ( Abc_Frame_t * pAbc, int argc, char ** argv );
@@ -791,6 +796,9 @@ void Abc_Init( Abc_Frame_t * pAbc )
Cmd_CommandAdd( pAbc, "Various", "backup", Abc_CommandBackup, 0 );
Cmd_CommandAdd( pAbc, "Various", "restore", Abc_CommandRestore, 0 );
+ Cmd_CommandAdd( pAbc, "Various", "minisat", Abc_CommandMinisat, 0 );
+ Cmd_CommandAdd( pAbc, "Various", "minisimp", Abc_CommandMinisimp, 0 );
+
Cmd_CommandAdd( pAbc, "New AIG", "istrash", Abc_CommandIStrash, 1 );
Cmd_CommandAdd( pAbc, "New AIG", "icut", Abc_CommandICut, 0 );
Cmd_CommandAdd( pAbc, "New AIG", "irw", Abc_CommandIRewrite, 1 );
@@ -13248,6 +13256,34 @@ usage:
return 1;
}
+/**Function*************************************************************
+
+ Synopsis []
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+int Abc_CommandMinisat( Abc_Frame_t * pAbc, int argc, char ** argv )
+{
+#ifdef USE_MINISAT22
+ extern int MainSat(int argc, char** argv);
+ MainSat( argc, argv );
+#endif
+ return 1;
+}
+int Abc_CommandMinisimp( Abc_Frame_t * pAbc, int argc, char ** argv )
+{
+#ifdef USE_MINISAT22
+ extern int MainSimp(int argc, char** argv);
+ MainSimp( argc, argv );
+#endif
+ return 1;
+}
+
/**Function*************************************************************
diff --git a/src/base/cmd/cmdUtils.c b/src/base/cmd/cmdUtils.c
index 4140680e..3d4d91bb 100644
--- a/src/base/cmd/cmdUtils.c
+++ b/src/base/cmd/cmdUtils.c
@@ -489,6 +489,14 @@ void CmdFreeArgv( int argc, char **argv )
ABC_FREE( argv[i] );
ABC_FREE( argv );
}
+char ** CmdDupArgv( int argc, char **argv )
+{
+ char ** argvNew = ABC_ALLOC( char *, argc );
+ int i;
+ for ( i = 0; i < argc; i++ )
+ argvNew[i] = Abc_UtilStrsav( argv[i] );
+ return argvNew;
+}
/**Function*************************************************************
diff --git a/src/misc/vec/vecPtr.h b/src/misc/vec/vecPtr.h
index e7ed1aa9..516429ff 100644
--- a/src/misc/vec/vecPtr.h
+++ b/src/misc/vec/vecPtr.h
@@ -891,7 +891,7 @@ static void Vec_PtrUniqify2( Vec_Ptr_t * p, int (*Vec_PtrSortCompare)(void**, vo
Vec_IntFill( vCounts, 1, 1 );
if ( p->nSize < 2 )
return;
- Vec_PtrSort( p, Vec_PtrSortCompare );
+ Vec_PtrSort( p, (int (*)())Vec_PtrSortCompare );
for ( i = k = 1; i < p->nSize; i++ )
if ( Vec_PtrSortCompare(p->pArray+i, p->pArray+k-1) != 0 )
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 08:28:52 +0000