Build an allocator for the aligned memory on top of the rtld-private

malloc.

Reviewed by:	kan
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2013-12-06 21:30:31 +00:00
parent a7afea4382
commit dfe296c43a
2 changed files with 32 additions and 0 deletions

View File

@ -352,6 +352,8 @@ Obj_Entry *map_object(int, const char *, const struct stat *);
void *xcalloc(size_t, size_t);
void *xmalloc(size_t);
char *xstrdup(const char *);
void *malloc_aligned(size_t size, size_t align);
void free_aligned(void *ptr);
extern Elf_Addr _GLOBAL_OFFSET_TABLE_[];
extern Elf_Sym sym_zero; /* For resolving undefined weak refs. */

View File

@ -67,3 +67,33 @@ xstrdup(const char *str)
memcpy(copy, str, len);
return (copy);
}
void *
malloc_aligned(size_t size, size_t align)
{
void *mem, *res;
uintptr_t x;
size_t asize, r;
r = round(sizeof(void *), align);
asize = round(size, align) + r;
mem = xmalloc(asize);
x = (uintptr_t)mem;
res = (void *)round(x, align);
*(void **)((uintptr_t)res - sizeof(void *)) = mem;
return (res);
}
void
free_aligned(void *ptr)
{
void *mem;
uintptr_t x;
if (ptr == NULL)
return;
x = (uintptr_t)ptr;
x -= sizeof(void *);
mem = *(void **)x;
free(mem);
}