Updated stack_alloc.h

src/stack_alloc.h

@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
+/* Copyright (C) 2002-2003 Jean-Marc Valin
+ Copyright (C) 2007-2009 Xiph.Org Foundation */
 /**
  @file stack_alloc.h
  @brief Temporary memory allocation on stack
@@ -15,15 +16,11 @@
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
  
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
@@ -35,6 +32,11 @@
 #ifndef STACK_ALLOC_H
 #define STACK_ALLOC_H
 
+#if (!defined (VAR_ARRAYS) && !defined (USE_ALLOCA))
+#error "Vgmstream requires one of VAR_ARRAYS or USE_ALLOCA be defined to select the temporary allocation mode."
+#endif
+
+#ifdef USE_ALLOCA
 # ifdef WIN32
 #  include <malloc.h>
 # else
@@ -44,6 +46,7 @@
 #   include <stdlib.h>
 #  endif
 # endif
+#endif
 
 /**
  * @def ALIGN(stack, size)
@@ -82,32 +85,28 @@
  * @param type Type of element
  */
 
-#ifdef ENABLE_VALGRIND
-
-#include <valgrind/memcheck.h>
-
-#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
-
-#define PUSH(stack, size, type) (VALGRIND_MAKE_NOACCESS(stack, 1000),ALIGN((stack),sizeof(type)),VALGRIND_MAKE_WRITABLE(stack, ((size)*sizeof(type))),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
-
-#else
-
-#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
-
-#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
-
-#endif
-
 #if defined(VAR_ARRAYS)
-#define VARDECL(var)
+
+#define VARDECL(type, var)
 #define ALLOC(var, size, type) type var[size]
+#define SAVE_STACK
+#define RESTORE_STACK
+#define ALLOC_STACK
+
 #elif defined(USE_ALLOCA)
-#define VARDECL(var) var
+
-#define ALLOC(var, size, type) var = alloca(sizeof(type)*(size))
+#define VARDECL(type, var) type *var
+
+# ifdef WIN32
+#  define ALLOC(var, size, type) var = ((type*)_alloca(sizeof(type)*(size)))
 # else
-#define VARDECL(var) var
+#  define ALLOC(var, size, type) var = ((type*)alloca(sizeof(type)*(size)))
-#define ALLOC(var, size, type) var = PUSH(stack, size, type)
 # endif
 
+#define SAVE_STACK
+#define RESTORE_STACK
+#define ALLOC_STACK
 
-#endif
+#endif /* VAR_ARRAYS */
+
+#endif /* STACK_ALLOC_H */