From eb699bbaf80e4a6a0e85f87d7575ca1ffebef37f Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Mon, 24 Aug 2015 21:09:43 -0700
Subject: [PATCH] Changes to be able to compile ABC without CUDD.

---
 Makefile               |   2 +-
 abcexe.dsp             |   4 +-
 abclib.dsp             | 604 ++++++++++++++++++++---------------------
 src/aig/saig/saigDup.c |   2 +-
 src/bool/kit/kitBdd.c  |   2 +-
 5 files changed, 307 insertions(+), 307 deletions(-)

diff --git a/Makefile b/Makefile
index a7b971bb9..3b7587611 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ arch_flags : arch_flags.c
 ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags)
 ARCHFLAGS := $(ARCHFLAGS)
 
-OPTFLAGS  ?= -g -O #-DABC_NAMESPACE=xxx
+OPTFLAGS  ?= -g -O -DABC_USE_CUDD #-DABC_NAMESPACE=xxx
 
 CFLAGS    += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
 ifneq ($(findstring arm,$(shell uname -m)),)
diff --git a/abcexe.dsp b/abcexe.dsp
index 4f8742e31..9d5152fc2 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 "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 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" /D "ABC_USE_CUDD" /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 "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 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" /D "ABC_USE_CUDD" /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 e81c98efe..b0e82fa81 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 "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 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" /D "ABC_USE_CUDD" /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 "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 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" /D "ABC_USE_CUDD" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -954,6 +954,306 @@ SOURCE=.\src\base\cba\cbaWriteVer.c
 # Begin Group "bdd"
 
 # PROP Default_Filter ""
+# Begin Group "extrab"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBdd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddAuto.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddCas.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddImage.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddKmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddMisc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddSymm.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddTime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\extrab\extraBddUnate.c
+# End Source File
+# End Group
+# Begin Group "llb"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Cluster.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Constr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Core.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Group.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Hint.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Man.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Matrix.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Pivot.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Reach.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb1Sched.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Bad.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Core.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Driver.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Dump.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Flow.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb2Image.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb3Image.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb3Nonlin.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Cex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Cluster.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Image.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Map.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Nonlin.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llb4Sweep.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\llb\llbInt.h
+# End Source File
+# End Group
+# Begin Group "bbr"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\bbr\bbr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\bbr\bbrCex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\bbr\bbrImage.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\bbr\bbrNtbdd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\bbr\bbrReach.c
+# End Source File
+# End Group
+# Begin Group "cas"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\cas\cas.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\cas\casCore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\cas\casDec.c
+# End Source File
+# End Group
+# Begin Group "reo"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reo.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoApi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoCore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoProfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoShuffle.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoSift.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoSwap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoTest.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoTransfer.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\reo\reoUnits.c
+# End Source File
+# End Group
+# Begin Group "dsd"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdApi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdCheck.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdInt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdLocal.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdMan.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdProc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\dsd\dsdTree.c
+# End Source File
+# End Group
+# Begin Group "mtr"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\mtr\mtr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\mtr\mtrBasic.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\mtr\mtrGroup.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\mtr\mtrInt.h
+# End Source File
+# End Group
+# Begin Group "epd"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\src\bdd\epd\epd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\src\bdd\epd\epd.h
+# End Source File
+# End Group
 # Begin Group "cudd"
 
 # PROP Default_Filter ""
@@ -1210,306 +1510,6 @@ SOURCE=.\src\bdd\cudd\cuddZddSymm.c
 SOURCE=.\src\bdd\cudd\cuddZddUtil.c
 # End Source File
 # End Group
-# Begin Group "epd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\epd\epd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\epd\epd.h
-# End Source File
-# End Group
-# Begin Group "mtr"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\mtr\mtr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\mtr\mtrBasic.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\mtr\mtrGroup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\mtr\mtrInt.h
-# End Source File
-# End Group
-# Begin Group "dsd"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdApi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdCheck.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdInt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdLocal.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdMan.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdProc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\dsd\dsdTree.c
-# End Source File
-# End Group
-# Begin Group "reo"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoApi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoCore.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoProfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoShuffle.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoSift.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoSwap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoTest.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoTransfer.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\reo\reoUnits.c
-# End Source File
-# End Group
-# Begin Group "cas"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\cas\cas.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\cas\casCore.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\cas\casDec.c
-# End Source File
-# End Group
-# Begin Group "bbr"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\bbr\bbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\bbr\bbrCex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\bbr\bbrImage.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\bbr\bbrNtbdd.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\bbr\bbrReach.c
-# End Source File
-# End Group
-# Begin Group "llb"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Cluster.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Constr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Core.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Group.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Hint.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Man.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Matrix.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Pivot.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Reach.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb1Sched.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Bad.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Core.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Driver.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Dump.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Flow.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb2Image.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb3Image.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb3Nonlin.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Cex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Cluster.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Image.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Map.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Nonlin.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llb4Sweep.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\llb\llbInt.h
-# End Source File
-# End Group
-# Begin Group "extrab"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBdd.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddAuto.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddCas.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddImage.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddKmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddMisc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddSymm.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddTime.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\src\bdd\extrab\extraBddUnate.c
-# End Source File
-# End Group
 # End Group
 # Begin Group "sat"
 
diff --git a/src/aig/saig/saigDup.c b/src/aig/saig/saigDup.c
index dfeb2e43e..b16e3c3bb 100644
--- a/src/aig/saig/saigDup.c
+++ b/src/aig/saig/saigDup.c
@@ -586,7 +586,7 @@ Aig_Man_t * Saig_ManDupCones( Aig_Man_t * pAig, int * pPos, int nPos )
 
 }
 
-#ifdef ABC_USE_CUDD
+#ifndef ABC_USE_CUDD
 int Aig_ManVerifyUsingBdds( Aig_Man_t * pInit, Saig_ParBbr_t * pPars ) { return 0; }
 void Bbr_ManSetDefaultParams( Saig_ParBbr_t * p ) {}
 #endif
diff --git a/src/bool/kit/kitBdd.c b/src/bool/kit/kitBdd.c
index 9c7c918d9..8625791d6 100644
--- a/src/bool/kit/kitBdd.c
+++ b/src/bool/kit/kitBdd.c
@@ -21,7 +21,7 @@
 #include "kit.h"
 
 #ifdef ABC_USE_CUDD
-#include "misc/extra/extraBdd.h"
+#include "bdd/extrab/extraBdd.h"
 #endif
 
 ABC_NAMESPACE_IMPL_START