Changeset aa2b525 in git


Ignore:
Timestamp:
Nov 22, 2011, 7:33:47 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
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:
8 edited

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    re7d5ef raa2b525  
    667667
    668668        pFalseReturn(p_CheckPolyRing(T->max, tailRing));
    669         omCheckBinAddrSize(T->max, (tailRing->PolyBin->sizeW)*SIZEOF_LONG);
     669        omCheckBinAddrSize(T->max, (omSizeWOfBin(tailRing->PolyBin))*SIZEOF_LONG);
    670670#if KDEBUG > 0
    671671        if (! sloppy_max)
  • kernel/tgb.cc

    re7d5ef raa2b525  
    12251225  poly np;
    12261226  omTypeAllocBin (poly, np, b);
    1227   memmove (np, p, b->sizeW * sizeof (long));
     1227  memmove (np, p, omSizeWOfBin(b) * sizeof (long));
    12281228  omFreeBinAddr (p);
    12291229  return np;
  • libpolys/polys/monomials/p_polys.h

    re7d5ef raa2b525  
    681681{
    682682  p_CheckRing2(r);
    683   pAssume2(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
     683  pAssume2(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    684684  poly p;
    685685  omTypeAllocBin(poly, p, bin);
     
    890890{
    891891  p_LmCheckPolyRing2(p, r);
    892   pAssume2(r->PolyBin->sizeW == bin->sizeW);
     892  pAssume2(omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    893893  return r->p_Procs->p_ShallowCopyDelete(p, r, bin);
    894894}
     
    12801280{
    12811281  p_CheckRing1(r);
    1282   pAssume1(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
     1282  pAssume1(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    12831283  poly p;
    12841284  omTypeAlloc0Bin(poly, p, bin);
     
    13531353{
    13541354  p_LmCheckPolyRing1(p, r);
    1355   pAssume1(bin->sizeW == r->PolyBin->sizeW);
     1355  pAssume1(omSizeWOfBin(bin) == omSizeWOfBin(r->PolyBin));
    13561356  poly new_p = p_New(r);
    13571357  memcpy(new_p->exp, p->exp, r->ExpL_Size*sizeof(long));
  • libpolys/polys/operations/pShallowCopyDelete.cc

    re7d5ef raa2b525  
    1818  p_CheckRing(d_r);
    1919  assume(d_bin != NULL);
    20   assume(d_bin == d_r->PolyBin || d_bin->sizeW == d_r->PolyBin->sizeW);
     20  assume(d_bin == d_r->PolyBin || omSizeWOfBin(d_bin) == omSizeWOfBin(d_r->PolyBin));
    2121  assume(s_r->N == d_r->N);
    2222
  • libpolys/polys/pDebug.cc

    re7d5ef raa2b525  
    8080                           (r->qideal != NULL &&
    8181                            omIsBinPageAddr(p) &&
    82                             omSizeWOfAddr(p)==r->PolyBin->sizeW) ||
     82                            omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin)) ||
    8383                           rSamePolyRep((ring) custom, r),
    8484                           "monomial not from specified ring",p,r);
     
    8888    #endif
    8989    {
    90       _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==r->PolyBin->sizeW,p,r);
     90      _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin),p,r);
    9191      return TRUE;
    9292    }
     
    211211  #ifndef OM_NDEBUG
    212212  // check addr with level+1 so as to check bin/page of addr
    213   _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, level+1)
     213  _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, level+1)
    214214                        == omError_NoError, "memory error",p,r);
    215215  #endif
     
    231231    #ifndef OM_NDEBUG
    232232    // omAddr check
    233     _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, 1)
     233    _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, 1)
    234234                     == omError_NoError, "memory error",p,r);
    235235    #endif
  • omalloc/omAllocPrivate.h

    re7d5ef raa2b525  
    9797#define omSizeOfBinAddr(addr) _omSizeOfBinAddr(addr)
    9898#endif
     99
     100#define omSizeWOfBin(bin_ptr) ((bin_ptr)->sizeW)
    99101
    100102#define _omSizeOfBinAddr(addr)  ((omSizeWOfBinAddr(addr)) << LOG_SIZEOF_LONG)
  • polys/pInline1.h

    re7d5ef raa2b525  
    9696{
    9797  p_CheckRing1(r);
    98   pAssume1(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
     98  pAssume1(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    9999  poly p;
    100100  omTypeAlloc0Bin(poly, p, bin);
  • polys/pInline2.h

    re7d5ef raa2b525  
    297297{
    298298  p_CheckRing2(r);
    299   pAssume2(bin != NULL && r->PolyBin->sizeW == bin->sizeW);
     299  pAssume2(bin != NULL && omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    300300  poly p;
    301301  omTypeAllocBin(poly, p, bin);
     
    479479{
    480480  p_LmCheckPolyRing2(p, r);
    481   pAssume2(r->PolyBin->sizeW == bin->sizeW);
     481  pAssume2(omSizeWOfBin(r->PolyBin) == omSizeWOfBin(bin));
    482482  return r->p_Procs->p_ShallowCopyDelete(p, r, bin);
    483483}
Note: See TracChangeset for help on using the changeset viewer.