Add _mesa_exec_malloc() and _mesa_exec_free() for allocating

executable memory.  Based on Thomas Hellstrom's patch.
TODO: glapi.c also needs this, but cannot access this code.

7 files changed, 4 insertions, 283 deletions

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 7c217f3d1d7..35f7fd8a129 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -4,7 +4,6 @@ MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
 COMMON_SOURCES = \
         ../../common/driverfuncs.c \
-        ../common/mm.c \
         ../common/utils.c \
         ../common/texmem.c \
         ../common/vblank.c \
diff --git a/src/mesa/drivers/dri/common/mm.c b/src/mesa/drivers/dri/common/mm.c
deleted file mode 100644
index 5781d9936c2..00000000000
--- a/src/mesa/drivers/dri/common/mm.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * GLX Hardware Device Driver common code
- * Copyright (C) 1999 Wittawat Yamwong
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-/* $XFree86: xc/lib/GL/mesa/src/drv/common/mm.c,v 1.4 2002/10/30 12:51:27 alanh Exp $ */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "mm.h"
-
-
-void mmDumpMemInfo( memHeap_t *heap )
-{
-   TMemBlock *p;
-
-   fprintf(stderr, "Memory heap %p:\n", (void *)heap);
-   if (heap == 0) {
-      fprintf(stderr, "  heap == 0\n");
-   } else {
-      p = (TMemBlock *)heap;
-      while (p) {
-	 fprintf(stderr, "  Offset:%08x, Size:%08x, %c%c\n",p->ofs,p->size,
-		 p->free ? '.':'U',
-		 p->reserved ? 'R':'.');
-	 p = p->next;
-      }
-   }
-   fprintf(stderr, "End of memory blocks\n");
-}
-
-memHeap_t *mmInit(int ofs,
-		  int size)
-{
-   PMemBlock blocks;
-  
-   if (size <= 0) {
-      return NULL;
-   }
-   blocks = (TMemBlock *) calloc(1,sizeof(TMemBlock));
-   if (blocks) {
-      blocks->ofs = ofs;
-      blocks->size = size;
-      blocks->free = 1;
-      return (memHeap_t *)blocks;
-   } else
-      return NULL;
-}
-
-
-static TMemBlock* SliceBlock(TMemBlock *p, 
-			     int startofs, int size, 
-			     int reserved, int alignment)
-{
-   TMemBlock *newblock;
-
-   /* break left */
-   if (startofs > p->ofs) {
-      newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
-      if (!newblock)
-	 return NULL;
-      newblock->ofs = startofs;
-      newblock->size = p->size - (startofs - p->ofs);
-      newblock->free = 1;
-      newblock->next = p->next;
-      p->size -= newblock->size;
-      p->next = newblock;
-      p = newblock;
-   }
-
-   /* break right */
-   if (size < p->size) {
-      newblock = (TMemBlock*) calloc(1,sizeof(TMemBlock));
-      if (!newblock)
-	 return NULL;
-      newblock->ofs = startofs + size;
-      newblock->size = p->size - size;
-      newblock->free = 1;
-      newblock->next = p->next;
-      p->size = size;
-      p->next = newblock;
-   }
-
-   /* p = middle block */
-   p->align = alignment;
-   p->free = 0;
-   p->reserved = reserved;
-   return p;
-}
-
-PMemBlock mmAllocMem( memHeap_t *heap, int size, int align2, int startSearch)
-{
-   int mask,startofs,endofs;
-   TMemBlock *p;
-
-   if (!heap || align2 < 0 || size <= 0)
-      return NULL;
-   mask = (1 << align2)-1;
-   startofs = 0;
-   p = (TMemBlock *)heap;
-   while (p) {
-      if ((p)->free) {
-	 startofs = (p->ofs + mask) & ~mask;
-	 if ( startofs < startSearch ) {
-	    startofs = startSearch;
-	 }
-	 endofs = startofs+size;
-	 if (endofs <= (p->ofs+p->size))
-	    break;
-      }
-      p = p->next;
-   }
-   if (!p)
-      return NULL;
-   p = SliceBlock(p,startofs,size,0,mask+1);
-   p->heap = heap;
-   return p;
-}
-
-static __inline__ int Join2Blocks(TMemBlock *p)
-{
-   if (p->free && p->next && p->next->free) {
-      TMemBlock *q = p->next;
-      p->size += q->size;
-      p->next = q->next;
-      free(q);
-      return 1;
-   }
-   return 0;
-}
-
-int mmFreeMem(PMemBlock b)
-{
-   TMemBlock *p,*prev;
-
-   if (!b)
-      return 0;
-   if (!b->heap) {
-      fprintf(stderr, "no heap\n");
-      return -1;
-   }
-   p = b->heap;
-   prev = NULL;
-   while (p && p != b) {
-      prev = p;
-      p = p->next;
-   }
-   if (!p || p->free || p->reserved) {
-      if (!p)
-	 fprintf(stderr, "block not found in heap\n");
-      else if (p->free)
-	 fprintf(stderr, "block already free\n");
-      else
-	 fprintf(stderr, "block is reserved\n");
-      return -1;
-   }
-   p->free = 1;
-   Join2Blocks(p);
-   if (prev)
-      Join2Blocks(prev);
-   return 0;
-}
-
-
-void mmDestroy(memHeap_t *heap)
-{
-   TMemBlock *p,*q;
-
-   if (!heap)
-      return;
-   p = (TMemBlock *)heap;
-   while (p) {
-      q = p->next;
-      free(p);
-      p = q;
-   }
-}
diff --git a/src/mesa/drivers/dri/common/mm.h b/src/mesa/drivers/dri/common/mm.h
deleted file mode 100644
index 176910d70b6..00000000000
--- a/src/mesa/drivers/dri/common/mm.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * GLX Hardware Device Driver common code
- * Copyright (C) 1999 Keith Whitwell
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef MM_INC
-#define MM_INC
-
-struct mem_block_t {
-  struct mem_block_t *next;
-  struct mem_block_t *heap;
-  int ofs,size;
-  int align;
-  unsigned int free:1;
-  unsigned int reserved:1;
-};
-typedef struct mem_block_t TMemBlock;
-typedef struct mem_block_t *PMemBlock;
-
-/* a heap is just the first block in a chain */
-typedef struct mem_block_t memHeap_t;
-
-static __inline__ int mmBlockSize(PMemBlock b)
-{ return b->size; }
-
-static __inline__ int mmOffset(PMemBlock b)
-{ return b->ofs; }
-
-/* 
- * input: total size in bytes
- * return: a heap pointer if OK, NULL if error
- */
-memHeap_t *mmInit( int ofs, int size );
-
-/*
- * Allocate 'size' bytes with 2^align2 bytes alignment,
- * restrict the search to free memory after 'startSearch'
- * depth and back buffers should be in different 4mb banks
- * to get better page hits if possible
- * input:	size = size of block
- *       	align2 = 2^align2 bytes alignment
- *		startSearch = linear offset from start of heap to begin search
- * return: pointer to the allocated block, 0 if error
- */
-PMemBlock  mmAllocMem( memHeap_t *heap, int size, int align2, 
-		       int startSearch );
-
-/*
- * Free block starts at offset
- * input: pointer to a block
- * return: 0 if OK, -1 if error
- */
-int  mmFreeMem( PMemBlock b );
-
-/*
- * destroy MM
- */
-void mmDestroy( memHeap_t *mmInit );
-
-/* For debuging purpose. */
-void mmDumpMemInfo( memHeap_t *mmInit );
-
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
index d9af6bf5f85..61a757c870d 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
@@ -1172,7 +1172,7 @@ static void free_funcs( struct dynfn *l )
    struct dynfn *f, *tmp;
    foreach_s (f, tmp, l) {
       remove_from_list( f );
-      ALIGN_FREE( f->code );
+      _mesa_exec_free( f->code );
       FREE( f );
    }
 }
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
index 82cbda2742b..32a21c48977 100644
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
@@ -59,7 +59,7 @@ do {							\
    insert_at_head( &CACHE, dfn );			\
    dfn->key[0] = key[0];					\
    dfn->key[1] = key[1];					\
-   dfn->code = ALIGN_MALLOC( end - start, 16 );		\
+   dfn->code = _mesa_exec_malloc( end - start );		\
    memcpy (dfn->code, start, end - start);		\
 }							\
 while ( 0 )
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
index c734ab8d5ab..537a1c03520 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
@@ -1038,7 +1038,7 @@ static void free_funcs( struct dynfn *l )
    struct dynfn *f, *tmp;
    foreach_s (f, tmp, l) {
       remove_from_list( f );
-      ALIGN_FREE( f->code );
+      _mesa_exec_free( f->code );
       FREE( f );
    }
 }
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
index 950d530ae55..a7d5b8334df 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
@@ -56,7 +56,7 @@ do {							\
    char *end = (char *)&FUNC##_end;			\
    insert_at_head( &CACHE, dfn );			\
    dfn->key = key;					\
-   dfn->code = ALIGN_MALLOC( end - start, 16 );		\
+   dfn->code = _mesa_exec_malloc( end - start );		\
    memcpy (dfn->code, start, end - start);		\
 }							\
 while ( 0 )