finish conversion to ll_aligned_*() wrappers

1 files changed, 26 insertions, 4 deletions

diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 93dd7a7fe3..1c8c91f57e 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -43,13 +43,9 @@ inline void* ll_aligned_malloc_16(size_t size) // returned hunk MUST be freed wi
 #else
 	void *rtn;
 	if (LL_LIKELY(0 == posix_memalign(&rtn, 16, size)))
-	{
 		return rtn;
-	}
 	else // bad alignment requested, or out of memory
-	{
 		return NULL;
-	}
 #endif
 }
 
@@ -64,6 +60,32 @@ inline void ll_aligned_free_16(void *p)
 #endif
 }
 
+inline void* ll_aligned_malloc_32(size_t size) // returned hunk MUST be freed with ll_aligned_free_32().
+{
+#if defined(LL_WINDOWS)
+	return _mm_malloc(size, 32);
+#elif defined(LL_DARWIN)
+# error implement me.
+#else
+	void *rtn;
+	if (LL_LIKELY(0 == posix_memalign(&rtn, 32, size)))
+		return rtn;
+	else // bad alignment requested, or out of memory
+		return NULL;
+#endif
+}
+
+inline void ll_aligned_free_32(void *p)
+{
+#if defined(LL_WINDOWS)
+	_mm_free(p);
+#elif defined(LL_DARWIN)
+# error implement me.
+#else
+	free(p); // posix_memalign() is compatible with heap deallocator
+#endif
+}
+
 class LL_COMMON_API LLMemory
 {
 public: