Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2

[mesa.git] / src / mesa / main / mm.c

diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index d080d6db1b81ce3f5bcdc71b1ce0a0e0743bd793..6f381b02a7faca599610f4d2f41948587383b63f 100644 (file)
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -43,7 +43,7 @@ mmDumpMemInfo(const struct mem_block *heap)
       fprintf(stderr, "\nFree list:\n");
 
       for(p = heap->next_free; p != heap; p = p->next_free) {
-        fprintf(stderr, "  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
+        fprintf(stderr, " FREE Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
                 p->free ? 'F':'.',
                 p->reserved ? 'R':'.');
       }
@@ -53,11 +53,11 @@ mmDumpMemInfo(const struct mem_block *heap)
 }
 
 struct mem_block *
-mmInit(int ofs, int size)
+mmInit(unsigned ofs, unsigned size)
 {
    struct mem_block *heap, *block;
   
-   if (size <= 0) 
+   if (!size) 
       return NULL;
 
    heap = (struct mem_block *) _mesa_calloc(sizeof(struct mem_block));
@@ -85,14 +85,14 @@ mmInit(int ofs, int size)
    block->size = size;
    block->free = 1;
 
-   return (struct mem_block *)heap;
+   return heap;
 }
 
 
 static struct mem_block *
 SliceBlock(struct mem_block *p, 
-           int startofs, int size, 
-           int reserved, int alignment)
+           unsigned startofs, unsigned size, 
+           unsigned reserved, unsigned alignment)
 {
    struct mem_block *newblock;
 
@@ -120,7 +120,7 @@ SliceBlock(struct mem_block *p,
       p = newblock;
    }
 
-   /* break right, also [p, newblock, p->next], then p = newblock*/
+   /* break right, also [p, newblock, p->next] */
    if (size < p->size) {
       newblock = (struct mem_block*) _mesa_calloc(sizeof(struct mem_block));
       if (!newblock)
@@ -151,20 +151,23 @@ SliceBlock(struct mem_block *p,
    p->next_free->prev_free = p->prev_free;
    p->prev_free->next_free = p->next_free;
 
+   p->next_free = 0;
+   p->prev_free = 0;
+
    p->reserved = reserved;
    return p;
 }
 
 
 struct mem_block *
-mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
+mmAllocMem(struct mem_block *heap, unsigned size, unsigned align2, unsigned startSearch)
 {
    struct mem_block *p;
-   const int mask = (1 << align2)-1;
-   int startofs = 0;
-   int endofs;
+   const unsigned mask = (1 << align2)-1;
+   unsigned startofs = 0;
+   unsigned endofs;
 
-   if (!heap || align2 < 0 || size <= 0)
+   if (!heap || !align2 || !size)
       return NULL;
 
    for (p = heap->next_free; p != heap; p = p->next_free) {
@@ -182,6 +185,7 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
    if (p == heap) 
       return NULL;
 
+   assert(p->free);
    p = SliceBlock(p,startofs,size,0,mask+1);
 
    return p;
@@ -189,7 +193,7 @@ mmAllocMem(struct mem_block *heap, int size, int align2, int startSearch)
 
 
 struct mem_block *
-mmFindBlock(struct mem_block *heap, int start)
+mmFindBlock(struct mem_block *heap, unsigned start)
 {
    struct mem_block *p;
 
@@ -211,6 +215,8 @@ Join2Blocks(struct mem_block *p)
 
    if (p->free && p->next->free) {
       struct mem_block *q = p->next;
+
+      assert(p->ofs + p->size == q->ofs);
       p->size += q->size;
 
       p->next = q->next;
@@ -247,7 +253,7 @@ mmFreeMem(struct mem_block *b)
    b->prev_free->next_free = b;
 
    Join2Blocks(b);
-   if (b->prev)
+   if (b->prev != b->heap)
       Join2Blocks(b->prev);
 
    return 0;