From ca4c5ed5446fd93dac62fe48575d2b6970d03329 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 25 Feb 2012 20:29:27 +0100
Subject: Core/Utils: Fixed random crashes with SFMT caused by wrong memory
 alignment when operating on SSE instructions (they require 16 byte alignment,
 while classes and its members are only aligned to 8 byte boundaries)

---
 dep/SFMT/SFMT.h | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/dep/SFMT/SFMT.h b/dep/SFMT/SFMT.h
index 03a7e853316..6c65cd12433 100644
--- a/dep/SFMT/SFMT.h
+++ b/dep/SFMT/SFMT.h
@@ -39,6 +39,7 @@
 #include <emmintrin.h>                 // Define SSE2 intrinsics
 #include "randomc.h"                   // Define integer types etc
 #include <time.h>
+#include <new>
 
 // Choose one of the possible Mersenne exponents.
 // Higher values give longer cycle length and use more memory:
@@ -149,8 +150,14 @@ __m128i const &c, __m128i const &d, __m128i const &mask) {
 
 // Class for SFMT generator
 class SFMTRand {                              // Encapsulate random number generator
+    friend class ACE_TSS<SFMTRand>;
+
 public:
-    SFMTRand() { LastInterval = 0; RandomInit((int)(time(0))); } 
+    SFMTRand()
+    {
+        LastInterval = 0;
+        RandomInit((int)(time(0)));
+    }
 
     void RandomInit(int seed)                     // Re-seed
     {
@@ -298,6 +305,46 @@ private:
         ix = 0;
     }
 
+    void* operator new(size_t size, std::nothrow_t const&)
+    {
+        return _mm_malloc(size, 16);
+    }
+
+    void operator delete(void* ptr, std::nothrow_t const&)
+    {
+        _mm_free(ptr);
+    }
+
+    void* operator new(size_t size)
+    {
+        return _mm_malloc(size, 16);
+    }
+
+    void operator delete(void* ptr)
+    {
+        _mm_free(ptr);
+    }
+
+    void* operator new[](size_t size, std::nothrow_t const&)
+    {
+        return _mm_malloc(size, 16);
+    }
+
+    void operator delete[](void* ptr, std::nothrow_t const&)
+    {
+        _mm_free(ptr);
+    }
+
+    void* operator new[](size_t size)
+    {
+        return _mm_malloc(size, 16);
+    }
+
+    void operator delete[](void* ptr)
+    {
+        _mm_free(ptr);
+    }
+
     uint32_t ix;                                  // Index into state array
     uint32_t LastInterval;                        // Last interval length for IRandom
     uint32_t RLimit;                              // Rejection limit used by IRandom
-- 
cgit v1.2.3