Fix some alignment issues on arm, hppa and sparc.

Author: petterreinholdtsen

Makefile

@@ -74,9 +74,6 @@ ARCHFLAGS := $(ARCHFLAGS)
 OPTFLAGS  ?= -g -O
 
 CFLAGS    += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
-ifneq ($(findstring arm,$(shell uname -m)),)
-	CFLAGS += -DABC_MEMALIGN=4
-endif
 
 # compile ABC using the C++ compiler and put everything in the namespace $(ABC_NAMESPACE)
 ifdef ABC_USE_NAMESPACE

src/aig/aig/aigTsim.c

@@ -135,7 +135,7 @@ Aig_Tsi_t * Aig_TsiStart( Aig_Man_t * pAig )
     p->pAig    = pAig;
     p->nWords  = Abc_BitWordNum( 2*Aig_ManRegNum(pAig) );
     p->vStates = Vec_PtrAlloc( 1000 );
-    p->pMem    = Aig_MmFixedStart( sizeof(unsigned) * p->nWords + sizeof(unsigned *), 10000 );
+    p->pMem    = Aig_MmFixedStart( alignPad(sizeof(unsigned) * p->nWords + sizeof(unsigned *)), 10000 );
     p->nBins   = Abc_PrimeCudd(TSI_MAX_ROUNDS/2);
     p->pBins   = ABC_ALLOC( unsigned *, p->nBins );
     memset( p->pBins, 0, sizeof(unsigned *) * p->nBins );

src/map/if/ifMan.c

@@ -88,9 +88,10 @@ If_Man_t * If_ManStart( If_Par_t * pPars )
         }
     }
     p->nPermWords  = p->pPars->fUsePerm? If_CutPermWords( p->pPars->nLutSize ) : 0;
-    p->nObjBytes   = sizeof(If_Obj_t) + sizeof(int) * (p->pPars->nLutSize + p->nPermWords);
-    p->nCutBytes   = sizeof(If_Cut_t) + sizeof(int) * (p->pPars->nLutSize + p->nPermWords);
-    p->nSetBytes   = sizeof(If_Set_t) + (sizeof(If_Cut_t *) + p->nCutBytes) * (p->pPars->nCutsMax + 1);
+    p->nObjBytes   = alignPad(sizeof(If_Obj_t) + sizeof(int) * (p->pPars->nLutSize + p->nPermWords));
+    p->nCutBytes   = alignPad(sizeof(If_Cut_t) + sizeof(int) * (p->pPars->nLutSize + p->nPermWords));
+    p->nSetBytes   = alignPad(sizeof(If_Set_t) + (sizeof(If_Cut_t *) + p->nCutBytes) * (p->pPars->nCutsMax + 1));
+
     p->pMemObj     = Mem_FixedStart( p->nObjBytes );
     // report expected memory usage
     if ( p->pPars->fVerbose )

src/misc/util/abc_global.h

@@ -271,6 +271,27 @@ typedef ABC_INT64_T iword;
         ((obj) ? ((type *) realloc((char *)(obj), sizeof(type) * (size_t)(num))) : \
          ((type *) malloc(sizeof(type) * (size_t)(num))))
 
+#ifndef ABC_MEMALIGN
+# if defined(__arm__)
+#   define ABC_MEMALIGN 4
+# elif defined(__hppa__)
+#   define ABC_MEMALIGN 8
+# elif defined(__sparc__)
+#   define ABC_MEMALIGN 8
+//# else
+//#   warning unsupported platform
+# endif
+#endif // !ABC_MEMALIGN
+
+static inline size_t alignPad(size_t objsize)
+{
+#ifdef ABC_MEMALIGN
+    if (objsize % ABC_MEMALIGN)
+        objsize += ABC_MEMALIGN - (objsize % ABC_MEMALIGN);
+#endif
+    return objsize;
+}
+
 static inline int      Abc_AbsInt( int a        )             { return a < 0 ? -a : a; }
 static inline int      Abc_MaxInt( int a, int b )             { return a > b ?  a : b; }
 static inline int      Abc_MinInt( int a, int b )             { return a < b ?  a : b; }

src/opt/rwt/rwtMan.c

@@ -104,7 +104,7 @@ clk = Abc_Clock();
     p->pTable = ABC_ALLOC( Rwt_Node_t *, p->nFuncs );
     memset( p->pTable, 0, sizeof(Rwt_Node_t *) * p->nFuncs );
     // create the elementary nodes
-    p->pMmNode  = Mem_FixedStart( sizeof(Rwt_Node_t) );
+    p->pMmNode  = Mem_FixedStart( alignPad(sizeof(Rwt_Node_t)) );
     p->vForest  = Vec_PtrAlloc( 100 );
     Rwt_ManAddVar( p, 0x0000, fPrecompute ); // constant 0
     Rwt_ManAddVar( p, 0xAAAA, fPrecompute ); // var A