Changeset 900802 in git

Timestamp:

Jan 27, 2010, 12:26:35 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

9c4865b7cda2bf45bae975154676503fdfcbf15e

Parents:

4c4a8025d5593bc6f5fd2950cfac144eb2d79cd3

Message:

structs.h cleanup

git-svn-id: file:///usr/local/Singular/svn/trunk@12460 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• ffields.cc (modified) (4 diffs)
• hdegree.cc (modified) (1 diff)
• hutil.h (modified) (1 diff)
• longalg.cc (modified) (1 diff)
• misc.cc (modified) (1 diff)
• modulop.cc (modified) (3 diffs)
• modulop.h (modified) (1 diff)
• numbers.cc (modified) (1 diff)
• structs.h (modified) (5 diffs)

kernel/ffields.cc

@@ -20 +20 @@
 int nfCharP=0;  /* the characteristic: p*/
 static int nfCharQ1=0; /* q-1 */
-CARDINAL *nfPlus1Table=NULL; /* the table i=log(z^i) -> log(z^i+1) */
+unsigned short *nfPlus1Table=NULL; /* the table i=log(z^i) -> log(z^i+1) */
 /* the q's from the table 'fftable' */
 unsigned short fftable[]={
@@ -166 +166 @@
   while (i >= nfCharP) i -= nfCharP;
   if (i==0) return (number)(long)nfCharQ;
-  CARDINAL c=0;
+  unsigned short c=0;
   while (i>1)
   {
@@ -592 +592 @@
   if (nfCharQ > 1)
   {
-    omFreeSize( (ADDRESS)nfPlus1Table,nfCharQ*sizeof(CARDINAL) );
+    omFreeSize( (ADDRESS)nfPlus1Table,nfCharQ*sizeof(unsigned short) );
     nfPlus1Table=NULL;
   }
@@ -620 +620 @@
     nfCharQ1=nfCharQ-1;
     //Print("nfCharQ=%d,nfCharQ1=%d,mipo=>>%s<<\n",nfCharQ,nfCharQ1,buf);
-    nfPlus1Table= (CARDINAL *)omAlloc( (nfCharQ)*sizeof(CARDINAL) );
+    nfPlus1Table= (unsigned short *)omAlloc( (nfCharQ)*sizeof(unsigned short) );
     int digs = gf_tab_numdigits62( nfCharQ );
     char * bufptr;

kernel/hdegree.cc

@@ -21 +21 @@
 
 int  hCo, hMu, hMu2;
+struct omBin_s* indlist_bin = omGetSpecBin(sizeof(indlist));
 
 /*0 implementation*/

kernel/hutil.h

@@ -18 +18 @@
   scfmon mo;
   int a;
+};
+
+typedef struct sindlist indlist;
+typedef indlist * indset;
+struct sindlist
+{
+  indset nx;
+  intvec * set;
 };
 

kernel/longalg.cc

@@ -27 +27 @@
 
 naIdeal naI=NULL;
+
+omBin snaIdeal_bin = omGetSpecBin(sizeof(snaIdeal));
 
 int naNumbOfPar;

kernel/misc.cc

@@ -48 +48 @@
 
 omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr));
-omBin indlist_bin = omGetSpecBin(sizeof(indlist));
-omBin naIdeal_bin = omGetSpecBin(sizeof(naIdeal));
-omBin snaIdeal_bin = omGetSpecBin(sizeof(snaIdeal));
 omBin smprec_bin = omGetSpecBin(sizeof(smprec));
 omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));

kernel/modulop.cc

@@ -28 +28 @@
 
 #ifdef HAVE_DIV_MOD
-CARDINAL *npInvTable=NULL;
+unsigned short *npInvTable=NULL;
 #endif
 
 #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-CARDINAL *npExpTable=NULL;
-CARDINAL *npLogTable=NULL;
+unsigned short *npExpTable=NULL;
+unsigned short *npLogTable=NULL;
 #endif
 
@@ -350 +350 @@
     {
 #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-      r->cf->npExpTable=(CARDINAL *)omAlloc( r->cf->npPrimeM*sizeof(CARDINAL) );
-      r->cf->npLogTable=(CARDINAL *)omAlloc( r->cf->npPrimeM*sizeof(CARDINAL) );
+      r->cf->npExpTable=(unsigned short *)omAlloc( r->cf->npPrimeM*sizeof(unsigned short) );
+      r->cf->npLogTable=(unsigned short *)omAlloc( r->cf->npPrimeM*sizeof(unsigned short) );
       r->cf->npExpTable[0] = 1;
       r->cf->npLogTable[0] = 0;
@@ -382 +382 @@
 #endif
 #ifdef HAVE_DIV_MOD
-      r->cf->npInvTable=(CARDINAL*)omAlloc0( r->cf->npPrimeM*sizeof(CARDINAL) );
+      r->cf->npInvTable=(unsigned short*)omAlloc0( r->cf->npPrimeM*sizeof(unsigned short) );
 #endif
     }

kernel/modulop.h

@@ -60 +60 @@
 /* for npMultM, npSubM, npNegM, npEqualM : */
 #ifdef HAVE_DIV_MOD
-extern CARDINAL *npInvTable;
+extern unsigned short *npInvTable;
 #else
 #ifndef HAVE_MULT_MOD
 extern long npPminus1M;
-extern CARDINAL *npExpTable;
-extern CARDINAL *npLogTable;
+extern unsigned short *npExpTable;
+extern unsigned short *npLogTable;
 #endif
 #endif

kernel/numbers.cc

@@ -717 +717 @@
                  if (r->cf->npInvTable!=NULL)
                  omFreeSize( (ADDRESS)r->cf->npInvTable,
-                             r->cf->npPrimeM*sizeof(CARDINAL) );
+                             r->cf->npPrimeM*sizeof(unsigned short) );
                  #else
                  if (r->cf->npExpTable!=NULL)
                  {
                    omFreeSize( (ADDRESS)r->cf->npExpTable,
-                               r->cf->npPrimeM*sizeof(CARDINAL) );
+                               r->cf->npPrimeM*sizeof(unsigned short) );
                    omFreeSize( (ADDRESS)r->cf->npLogTable,
-                               r->cf->npPrimeM*sizeof(CARDINAL) );
+                               r->cf->npPrimeM*sizeof(unsigned short) );
                  }
                  #endif

kernel/structs.h

@@ -19 +19 @@
 
 /* standard types */
-typedef unsigned short CARDINAL;
 #ifdef HAVE_RINGS
 typedef MP_INT *int_number;
@@ -197 +196 @@
 typedef struct p_Procs_s p_Procs_s;
 
-// for hdegree.cc
-typedef struct sindlist indlist;
-typedef indlist * indset;
-struct sindlist
-{
-  indset nx;
-  intvec * set;
-};
-
 // for longalg.cc
 struct snaIdeal
@@ -235 +225 @@
    int npPminus1M;
    #ifdef HAVE_DIV_MOD
-   CARDINAL *npInvTable;
+   unsigned short *npInvTable;
    #endif
    #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-   CARDINAL *npExpTable;
-   CARDINAL *npLogTable;
+   unsigned short *npExpTable;
+   unsigned short *npLogTable;
    #endif
    // Zp_a, Q_a
@@ -615 +605 @@
      long vars are those longs in the exponent vector which are
      occupied by variables, only */
-  short     VarL_Size;
+  short      VarL_Size;
   short      BitsPerExp; /* number of bits per exponent */
   short      ExpPerLong; /* maximal number of Exponents per long */
@@ -828 +818 @@
 
 extern struct omBin_s* char_ptr_bin;
-extern struct omBin_s* indlist_bin;
-extern struct omBin_s* naIdeal_bin;
-extern struct omBin_s* snaIdeal_bin;
 extern struct omBin_s* smprec_bin;
 extern struct omBin_s* sip_sring_bin;