Changeset f8519e in git for Singular/mmalloc.c

Timestamp:

Jan 26, 1999, 3:41:42 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

b6285e707366fbd4f332d38d696bd74910bcbe9e

Parents:

8e012379f6186bcc208b49f8710913df381eb5e3

Message:

* added AllocAligned & FreeAligned


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

File:

• Singular/mmalloc.c (modified) (11 diffs)

Singular/mmalloc.c

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mmalloc.c,v 1.10 1999-01-18 17:28:05 Singular Exp $ */
+/* $Id: mmalloc.c,v 1.11 1999-01-26 14:41:38 obachman Exp $ */
 
 /*
@@ -22 +22 @@
 #include "mmprivate.h"
 
+#undef HAVE_ASSUME
+#define HAVE_ASSUME
 
 #ifndef MDEBUG
@@ -166 +168 @@
 
 #else /* MDEBUG */
-
-/**********************************************************************
- *
- * Auxillary routines
- *
- **********************************************************************/
-static void mmMoveDBMCB ( pDBMCB from, pDBMCB to, DBMCB * what )
-{
-  what->prev->next = what->next;
-  if ( what->next != NULL )
-    what->next->prev = what->prev;
-  what->prev = to;
-  what->next = to->next;
-  if (to->next!=NULL)
-    to->next->prev=what;
-  to->next = what;
-}
-
-static void mmMoveDBMCBInto ( pDBMCB to, pDBMCB what )
-{
-  if (to->next !=NULL)
-  {
-    what->next = to->next;
-    what->next->prev = what;
-  }
-  to->next = what;
-  what->prev = to;
-}
-
-static void mmTakeOutDBMCB ( pDBMCB from, pDBMCB what )
-{
-  what->prev->next = what->next;
-  if ( what->next != NULL )
-    what->next->prev = what->prev;
-}
-
-void mmDBInitNewHeapPage(memHeap heap)
-{
-  DBMCB* what = (DBMCB*) heap->current;
-  DBMCB* prev = NULL;
-  size_t size = SizeFromRealSize(heap->size);
-  
-  if (mm_minAddr == 0 || mm_minAddr > (void*) what)
-    mm_minAddr = (void*) what;
-
-  while (what != NULL)
-  {
-    mmFillDBMCB(what, size, heap, MM_FREEFLAG, __FILE__, __LINE__);    
-    mmMoveDBMCBInto(&mm_theDBfree, what);
-    prev = what;
-    what = *((void**) what);
-  }
-  
-  if (mm_maxAddr == 0 || mm_maxAddr < (void*) prev)
-    mm_maxAddr = (void*) prev;
-}
 
 /**********************************************************************
@@ -361 +307 @@
     }
     mm_bytesMalloc -= tmpsize;
-    mmTakeOutDBMCB( &mm_theDBused, what );
+    mmTakeOutDBMCB(what );
     free( what );
     if (BVERBOSE(V_SHOW_MEM)) mmCheckPrint();
@@ -458 +404 @@
 #if SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP
 
-#if 0 
 #ifdef MDEBUG
 void * mmDBAllocAlignedBlock( size_t size, char* f, int l)    
@@ -470 +415 @@
   {
 #ifdef MDEBUG
-    unsigned long ret = (unsigned long) _mmDBAllocBlock(size + 9, f, l);
-#else
-    unsigned long ret = (unsigned long) _mmAllocBlock(size+SIZEOF_DOUBLE+1);
+    unsigned long ret = 
+      (unsigned long) mmDBAllocBlock(size + SIZEOF_DOUBLE + 1, f, l);
+#else
+    unsigned long ret = 
+      (unsigned long) mmAllocBlock(size+SIZEOF_DOUBLE+1);
 #endif
     unsigned char shift = (ret + 1) & (SIZEOF_DOUBLE - 1);
@@ -478 +425 @@
 
     assume(ret != 0);
-
-    return (void*) ((ret + 1) & ~(SIZEOF_DOUBLE - 1));
+    ret = ((ret + 1) & ~(SIZEOF_DOUBLE - 1));
+
+    assume(ret % SIZEOF_DOUBLE == 0);
+
+    return (void*) ret;
   }
   else
@@ -537 +487 @@
   void* good;
 #ifdef MDEBUG
-  good = mmDBAllocBlock(size, f, l);
-#else
-  good = mmAllocBlock(size);
+  good = mmDBAllocAllignedBlock(size, f, l);
+#else
+  good = mmAllocAlignedBlock(size);
 #endif
   
@@ -554 +504 @@
 {
   int i = mmGetIndex(size);
+
+  assume((unsigned long) addr % SIZEOF_DOUBLE == 0);
   
   if (i < 0)
@@ -561 +513 @@
 
 #ifdef MDEBUG    
-    _mmDBFreeBlock(adj_addr - shift, size + SIZEOF_DOUBLE + 1, f, l);
-#else
-    _mmFreeBlock(adj_addr - shift, size + SIZEOF_DOUBLE + 1);
+    mmDBFreeBlock(adj_addr - shift, size + SIZEOF_DOUBLE + 1, f, l);
+#else
+    mmFreeBlock(adj_addr - shift, size + SIZEOF_DOUBLE + 1);
 #endif
   }
@@ -575 +527 @@
   }
 }
-#endif
 
 #endif /* SIZEOF_DOUBLE == SIZEOF_VOIDP + SIZEOF_VOIDP */