generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vpx_mem: Refactor code

Browse Source 
Change-Id: I2da9cd5da48ae97e770bccfd1233bcc70b484688
(cherry picked from aom: 83c95f5 aom_mem: Refactor code)
This commit is contained in:
Urvang Joshi 2016-07-25 17:12:14 -07:00 committed by James Zern
parent a6efe6d437
commit 69c5ba1910
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
vpx_mem/vpx_mem.c
View File

@ -15,35 +15,42 @@
#include "include/vpx_mem_intrnl.h" #include "include/vpx_mem_intrnl.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
static INLINE size_t *GetMallocAddressLocation(void *const mem) {
return ((size_t *)mem) - 1;
}
static INLINE void SetActualMallocAddress(void *const mem,
const void *const malloc_addr) {
size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
*malloc_addr_location = (size_t)malloc_addr;
}
static INLINE void *GetActualMallocAddress(void *const mem) {
size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
return (void *)(*malloc_addr_location);
}
void *vpx_memalign(size_t align, size_t size) { void *vpx_memalign(size_t align, size_t size) {
void *addr, *x = NULL; void *x = NULL;
void *const addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
addr = malloc(size + align - 1 + ADDRESS_STORAGE_SIZE);
if (addr) { if (addr) {
x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align); x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align);
/* save the actual malloc address */ SetActualMallocAddress(x, addr);
((size_t *)x)[-1] = (size_t)addr;
} }
return x; return x;
} }
void *vpx_malloc(size_t size) { return vpx_memalign(DEFAULT_ALIGNMENT, size); } void *vpx_malloc(size_t size) { return vpx_memalign(DEFAULT_ALIGNMENT, size); }
void *vpx_calloc(size_t num, size_t size) { void *vpx_calloc(size_t num, size_t size) {
void *x; const size_t total_size = num * size;
void *const x = vpx_malloc(total_size);
x = vpx_memalign(DEFAULT_ALIGNMENT, num * size); if (x) memset(x, 0, total_size);
if (x) memset(x, 0, num * size);
return x; return x;
} }
void *vpx_realloc(void *memblk, size_t size) { void *vpx_realloc(void *memblk, size_t size) {
void *addr, *new_addr = NULL; void *new_addr = NULL;
int align = DEFAULT_ALIGNMENT;
/* /*
The realloc() function changes the size of the object pointed to by The realloc() function changes the size of the object pointed to by
@ -58,19 +65,13 @@ void *vpx_realloc(void *memblk, size_t size) {
else if (!size) else if (!size)
vpx_free(memblk); vpx_free(memblk);
else { else {
addr = (void *)(((size_t *)memblk)[-1]); void *addr = GetActualMallocAddress(memblk);
memblk = NULL; memblk = NULL;
addr = realloc(addr, size + DEFAULT_ALIGNMENT + ADDRESS_STORAGE_SIZE);
new_addr = realloc(addr, size + align + ADDRESS_STORAGE_SIZE); if (addr) {
new_addr = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE,
if (new_addr) { DEFAULT_ALIGNMENT);
addr = new_addr; SetActualMallocAddress(new_addr, addr);
new_addr =
(void *)(((size_t)((unsigned char *)new_addr + ADDRESS_STORAGE_SIZE) +
(align - 1)) &
(size_t)-align);
/* save the actual malloc address */
((size_t *)new_addr)[-1] = (size_t)addr;
} }
} }
@ -79,7 +80,7 @@ void *vpx_realloc(void *memblk, size_t size) {
void vpx_free(void *memblk) { void vpx_free(void *memblk) {
if (memblk) { if (memblk) {
void *addr = (void *)(((size_t *)memblk)[-1]); void *addr = GetActualMallocAddress(memblk);
free(addr); free(addr);
} }
} }