Changeset 48eb34 in git

Timestamp:

Apr 3, 2018, 2:50:32 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

414cce519189e70ffda5ff4b972038335e5df374

Parents:

891f0edafd7f89cbc1574615217411372828de84

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-04-03 14:50:32+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-04-03 14:52:50+02:00

Message:

fix: Exp/Log tables for modulo.cc, omtTest-r (debug version), undef. memory

Files:

• libpolys/coeffs/modulop.cc (modified) (6 diffs)
• libpolys/coeffs/modulop.h (modified) (1 diff)
• omalloc/omDebugCheck.c (modified) (1 diff)

libpolys/coeffs/modulop.cc

@@ -41 +41 @@
 void    npCoeffWrite  (const coeffs r, BOOLEAN details);
 const char *  npRead  (const char *s, number *a,const coeffs r);
+void nvInpMult(number &a, number b, const coeffs r);
 
 #ifdef LDEBUG
@@ -509 +510 @@
   //r->cfName = ndName;
   //r->cfInpMult=ndInpMult;
+  r->convSingNFactoryN=npConvSingNFactoryN;
+  r->convFactoryNSingN=npConvFactoryNSingN;
+  r->cfRandom=npRandom;
+#ifdef LDEBUG
+  // debug stuff
+  r->cfDBTest=npDBTest;
+#endif
+
 #ifdef NV_OPS
   if (c>NV_MAX_PRIME)
@@ -523 +532 @@
   }
 #endif
-#ifdef LDEBUG
-  // debug stuff
-  r->cfDBTest=npDBTest;
-#endif
-
-  r->convSingNFactoryN=npConvSingNFactoryN;
-  r->convFactoryNSingN=npConvFactoryNSingN;
-
-  r->cfRandom=npRandom;
 
   // io via ssi
@@ -547 +547 @@
 #endif
   {
-#if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-    r->npExpTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
-    r->npLogTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
+#ifdef HAVE_DIV_MOD
+    r->npInvTable=(unsigned short*)omAlloc0( r->ch*sizeof(unsigned short) );
+#elif !defined(HAVE_MULT_MOD)
+    r->npExpTable=(unsigned short *)omAlloc0( r->ch*sizeof(unsigned short) );
+    r->npLogTable=(unsigned short *)omAlloc0( r->ch*sizeof(unsigned short) );
     r->npExpTable[0] = 1;
     r->npLogTable[0] = 0;
@@ -578 +580 @@
     }
 #endif
-#ifdef HAVE_DIV_MOD
-    r->npInvTable=(unsigned short*)omAlloc0( r->ch*sizeof(unsigned short) );
-#endif
-  }
+  }
+#ifdef NV_OPS
+  else /*if (c>NV_MAX_PRIME)*/
+  {
+    r->cfMult  = nvMult;
+    r->cfDiv   = nvDiv;
+    r->cfExactDiv = nvDiv;
+    r->cfInvers  = nvInvers;
+    r->cfInpMult = nvInpMult;
+    //r->cfPower= nvPower;
+    //if (c>FACTORY_MAX_PRIME) // factory will catch this error
+    //{
+    //  r->convSingNFactoryN=ndConvSingNFactoryN;
+    //}
+  }
+#endif
   return FALSE;
 }
@@ -780 +794 @@
 }
 
-void   nvInpMult(number &a, number b, const coeffs r)
+void nvInpMult(number &a, number b, const coeffs r)
 {
   number n=nvMultM(a,b,r);
   a=n;
 }
-
 
 static inline long nvInvMod(long a, const coeffs R)

libpolys/coeffs/modulop.h

@@ -56 +56 @@
 {
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
-  return (number)(long)r->npExpTable[x<r->npPminus1M ? x : x- r->npPminus1M];
+  return (number)(long)r->npExpTable[x<=r->npPminus1M ? x : x- r->npPminus1M];
 }
 static inline void npInpMultM(number &a, number b, const coeffs r)
 {
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
-  a=(number)(long)r->npExpTable[x<r->npPminus1M ? x : x- r->npPminus1M];
+  a=(number)(long)r->npExpTable[x<=r->npPminus1M ? x : x- r->npPminus1M];
 }
 #endif

omalloc/omDebugCheck.c

@@ -410 +410 @@
   om_CallErrorHook = 1;
 
-  if (error!=omError_NotBinAddr)
+  if ((error!=omError_NotBinAddr)&&(error!=omError_FreedAddr))
     _omPrintAddrInfo(stderr, error, addr, bin_size, flags, 10, " occurred for");
   om_Opts.ErrorHook();