Changeset c60380d in git for kernel

Timestamp:

Apr 10, 2013, 10:05:02 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

55cb6bd95ed2dc1ee1fe4d8f374124dfd3836e86

Parents:

03e4a6b8f52593ef6a94a0f1176b8e693d9d2306

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 10:05:02+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 10:11:44+02:00

Message:

fix: alignment

from master

File:

• kernel/tgb.cc (modified) (4 diffs)

kernel/tgb.cc

@@ -1469 +1469 @@
 
 #define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->array_lengths*sizeof(type))
+
+#define ENLARGE_ALIGN(pointer, type) {if(pointer)\
+         pointer=(type*)omReallocAligned(pointer, c->array_lengths*sizeof(type));\
+         else pointer=(type*)omAllocAligned(c->array_lengths*sizeof(type));}
 //  BOOLEAN corr=lenS_correct(c->strat);
   int sugar;
@@ -1484 +1488 @@
     assume (c->array_lengths >= c->n);
     ENLARGE (c->T_deg, int);
-    ENLARGE (c->tmp_pair_lm, poly);
-    ENLARGE (c->tmp_spn, sorted_pair_node *);
-
-    ENLARGE (c->short_Exps, long);
+    ENLARGE_ALIGN (c->tmp_pair_lm, poly);
+    ENLARGE_ALIGN (c->tmp_spn, sorted_pair_node *);
+
+    ENLARGE_ALIGN (c->short_Exps, long);
     ENLARGE (c->lengths, int);
 #ifndef HAVE_BOOST
 #ifndef USE_STDVECBOOL
 
-    ENLARGE (c->states, char *);
-#endif
-#endif
-    ENLARGE (c->gcd_of_terms, poly);
+    ENLARGE_ALIGN (c->states, char *);
+#endif
+#endif
+    ENLARGE_ALIGN (c->gcd_of_terms, poly);
     //if (c->weighted_lengths!=NULL) {
-    ENLARGE (c->weighted_lengths, wlen_type);
+    ENLARGE_ALIGN (c->weighted_lengths, wlen_type);
     //}
-    //ENLARGE(c->S->m,poly);
+    //ENLARGE_ALIGN(c->S->m,poly);
   }
   pEnlargeSet (&c->S->m, c->n - 1, 1);
@@ -1550 +1554 @@
 
 #undef ENLARGE
+#undef ENLARGE_ALIGN
   if(p_GetComp (h, currRing) <= c->syz_comp)
   {
@@ -3287 +3292 @@
   h = omalloc (n * sizeof (int));
   lengths = (int *) h;
-  weighted_lengths = (wlen_type *) omalloc (n * sizeof (wlen_type));
-  gcd_of_terms = (poly *) omalloc (n * sizeof (poly));
+  weighted_lengths = (wlen_type *) omAllocAligned (n * sizeof (wlen_type));
+  gcd_of_terms = (poly *) omAlloc (n * sizeof (poly));
 
   short_Exps = (long *) omalloc (n * sizeof (long));