mirror of https://github.com/YosysHQ/abc.git
Small fixes for C++ compilers
This commit is contained in:
parent
bf6a053c64
commit
f302e6f6ef
|
|
@ -1953,7 +1953,7 @@ Gia_Man_t * Gia_ManFromIfLogic( If_Man_t * pIfMan )
|
|||
{
|
||||
FILE * pFile; int status;
|
||||
char * pStr, Buffer[1000] = {0};
|
||||
char * pNameGen = pIfMan->pName? Extra_FileNameGeneric( pIfMan->pName ) : "nameless_";
|
||||
const char * pNameGen = pIfMan->pName? Extra_FileNameGeneric( pIfMan->pName ) : "nameless_";
|
||||
sprintf( Buffer, "%s_configs.txt", pNameGen );
|
||||
ABC_FREE( pNameGen );
|
||||
pFile = fopen( Buffer, "wb" );
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
#include "abcOper.h"
|
||||
|
||||
//ABC_NAMESPACE_HEADER_START
|
||||
ABC_NAMESPACE_HEADER_START
|
||||
|
||||
#ifdef _WIN32
|
||||
#define inline __inline
|
||||
|
|
@ -390,11 +390,11 @@ static inline void Ndr_ModuleWriteVerilog( char * pFileName, void * pModule, cha
|
|||
// creating a new module (returns pointer to the memory buffer storing the module info)
|
||||
static inline void * Ndr_ModuleCreate( int Name )
|
||||
{
|
||||
Ndr_Data_t * p = malloc( sizeof(Ndr_Data_t) );
|
||||
Ndr_Data_t * p = ABC_ALLOC( Ndr_Data_t, 1 );
|
||||
p->nSize = 0;
|
||||
p->nCap = 16;
|
||||
p->pHead = malloc( p->nCap );
|
||||
p->pBody = malloc( p->nCap * 4 );
|
||||
p->pHead = ABC_ALLOC( unsigned char, p->nCap );
|
||||
p->pBody = ABC_ALLOC( unsigned int, p->nCap * 4 );
|
||||
Ndr_DataPush( p, NDR_MODULE, 0 );
|
||||
Ndr_DataPush( p, NDR_NAME, Name );
|
||||
Ndr_DataAddTo( p, 0, p->nSize );
|
||||
|
|
@ -453,10 +453,10 @@ static inline void * Ndr_ModuleRead( char * pFileName )
|
|||
assert( nFileSize % 5 == 0 );
|
||||
rewind( pFile );
|
||||
// create structure
|
||||
p = malloc( sizeof(Ndr_Data_t) );
|
||||
p = ABC_ALLOC( Ndr_Data_t, 1 );
|
||||
p->nSize = p->nCap = nFileSize / 5;
|
||||
p->pHead = malloc( p->nCap );
|
||||
p->pBody = malloc( p->nCap * 4 );
|
||||
p->pHead = ABC_ALLOC( unsigned char, p->nCap );
|
||||
p->pBody = ABC_ALLOC( unsigned int, p->nCap * 4 );
|
||||
RetValue = (int)fread( p->pBody, 4, p->nCap, pFile );
|
||||
RetValue = (int)fread( p->pHead, 1, p->nCap, pFile );
|
||||
assert( p->nSize == (int)p->pBody[0] );
|
||||
|
|
@ -511,7 +511,7 @@ static inline void Ndr_ModuleTest()
|
|||
}
|
||||
|
||||
|
||||
//ABC_NAMESPACE_HEADER_END
|
||||
ABC_NAMESPACE_HEADER_END
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ Acb_Ntk_t * Acb_NtkFromNdr( char * pFileName, void * pModule, Abc_Nam_t * pNames
|
|||
NameId = Ndr_ObjReadBody( p, Obj, NDR_OUTPUT );
|
||||
nArray = Ndr_ObjReadArray( p, Obj, NDR_INPUT, &pArray );
|
||||
Type = Ndr_ObjReadBody( p, Obj, NDR_OPERTYPE );
|
||||
ObjId = Acb_ObjAlloc( pNtk, Type, nArray, 0 );
|
||||
ObjId = Acb_ObjAlloc( pNtk, (Acb_ObjType_t) Type, nArray, 0 );
|
||||
Vec_IntWriteEntry( vMap, NameId, ObjId );
|
||||
Acb_ObjSetName( pNtk, ObjId, NameId );
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue