see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
+/*
+ This file includes the standard functions for memory allocation and
+ disposal. Users should use these functions in their ObjC programs
+ so that they work properly with garbage collectors.
+*/
+
#include "objc-private/common.h"
#include "objc-private/error.h"
#include "objc/objc-api.h"
#include "objc-private/runtime.h"
-/*
- Standard functions for memory allocation and disposal. Users should
- use these functions in their ObjC programs so that they work
- properly with garbage collectors as well as can take advantage of
- the exception/error handling available.
-*/
+#if OBJC_WITH_GC
+#include <gc.h>
void *
objc_malloc (size_t size)
{
- void *res = (void *) (*_objc_malloc) (size);
+ void *res = (void *)(GC_malloc (size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
void *
objc_atomic_malloc (size_t size)
{
- void *res = (void *) (*_objc_atomic_malloc) (size);
+ void *res = (void *)(GC_malloc_atomic (size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
}
void *
-objc_valloc (size_t size)
+objc_realloc (void *mem, size_t size)
+{
+ void *res = (void *)(GC_realloc (mem, size));
+ if (! res)
+ _objc_abort ("Virtual memory exhausted\n");
+ return res;
+}
+
+void *
+objc_calloc (size_t nelem, size_t size)
+{
+ /* Note that GC_malloc returns cleared memory (see documentation) so
+ there is no need to clear it. */
+ void *res = (void *)(GC_malloc (nelem, size));
+ if (! res)
+ _objc_abort ("Virtual memory exhausted\n");
+ return res;
+}
+
+void
+objc_free (void *mem)
+{
+ return;
+}
+
+#else
+
+void *
+objc_malloc (size_t size)
{
- void *res = (void *) (*_objc_valloc) (size);
+ void *res = (void *)(malloc (size));
+ if (! res)
+ _objc_abort ("Virtual memory exhausted\n");
+ return res;
+}
+
+void *
+objc_atomic_malloc (size_t size)
+{
+ void *res = (void *)(malloc (size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
void *
objc_realloc (void *mem, size_t size)
{
- void *res = (void *) (*_objc_realloc) (mem, size);
+ void *res = (void *)(realloc (mem, size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
void *
objc_calloc (size_t nelem, size_t size)
{
- void *res = (void *) (*_objc_calloc) (nelem, size);
+ void *res = (void *)(calloc (nelem, size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;
void
objc_free (void *mem)
{
- (*_objc_free) (mem);
+ free (mem);
}
-/*
- Hook functions for memory allocation and disposal. This makes it
- easy to substitute garbage collection systems such as Boehm's GC by
- assigning these function pointers to the GC's allocation routines.
- By default these point to the ANSI standard malloc, realloc, free,
- etc.
-
- Users should call the normal objc routines above for memory
- allocation and disposal within their programs.
-*/
+#endif /* !OBJC_WITH_GC */
+
+/* The rest of the file contains deprecated code. */
#if OBJC_WITH_GC
-#include <gc.h>
-/* FIXME: The following sounds pointless because the GC_malloc
- documentation says that it returns memory that is already zeroed!
-*/
-static void *
-GC_calloc (size_t nelem, size_t size)
+void *
+objc_valloc (size_t size)
{
- void *p = GC_malloc (nelem * size);
- if (! p)
- _objc_abort ("Virtual memory exhausted!\n");
-
- memset (p, 0, nelem * size);
- return p;
+ void *res = (void *)(GC_malloc (size));
+ if (! res)
+ _objc_abort ("Virtual memory exhausted\n");
+ return res;
}
-static void
-noFree (void *p)
+#else
+
+void *
+objc_valloc (size_t size)
{
+ void *res = (void *)(malloc (size));
+ if (! res)
+ _objc_abort ("Virtual memory exhausted\n");
+ return res;
}
-void *(*_objc_malloc) (size_t) = GC_malloc;
-void *(*_objc_atomic_malloc) (size_t) = GC_malloc_atomic;
-void *(*_objc_valloc) (size_t) = GC_malloc;
-void *(*_objc_realloc) (void *, size_t) = GC_realloc;
-void *(*_objc_calloc) (size_t, size_t) = GC_calloc;
-void (*_objc_free) (void *) = noFree;
+#endif /* !OBJC_WITH_GC */
-#else /* !OBJC_WITH_GC */
+/*
+ Hook functions for memory allocation and disposal. Deprecated
+ and currently unused.
+*/
void *(*_objc_malloc) (size_t) = malloc;
void *(*_objc_atomic_malloc) (size_t) = malloc;
void *(*_objc_realloc) (void *, size_t) = realloc;
void *(*_objc_calloc) (size_t, size_t) = calloc;
void (*_objc_free) (void *) = free;
-
-
-#endif /* !OBJC_WITH_GC */
#define _C_VECTOR '!'
#define _C_COMPLEX 'j'
-
#include "deprecated/objc_error.h"
-
/* For every class which happens to have statically allocated instances in
this module, one OBJC_STATIC_INSTANCES is allocated by the compiler.
INSTANCES is NULL terminated and points to all statically allocated
objc_EXPORT id (*_objc_object_dispose)(id object);
/*
-** Standard functions for memory allocation and disposal.
-** Users should use these functions in their ObjC programs so
-** that they work properly with garbage collectors as well as
-** can take advantage of the exception/error handling available.
+ Standard functions for memory allocation and disposal. Users should
+ use these functions in their ObjC programs so that they work so that
+ they work properly with garbage collectors.
*/
void *
objc_malloc(size_t size);
+/* FIXME: Shouldn't the following be called objc_malloc_atomic ? The
+ GC function is GC_malloc_atomic() which makes sense.
+ */
void *
objc_atomic_malloc(size_t size);
-void *
-objc_valloc(size_t size);
-
void *
objc_realloc(void *mem, size_t size);
void
objc_free(void *mem);
-/*
-** Hook functions for memory allocation and disposal.
-** This makes it easy to substitute garbage collection systems
-** such as Boehm's GC by assigning these function pointers
-** to the GC's allocation routines. By default these point
-** to the ANSI standard malloc, realloc, free, etc.
-**
-** Users should call the normal objc routines above for
-** memory allocation and disposal within their programs.
-*/
-objc_EXPORT void *(*_objc_malloc)(size_t);
-objc_EXPORT void *(*_objc_atomic_malloc)(size_t);
-objc_EXPORT void *(*_objc_valloc)(size_t);
-objc_EXPORT void *(*_objc_realloc)(void *, size_t);
-objc_EXPORT void *(*_objc_calloc)(size_t, size_t);
-objc_EXPORT void (*_objc_free)(void *);
+#include "deprecated/objc_valloc.h"
+#include "deprecated/objc_malloc.h"
/*
** Hooks for method forwarding. This makes it easy to substitute a
projects / thirdparty / gcc.git / commitdiff
