Changeset 8ae02b9 in git

Timestamp:

Oct 16, 2007, 10:45:35 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d011a2dfd5880603d857e304e27421ab9d269fed

Parents:

7cb56a987e093ab0f0d2d3ae33f0b891c39bf5fb

Message:

*hannes: memcpy cannot handle overlaps


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

Location:

omalloc

Files:

• dlmalloc.c (modified) (4 diffs)
• dlmalloc.h (modified) (4 diffs)

omalloc/dlmalloc.c

@@ -4 +4 @@
  *  This was obtained by taking cutting out the end of malloc.c
  *
- *  Version: $Id: dlmalloc.c,v 1.4 2001-04-30 09:01:57 Singular Exp $
+ *  Version: $Id: dlmalloc.c,v 1.5 2007-10-16 08:45:35 Singular Exp $
  *******************************************************************/
 #ifdef HAVE_CONFIG_H
@@ -1675 +1675 @@
             newsize += prevsize + nextsize;
             newmem = chunk2mem(newp);
-            MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ);
+            MALLOC_MOVE(newmem, oldmem, oldsize - SIZE_SZ);
             top = chunk_at_offset(newp, nb);
             set_head(top, (newsize - nb) | PREV_INUSE);
@@ -1691 +1691 @@
           newsize += nextsize + prevsize;
           newmem = chunk2mem(newp);
-          MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ);
+          MALLOC_MOVE(newmem, oldmem, oldsize - SIZE_SZ);
           goto split;
         }
@@ -1703 +1703 @@
         newsize += prevsize;
         newmem = chunk2mem(newp);
-        MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ);
+        MALLOC_MOVE(newmem, oldmem, oldsize - SIZE_SZ);
         goto split;
       }

omalloc/dlmalloc.h

@@ -4 +4 @@
  *  This was obtained by taking cutting out the beginning of malloc.c
  *
- *  Version: $Id: dlmalloc.h,v 1.10 2005-11-08 13:53:37 bricken Exp $
+ *  Version: $Id: dlmalloc.h,v 1.11 2007-10-16 08:45:35 Singular Exp $
  *******************************************************************/
 #ifndef DL_MALLOC_H
@@ -455 +455 @@
 } while(0)
 
+#define MALLOC_MOVE(dest,src,nbytes)                                          \
+do {                                                                          \
+  INTERNAL_SIZE_T mcsz = (nbytes);                                            \
+  if(mcsz <= 9*sizeof(mcsz)) {                                                \
+    INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) (src);                        \
+    INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) (dest);                       \
+    if(mcsz >= 5*sizeof(mcsz)) {     *mcdst++ = *mcsrc++;                     \
+                                     *mcdst++ = *mcsrc++;                     \
+      if(mcsz >= 7*sizeof(mcsz)) {   *mcdst++ = *mcsrc++;                     \
+                                     *mcdst++ = *mcsrc++;                     \
+        if(mcsz >= 9*sizeof(mcsz)) { *mcdst++ = *mcsrc++;                     \
+                                     *mcdst++ = *mcsrc++; }}}                 \
+                                     *mcdst++ = *mcsrc++;                     \
+                                     *mcdst++ = *mcsrc++;                     \
+                                     *mcdst   = *mcsrc  ;                     \
+  } else memmove(dest, src, mcsz);                                            \
+} while(0)
+
 #else /* !USE_MEMCPY */
 
@@ -493 +511 @@
   }                                                                           \
 } while(0)
+
+#define MALLOC_MOVE(dest,src,nbytes) MALLOC_COPY(dest,src,nbytes)
 
 #endif
@@ -849 +869 @@
 
 #if __STD_C
-  #ifndef __MACH__ 
+  #ifndef __MACH__
     extern Void_t*     sbrk(ptrdiff_t);
-  #else 
+  #else
     extern void    *sbrk(int);
   #endif