Implemented the allocation type stuff on OS X.

This commit is contained in:
Pietro Gagliardi 2015-05-08 17:29:36 -04:00
parent a6c86cc863
commit 33f41d6c37
1 changed files with 15 additions and 7 deletions

View File

@ -8,33 +8,41 @@ void initAlloc(void)
#define UINT8(p) ((uint8_t *) (p))
#define PVOID(p) ((void *) (p))
#define DATA(p) PVOID(UINT8(p) + sizeof (size_t))
#define BASE(p) PVOID(UINT8(p) - sizeof (size_t))
#define EXTRA (sizeof (size_t) + sizeof (const char **))
#define DATA(p) PVOID(UINT8(p) + EXTRA)
#define BASE(p) PVOID(UINT8(p) - EXTRA)
#define SIZE(p) ((size_t *) (p))
#define CCHAR(p) ((const char **) (p))
#define TYPE(p) CCHAR(UINT8(p) + sizeof (size_t))
void *uiAlloc(size_t size)
void uninitAlloc(void)
{
}
void *uiAlloc(size_t size, const char *type)
{
void *out;
out = malloc(sizeof (size_t) + size);
out = malloc(EXTRA + size);
if (out == NULL) {
fprintf(stderr, "memory exhausted in uiAlloc()\n");
abort();
}
memset(DATA(out), 0, size);
*SIZE(out) = size;
*TYPE(out) = type;
return DATA(out);
}
void *uiRealloc(void *p, size_t new)
void *uiRealloc(void *p, size_t new, const char *type)
{
void *out;
size_t *s;
if (p == NULL)
return uiAlloc(new);
return uiAlloc(new, type);
p = BASE(p);
out = realloc(p, sizeof (size_t) + new);
out = realloc(p, EXTRA + new);
if (out == NULL) {
fprintf(stderr, "memory exhausted in uiRealloc()\n");
abort();