aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordaMaex <damaex@live.de>2019-10-30 10:42:08 +0100
committerShauren <shauren.trinity@gmail.com>2021-12-19 00:12:41 +0100
commit08b40733a58da23ced34915cb67c0ef24e6e9059 (patch)
treebfbc36e2e6396cfde3accb05f970beb16063e44c /src
parent5ae84caf23e42f1005cfa0437896a86e1cb40fd1 (diff)
Dep/SFMT: updated to newest upstream version from https://github.com/MersenneTwister-Lab/SFMT
* only needed files added * used CMake and SFMTRand from https://github.com/TrinityCore/TrinityCore/pull/23240 (Thank you Artox) (cherry picked from commit 4e0279b0e48c9992842010b9f3f132e54a460128)
Diffstat (limited to 'src')
-rw-r--r--src/common/Utilities/Random.cpp2
-rw-r--r--src/common/Utilities/SFMTRand.cpp120
-rw-r--r--src/common/Utilities/SFMTRand.h47
3 files changed, 168 insertions, 1 deletions
diff --git a/src/common/Utilities/Random.cpp b/src/common/Utilities/Random.cpp
index 028163f7456..974f13db0be 100644
--- a/src/common/Utilities/Random.cpp
+++ b/src/common/Utilities/Random.cpp
@@ -17,7 +17,7 @@
#include "Random.h"
#include "Errors.h"
-#include "SFMT.h"
+#include "SFMTRand.h"
#include <boost/thread/tss.hpp>
#include <random>
diff --git a/src/common/Utilities/SFMTRand.cpp b/src/common/Utilities/SFMTRand.cpp
new file mode 100644
index 00000000000..ddc65c8a772
--- /dev/null
+++ b/src/common/Utilities/SFMTRand.cpp
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SFMTRand.h"
+
+#include <exception>
+#include <emmintrin.h>
+#include <ctime>
+
+SFMTRand::SFMTRand()
+{
+ RandomInit((uint32_t)(time(0)));
+}
+
+void SFMTRand::RandomInit(uint32_t seed) // Re-seed
+{
+ sfmt_init_gen_rand(&state, seed);
+}
+
+int32_t SFMTRand::IRandom(int32_t min, int32_t max) // Output random integer
+{
+ // Output random integer in the interval min <= x <= max
+ // Slightly inaccurate if (max-min+1) is not a power of 2
+ if (max <= min) {
+ if (max == min) return min; else return 0x80000000;
+ }
+ // Assume 64 bit integers supported. Use multiply and shift method
+ uint32_t interval; // Length of interval
+ uint64_t longran; // Random bits * interval
+ uint32_t iran; // Longran / 2^32
+
+ interval = (uint32_t)(max - min + 1);
+ longran = (uint64_t)BRandom() * interval;
+ iran = (uint32_t)(longran >> 32);
+ // Convert back to signed and return result
+ return (int32_t)iran + min;
+}
+
+uint32_t SFMTRand::URandom(uint32_t min, uint32_t max)
+{
+ // Output random integer in the interval min <= x <= max
+ // Slightly inaccurate if (max-min+1) is not a power of 2
+ if (max <= min) {
+ if (max == min) return min; else return 0;
+ }
+ // Assume 64 bit integers supported. Use multiply and shift method
+ uint32_t interval; // Length of interval
+ uint64_t longran; // Random bits * interval
+ uint32_t iran; // Longran / 2^32
+
+ interval = (uint32_t)(max - min + 1);
+ longran = (uint64_t)BRandom() * interval;
+ iran = (uint32_t)(longran >> 32);
+ // Convert back to signed and return result
+ return iran + min;
+}
+
+double SFMTRand::Random() // Output random floating point number
+{
+ return sfmt_genrand_real1(&state);
+}
+
+uint32_t SFMTRand::BRandom() // Output random bits
+{
+ return sfmt_genrand_uint32(&state);
+}
+
+void* SFMTRand::operator new(size_t size, std::nothrow_t const&)
+{
+ return _mm_malloc(size, 16);
+}
+
+void SFMTRand::operator delete(void* ptr, std::nothrow_t const&)
+{
+ _mm_free(ptr);
+}
+
+void* SFMTRand::operator new(size_t size)
+{
+ return _mm_malloc(size, 16);
+}
+
+void SFMTRand::operator delete(void* ptr)
+{
+ _mm_free(ptr);
+}
+
+void* SFMTRand::operator new[](size_t size, std::nothrow_t const&)
+{
+ return _mm_malloc(size, 16);
+}
+
+void SFMTRand::operator delete[](void* ptr, std::nothrow_t const&)
+{
+ _mm_free(ptr);
+}
+
+void* SFMTRand::operator new[](size_t size)
+{
+ return _mm_malloc(size, 16);
+}
+
+void SFMTRand::operator delete[](void* ptr)
+{
+ _mm_free(ptr);
+}
diff --git a/src/common/Utilities/SFMTRand.h b/src/common/Utilities/SFMTRand.h
new file mode 100644
index 00000000000..1189accae2f
--- /dev/null
+++ b/src/common/Utilities/SFMTRand.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SFMTRand_h__
+#define SFMTRand_h__
+
+#include <SFMT.h>
+#include <new>
+
+/*
+ * C++ Wrapper for SFMT
+ */
+class SFMTRand {
+public:
+ SFMTRand();
+ void RandomInit(uint32_t seed); // Re-seed
+ int32_t IRandom(int32_t min, int32_t max); // Output random integer
+ uint32_t URandom(uint32_t min, uint32_t max);
+ double Random(); // Output random floating point number
+ uint32_t BRandom(); // Output random bits
+ void* operator new(size_t size, std::nothrow_t const&);
+ void operator delete(void* ptr, std::nothrow_t const&);
+ void* operator new(size_t size);
+ void operator delete(void* ptr);
+ void* operator new[](size_t size, std::nothrow_t const&);
+ void operator delete[](void* ptr, std::nothrow_t const&);
+ void* operator new[](size_t size);
+ void operator delete[](void* ptr);
+private:
+ sfmt_t state;
+};
+
+#endif // SFMTRand_h__