The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / common / realloc.c

diff --git a/libsrc/common/realloc.c b/libsrc/common/realloc.c
index 32c05f46f8dbac520051accea1e41b6c6077ef4f..f46d9a55967c4ae4276126e373bd75da52d52d0b 100644 (file)
--- a/libsrc/common/realloc.c
+++ b/libsrc/common/realloc.c
@@ -1,22 +1,50 @@
-/*
- * realloc.c
- *
- * Ullrich von Bassewitz, 06.06.1998
- */
+/*****************************************************************************/
+/*                                                                           */
+/*                                 realloc.c                                 */
+/*                                                                           */
+/*               Change the size of an allocated memory block                */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 1998-2004 Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@musoftware.de                                            */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
 
 
 
 #include <stdlib.h>
 #include <string.h>
-#include "_heap.h"
+#include <_heap.h>
 
 
 
-void* realloc (void* block, size_t size)
+void* __fastcall__ realloc (void* block, size_t size)
 {
-    unsigned* b;
-    unsigned* newblock;
+    struct usedblock* b;
+    struct usedblock* newblock;
     unsigned oldsize;
+    unsigned newhptr;
     int diff;
 
     /* Check the block parameter */
@@ -29,7 +57,7 @@ void* realloc (void* block, size_t size)
     if (size == 0) {
        /* Block is not NULL, but size is: free the block */
        free (block);
-       return 0;
+       return 0;
     }
 
     /* Make the internal used size from the given size */
@@ -38,22 +66,26 @@ void* realloc (void* block, size_t size)
         size = sizeof (struct freeblock);
     }
 
-    /* Get a pointer to the real block, get the old block size */
-    b = (unsigned*) (((int) block) - 2);
-    oldsize = *b;
+    /* The word below the user block contains a pointer to the start of the
+     * raw memory block. The first word of this raw memory block is the full
+     * size of the block. Get a pointer to the real block, get the old block
+     * size.
+     */
+    b = (((struct usedblock*) block) - 1)->start;
+    oldsize = b->size;
 
     /* Get the size difference as a signed quantity */
     diff = size - oldsize;
 
     /* Is the block at the current heap top? */
-    if (((int) b) + oldsize == ((int) _hptr)) {
+    if (((unsigned) b) + oldsize == ((unsigned) _heapptr)) {
        /* Check if we've enough memory at the heap top */
-       int newhptr;
-       newhptr = ((int) _hptr) + diff;
-       if (newhptr <= ((int) _hend)) {
+       newhptr = ((unsigned) _heapptr) + diff;
+       if (newhptr <= ((unsigned) _heapend)) {
            /* Ok, there's space enough */
-                   _hptr = (unsigned*) newhptr;
-           *b = size;
+                   _heapptr = (unsigned*) newhptr;
+            b->size = size;
+            b->start = b;
            return block;
        }
     }
@@ -62,7 +94,19 @@ void* realloc (void* block, size_t size)
      * room left. Try to allocate a new block and copy the data.
      */
     if (newblock = malloc (size)) {
-       memcpy (newblock, block, oldsize - 2);
+
+       /* Adjust the old size to the user visible portion */
+       oldsize -= HEAP_ADMIN_SPACE;
+
+       /* If the new block is larger than the old one, copy the old
+        * data only
+        */
+       if (size > oldsize) {
+           size = oldsize;
+       }
+
+       /* Copy the block data */
+       memcpy (newblock, block, size);
        free (block);
     }
     return newblock;
@@ -71,8 +115,3 @@ void* realloc (void* block, size_t size)
 
 
 
-
-
-
-
-