External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Fix test allocator to provide fundamental alignment

Browse Source 
Previously test allocator only guaranteed alignment enough for a pointer.

On some platforms (e.g. SPARC) double has to be aligned to 8 bytes but pointers
can have a size of 4 bytes. This commit increases allocation header to fix that.

In practical terms the allocation header is now always 8 bytes.
This commit is contained in:
Arseny Kapoulkine 2015-07-25 17:04:17 -04:00
parent 66f242a4a9
commit e8fdd1303c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/allocator.cpp
View File

@ -138,14 +138,16 @@ namespace
#endif #endif
// High-level allocation functions // High-level allocation functions
const size_t memory_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
void* memory_allocate(size_t size) void* memory_allocate(size_t size)
{ {
void* result = allocate(size + sizeof(size_t)); void* result = allocate(size + memory_alignment);
if (!result) return 0; if (!result) return 0;
memcpy(result, &size, sizeof(size_t)); memcpy(result, &size, sizeof(size_t));
return static_cast<size_t*>(result) + 1; return static_cast<char*>(result) + memory_alignment;
} }
size_t memory_size(void* ptr) size_t memory_size(void* ptr)
@ -153,7 +155,7 @@ size_t memory_size(void* ptr)
assert(ptr); assert(ptr);
size_t result; size_t result;
memcpy(&result, static_cast<size_t*>(ptr) - 1, sizeof(size_t)); memcpy(&result, static_cast<char*>(ptr) - memory_alignment, sizeof(size_t));
return result; return result;
} }
@ -164,6 +166,6 @@ void memory_deallocate(void* ptr)
size_t size = memory_size(ptr); size_t size = memory_size(ptr);
deallocate(static_cast<size_t*>(ptr) - 1, size + sizeof(size_t)); deallocate(static_cast<char*>(ptr) - memory_alignment, size + memory_alignment);
} }