Changeset 393d6b in git

Timestamp:

Jun 30, 1999, 5:42:14 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a63fdcb3c3e17833781f09f433f3a27e5b6618cf

Parents:

3932494a14100776dd25479d8a30fd56fb8ea293

Message:

* hannes: 64 bit changes


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

Location:

Singular

Files:

• LIB/standard.lib (modified) (1 diff)
• kstd1.cc (modified) (3 diffs)
• mmisc.c (modified) (14 diffs)
• mmprivate.h (modified) (2 diffs)

Singular/LIB/standard.lib

@@ -1 @@
-// $Id: standard.lib,v 1.33 1999-06-30 14:14:31 Singular Exp $
+// $Id: standard.lib,v 1.34 1999-06-30 15:42:14 Singular Exp $
 //////////////////////////////////////////////////////////////////////////////
 
-version="$Id: standard.lib,v 1.33 1999-06-30 14:14:31 Singular Exp $";
+version="$Id: standard.lib,v 1.34 1999-06-30 15:42:14 Singular Exp $";
 info="
 LIBRARY: standard.lib   PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP
 
  stdfglm(ideal[,ord])   standard basis of the ideal via fglm [and ordering ord]
- stdhilb(ideal)         standard basis of the ideal using the Hilbert function
+ stdhilb(ideal[,h])     standard basis of the ideal using the Hilbert function
  groebner(ideal/module) standard basis of ideal or module using a
                         heuristically choosen method

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.34 1999-04-30 10:39:53 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.35 1999-06-30 15:42:11 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -97 +97 @@
 #ifdef KDEBUG
   pTest((*h).p);
-  pTest(*with);
+  //pTest(*with);
 #endif
 
@@ -1791 +1791 @@
   }
 #ifdef KDEBUG
-  int i;
-  for (i=0; i<IDELEMS(r); i++) pTest(r->m[i]);
+  idTest(r);
 #endif
   if (toReset)

Singular/mmisc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmisc.c,v 1.5 1999-03-19 17:42:31 obachman Exp $ */
+/* $Id: mmisc.c,v 1.6 1999-06-30 15:42:12 Singular Exp $ */
 
 /*
@@ -91 +91 @@
 {
   int mm_bytesAlloc = mm_bytesValloc + mm_bytesMalloc;
-  
+
   if ( ABS(mm_bytesAlloc - mm_printMark)>(100*1024) )
   {
@@ -104 +104 @@
 void mmPrintStat()
 {
-  int i, l, a;
-  
-#ifdef HAVE_SBRK  
+  int i;
+  long l,a;
+
+#ifdef HAVE_SBRK
   printf("Physical:%dk ", (mmMemPhysical()+ 1023)/1024);
-#endif  
+#endif
   printf("Alloc:%dk ", (mmMemAlloc() + 1023)/1024);
   printf("Used:%dk ", (mmMemUsed()+ 1023)/1024);
@@ -124 +125 @@
     l = mmListLength(mm_theList[i].pages);
     a = mmListLength(mm_theList[i].current);
-    printf("%d\t%d\t%d\t%d\t%d\t%d\n",
+    printf("%d\t%ld\t%ld\t%d\t%ld\t%ld\n",
            i, mmGetHeapBlockSize(&mm_theList[i]), l,
            (l != 0 ? ((int) ((1.0 -
@@ -164 +165 @@
 /**********************************************************************
  *
- * Some operations on linked lists of memory 
+ * Some operations on linked lists of memory
  *
  **********************************************************************/
@@ -172 +173 @@
   void* nlist;
   void* olist;
-  
+
   if (list == NULL) return NULL;
 
   nlist = *((void**) list);
   olist = list;
-  
+
   if (list == element) return nlist;
-  
+
   while (nlist != NULL && nlist != element)
   {
@@ -185 +186 @@
     nlist = *((void**) list);
   }
-  
+
   if (nlist != NULL) *((void**) list) = *((void**) nlist);
-  
+
   return olist;
 }
@@ -216 +217 @@
   if (addr == NULL)
     return (list == NULL);
-  
+
   while (list != NULL)
   {
@@ -229 +230 @@
   void* l1 = list;
   void* l2;
-  
+
   int l = 0, i;
 
@@ -247 +248 @@
   return NULL;
 }
-    
+
 
 int mmGListLength(void* list, int next)
@@ -274 +275 @@
   if (addr == NULL)
     return (list == NULL);
-  
+
   while (list != NULL)
   {
@@ -287 +288 @@
   void* l1 = list;
   void* l2;
-  
+
   int l = 0, i;
 
@@ -327 +328 @@
 {
   assume(l >= 0);
-  
+
   while (l)
   {
@@ -338 +339 @@
 {
   assume(l >= 0);
-  
+
   while (l)
   {

Singular/mmprivate.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmprivate.h,v 1.9 1999-04-15 09:57:04 obachman Exp $ */
+/* $Id: mmprivate.h,v 1.10 1999-06-30 15:42:13 Singular Exp $ */
 /*
 * ABSTRACT
@@ -50 +50 @@
 
 #define DebugOffsetFront (sizeof(DBMCB) - sizeof(void*))
-#define DebugOffsetBack 4
+#define DebugOffsetBack SIZEOF_VOIDP
 
 #define SizeFromRealSize( size ) (size - DebugOffsetFront - DebugOffsetBack)