Changeset aa2b525 in git

Timestamp:

Nov 22, 2011, 7:33:47 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

737b7c8c465e4892fcc4bee81dfba341b05829ac

Parents:

e7d5ef49a84d8f24b249712b963e0b89eb2a5645

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-22 19:33:47+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-23 01:23:10+01:00

Message:

ADD/FIX: use omSizeWOfBin(bin_ptr) instead of ((bin_ptr)->sizeW) (due to xalloc)

Files:

• kernel/kutil.cc (modified) (1 diff)
• kernel/tgb.cc (modified) (1 diff)
• libpolys/polys/monomials/p_polys.h (modified) (4 diffs)
• libpolys/polys/operations/pShallowCopyDelete.cc (modified) (1 diff)
• libpolys/polys/pDebug.cc (modified) (4 diffs)
• omalloc/omAllocPrivate.h (modified) (1 diff)
• polys/pInline1.h (modified) (1 diff)
• polys/pInline2.h (modified) (2 diffs)

kernel/kutil.cc

@@ -667 +667 @@
 
         pFalseReturn(p_CheckPolyRing(T->max, tailRing));
-        omCheckBinAddrSize(T->max, (tailRing->PolyBin->sizeW)*SIZEOF_LONG);
+        omCheckBinAddrSize(T->max, (omSizeWOfBin(tailRing->PolyBin))*SIZEOF_LONG);
 #if KDEBUG > 0
         if (! sloppy_max)

kernel/tgb.cc

@@ -1225 +1225 @@
   poly np;
   omTypeAllocBin (poly, np, b);
-  memmove (np, p, b->sizeW * sizeof (long));
+  memmove (np, p, omSizeWOfBin(b) * sizeof (long));
   omFreeBinAddr (p);
   return np;

libpolys/polys/monomials/p_polys.h

@@ -681 +681 @@
 {
   p_CheckRing2(r);
-  pAssume2(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
+  pAssume2(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   poly p;
   omTypeAllocBin(poly, p, bin);
@@ -890 +890 @@
 {
   p_LmCheckPolyRing2(p, r);
-  pAssume2(r->PolyBin->sizeW == bin->sizeW);
+  pAssume2(omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   return r->p_Procs->p_ShallowCopyDelete(p, r, bin);
 }
@@ -1280 +1280 @@
 {
   p_CheckRing1(r);
-  pAssume1(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
+  pAssume1(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   poly p;
   omTypeAlloc0Bin(poly, p, bin);
@@ -1353 +1353 @@
 {
   p_LmCheckPolyRing1(p, r);
-  pAssume1(bin->sizeW == r->PolyBin->sizeW);
+  pAssume1(omSizeWOfBin(bin) == omSizeWOfBin(r->PolyBin));
   poly new_p = p_New(r);
   memcpy(new_p->exp, p->exp, r->ExpL_Size*sizeof(long));

libpolys/polys/operations/pShallowCopyDelete.cc

@@ -18 +18 @@
   p_CheckRing(d_r);
   assume(d_bin != NULL);
-  assume(d_bin == d_r->PolyBin || d_bin->sizeW == d_r->PolyBin->sizeW);
+  assume(d_bin == d_r->PolyBin || omSizeWOfBin(d_bin) == omSizeWOfBin(d_r->PolyBin));
   assume(s_r->N == d_r->N);
 

libpolys/polys/pDebug.cc

@@ -80 +80 @@
                            (r->qideal != NULL &&
                             omIsBinPageAddr(p) &&
-                            omSizeWOfAddr(p)==r->PolyBin->sizeW) ||
+                            omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin)) ||
                            rSamePolyRep((ring) custom, r),
                            "monomial not from specified ring",p,r);
@@ -88 +88 @@
     #endif
     {
-      _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==r->PolyBin->sizeW,p,r);
+      _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin),p,r);
       return TRUE;
     }
@@ -211 +211 @@
   #ifndef OM_NDEBUG
   // check addr with level+1 so as to check bin/page of addr
-  _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, level+1)
+  _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, level+1)
                         == omError_NoError, "memory error",p,r);
   #endif
@@ -231 +231 @@
     #ifndef OM_NDEBUG
     // omAddr check
-    _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, 1)
+    _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, 1)
                      == omError_NoError, "memory error",p,r);
     #endif

omalloc/omAllocPrivate.h

@@ -97 +97 @@
 #define omSizeOfBinAddr(addr) _omSizeOfBinAddr(addr)
 #endif
+
+#define omSizeWOfBin(bin_ptr) ((bin_ptr)->sizeW)
 
 #define _omSizeOfBinAddr(addr)  ((omSizeWOfBinAddr(addr)) << LOG_SIZEOF_LONG)

polys/pInline1.h

@@ -96 +96 @@
 {
   p_CheckRing1(r);
-  pAssume1(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
+  pAssume1(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   poly p;
   omTypeAlloc0Bin(poly, p, bin);

polys/pInline2.h

@@ -297 +297 @@
 {
   p_CheckRing2(r);
-  pAssume2(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
+  pAssume2(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   poly p;
   omTypeAllocBin(poly, p, bin);
@@ -479 +479 @@
 {
   p_LmCheckPolyRing2(p, r);
-  pAssume2(r->PolyBin->sizeW == bin->sizeW);
+  pAssume2(omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
   return r->p_Procs->p_ShallowCopyDelete(p, r, bin);
 }