2010-05-12 Rodrigo Kumpera <rkumpera@novell.com>

[mono.git] / mono / metadata / icall.c

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 5285a79f2b121c49b3c6d29327b26716e3e295ba..b8fd12ce7627549b2d0ba2b1c923bd54956b2860 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -67,6 +67,7 @@
 #include <mono/metadata/security-core-clr.h>
 #include <mono/metadata/mono-perfcounters.h>
 #include <mono/metadata/mono-debug.h>
+#include <mono/metadata/mono-ptr-array.h>
 #include <mono/io-layer/io-layer.h>
 #include <mono/utils/strtod.h>
 #include <mono/utils/monobitset.h>
@@ -89,49 +90,6 @@ static MonoReflectionAssembly* ves_icall_System_Reflection_Assembly_GetCallingAs
 static MonoArray*
 type_array_from_modifiers (MonoImage *image, MonoType *type, int optional);
 
-/* This is an implementation of a growable pointer array that avoids doing memory allocations for small sizes.
- * It works by allocating an initial small array on stack and only going to malloc'd memory if needed. 
- */
-typedef struct {
-       void **data;
-       int size;
-       int capacity;
-} MonoPtrArray;
-
-#define MONO_PTR_ARRAY_MAX_ON_STACK (16)
-
-#define mono_ptr_array_init(ARRAY, INITIAL_SIZE) do {\
-       (ARRAY).size = 0; \
-       (ARRAY).capacity = MAX (INITIAL_SIZE, MONO_PTR_ARRAY_MAX_ON_STACK); \
-       (ARRAY).data = INITIAL_SIZE > MONO_PTR_ARRAY_MAX_ON_STACK ? mono_gc_alloc_fixed (sizeof (void*) * INITIAL_SIZE, NULL) : g_newa (void*, MONO_PTR_ARRAY_MAX_ON_STACK); \
-} while (0)
-
-#define mono_ptr_array_destroy(ARRAY) do {\
-       if ((ARRAY).capacity > MONO_PTR_ARRAY_MAX_ON_STACK) \
-               mono_gc_free_fixed ((ARRAY).data); \
-} while (0)
-
-#define mono_ptr_array_append(ARRAY, VALUE) do { \
-       if ((ARRAY).size >= (ARRAY).capacity) {\
-               void *__tmp = mono_gc_alloc_fixed (sizeof (void*) * (ARRAY).capacity * 2, NULL); \
-               memcpy (__tmp, (ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
-               if ((ARRAY).capacity > MONO_PTR_ARRAY_MAX_ON_STACK)     \
-                       mono_gc_free_fixed ((ARRAY).data);      \
-               (ARRAY).data = __tmp;                                                                                   \
-               (ARRAY).capacity *= 2;\
-       }\
-       ((ARRAY).data [(ARRAY).size++] = VALUE); \
-} while (0)
-
-#define mono_ptr_array_set(ARRAY, IDX, VALUE) do { \
-       ((ARRAY).data [(IDX)] = VALUE); \
-} while (0)
-       
-#define mono_ptr_array_get(ARRAY, IDX) ((ARRAY).data [(IDX)])
-
-#define mono_ptr_array_size(ARRAY) ((ARRAY).size)
-
-
 static inline MonoBoolean
 is_generic_parameter (MonoType *type)
 {