luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #517 from YosysHQ/cmake_windows 

Windows cleanup
This commit is contained in:
alanminko 2026-06-16 21:57:13 +07:00 committed by GitHub
parent 334ae5d1b7 1e130338f0
commit f1d6c364cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/abcexe.vcxproj vendored
View File

@ -33,6 +33,7 @@
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DisableSpecificWarnings>4146;4334;4996;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4334;4996;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>

1
.github/scripts/abclib.vcxproj.template vendored
View File

@ -32,6 +32,7 @@
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<DisableSpecificWarnings>4146;4334;4996;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4146;4334;4996;4703;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<TreatSpecificWarningsAsErrors>4013</TreatSpecificWarningsAsErrors>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>

9
src/base/abci/abcNpn.c
View File

@ -319,10 +319,6 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose )
} }
else if ( NpnType == 8 ) else if ( NpnType == 8 )
{ {
// typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
int fHigh = 1, iEnumThres = 25; int fHigh = 1, iEnumThres = 25;
Abc_TtHieMan_t * pMan = Abc_TtHieManStart(p->nVars, 5); Abc_TtHieMan_t * pMan = Abc_TtHieManStart(p->nVars, 5);
for ( i = 0; i < p->nFuncs; i++ ) for ( i = 0; i < p->nFuncs; i++ )
@ -337,11 +333,6 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose )
} }
else if ( NpnType == 9 || NpnType == 10 || NpnType == 11 ) else if ( NpnType == 9 || NpnType == 10 || NpnType == 11 )
{ {
// typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
unsigned Abc_TtCanonicizeCA(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
Abc_TtHieMan_t * pMan = Abc_TtHieManStart(p->nVars, 5); Abc_TtHieMan_t * pMan = Abc_TtHieManStart(p->nVars, 5);
for ( i = 0; i < p->nFuncs; i++ ) for ( i = 0; i < p->nFuncs; i++ )
{ {

1
src/base/main/mainUtils.c
View File

@ -20,6 +20,7 @@
#ifdef WIN32 #ifdef WIN32
#include <process.h> #include <process.h>
#include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif

1
src/opt/dau/dau.h
View File

@ -86,6 +86,7 @@ extern Abc_TtHieMan_t * Abc_TtHieManStart( int nVars, int nLevels );
extern void Abc_TtHieManStop(Abc_TtHieMan_t * p ); extern void Abc_TtHieManStop(Abc_TtHieMan_t * p );
extern unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); extern unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag);
extern unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres); extern unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
extern unsigned Abc_TtCanonicizeCA(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int fCA);
extern unsigned Abc_TtCanonicizeHie(Abc_TtHieMan_t * p, word * pTruthInit, int nVars, char * pCanonPerm, int fExact); extern unsigned Abc_TtCanonicizeHie(Abc_TtHieMan_t * p, word * pTruthInit, int nVars, char * pCanonPerm, int fExact);
/*=== dauCount.c ==========================================================*/ /*=== dauCount.c ==========================================================*/
extern int Abc_TtCountOnesInCofsQuick( word * pTruth, int nVars, int * pStore ); extern int Abc_TtCountOnesInCofsQuick( word * pTruth, int nVars, int * pStore );

1
src/opt/dau/dauNpn.c
View File

@ -1082,7 +1082,6 @@ Vec_Mem_t * Dau_CollectNpnFunctionsArray( Vec_Wrd_t * vFuncs, int nVars, Vec_Int
void Dau_CanonicizeArray( Vec_Wrd_t * vFuncs, int nVars, int fVerbose ) void Dau_CanonicizeArray( Vec_Wrd_t * vFuncs, int nVars, int fVerbose )
{ {
abctime clkStart = Abc_Clock(); abctime clkStart = Abc_Clock();
extern unsigned Abc_TtCanonicizeCA(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres);
if ( fVerbose ) printf( "Functions: %d (original) ", Vec_WrdSize(vFuncs) ); if ( fVerbose ) printf( "Functions: %d (original) ", Vec_WrdSize(vFuncs) );
unsigned uCanonPhase; char pCanonPerm[16]; word Func; int i; unsigned uCanonPhase; char pCanonPerm[16]; word Func; int i;
Vec_WrdUniqify( vFuncs ); Vec_WrdUniqify( vFuncs );

1
src/sat/kissat/colors.c
View File

@ -1,6 +1,7 @@
#include "colors.h" #include "colors.h"
#if defined(WIN32) && !defined(__MINGW32__) #if defined(WIN32) && !defined(__MINGW32__)
#include <io.h>
#define isatty _isatty #define isatty _isatty
#else #else
#include <unistd.h> #include <unistd.h>

2
src/sat/kissat/file.c
View File

@ -9,10 +9,12 @@
#include <sys/types.h> #include <sys/types.h>
#ifdef WIN32 #ifdef WIN32
#include <io.h>
#define unlink _unlink #define unlink _unlink
#define access _access #define access _access
#define R_OK 4 #define R_OK 4
#define W_OK 2 #define W_OK 2
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif