From 1c236fd5c734b7388d7625ce8c3d4b2d6da9fcfb Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 18 Oct 2005 15:01:19 +0000 Subject: Lots of clean-ups. Replace __inline__ with INLINE macro. Use the _mesa_calloc(), _mesa_free() functions. Clean-up formatting, doxygen-style comments. --- src/mesa/main/execmem.c | 57 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) (limited to 'src/mesa/main/execmem.c') diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c index 17ad06c90a..89deaafad3 100644 --- a/src/mesa/main/execmem.c +++ b/src/mesa/main/execmem.c @@ -1,3 +1,36 @@ +/* + * Mesa 3-D graphics library + * Version: 6.5 + * + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * + * 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 + * BRIAN PAUL 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. + */ + + +/** + * \file exemem.c + * Functions for allocating executable memory. + * + * \author Keith Whitwell + */ + + #include "imports.h" #include "glthread.h" @@ -5,9 +38,15 @@ #ifdef __linux__ +/* + * Allocate a large block of memory which can hold code then dole it out + * in pieces by means of the generic memory manager code. +*/ + + #include #include -#include +#include "mm.h" #define EXEC_HEAP_SIZE (128*1024) @@ -16,7 +55,9 @@ _glthread_DECLARE_STATIC_MUTEX(exec_mutex); static memHeap_t *exec_heap = NULL; static unsigned char *exec_mem = NULL; -static void init_heap( void ) + +static void +init_heap(void) { if (!exec_heap) exec_heap = mmInit( 0, EXEC_HEAP_SIZE ); @@ -29,7 +70,7 @@ static void init_heap( void ) void * -_mesa_exec_malloc( GLuint size ) +_mesa_exec_malloc(GLuint size) { PMemBlock block = NULL; void *addr = NULL; @@ -50,6 +91,7 @@ _mesa_exec_malloc( GLuint size ) return addr; } + void _mesa_exec_free(void *addr) @@ -66,13 +108,19 @@ _mesa_exec_free(void *addr) _glthread_UNLOCK_MUTEX(exec_mutex); } + #else +/* + * Just use regular memory. + */ + void * -_mesa_exec_malloc( GLuint size ) +_mesa_exec_malloc(GLuint size) { return _mesa_malloc( size ); } + void _mesa_exec_free(void *addr) @@ -80,4 +128,5 @@ _mesa_exec_free(void *addr) _mesa_free(addr); } + #endif -- cgit v1.2.3