drop Xoshiro256**

Author: zeriyoshi

ext/random/php_random.h

@@ -192,15 +192,13 @@ extern PHPAPI zend_class_entry *random_ce_Random_Engine_CombinedLCG;
 extern PHPAPI zend_class_entry *random_ce_Random_Engine_PCG64;
 extern PHPAPI zend_class_entry *random_ce_Random_Engine_MersenneTwister;
 extern PHPAPI zend_class_entry *random_ce_Random_Engine_Secure;
-extern PHPAPI zend_class_entry *random_ce_Random_Engine_Xoshiro256StarStar;
 extern PHPAPI zend_class_entry *random_ce_Random_Randomizer;
 
 extern const php_random_engine_algo php_random_engine_algo_combinedlcg;
 extern const php_random_engine_algo php_random_engine_algo_mersennetwister;
 extern const php_random_engine_algo php_random_engine_algo_pcg64;
 extern const php_random_engine_algo php_random_engine_algo_secure;
 extern const php_random_engine_algo php_random_engine_algo_user;
-extern const php_random_engine_algo php_random_engine_algo_xoshiro256starstar;
 
 typedef struct _php_random_engine {
 	const php_random_engine_algo *algo;
@@ -231,10 +229,6 @@ typedef struct _php_random_engine_state_user {
 	size_t last_generate_size;
 } php_random_engine_state_user;
 
-typedef struct _php_random_engine_state_xoshiro256starstar {
-	uint64_t s[4];
-} php_random_engine_state_xoshiro256starstar;
-
 typedef struct _php_random_randomizer {
 	const php_random_engine_algo *algo;
 	void *state;

ext/random/random.c

@@ -168,14 +168,12 @@ PHPAPI zend_class_entry *random_ce_Random_Engine_CombinedLCG;
 PHPAPI zend_class_entry *random_ce_Random_Engine_MersenneTwister;
 PHPAPI zend_class_entry *random_ce_Random_Engine_PCG64;
 PHPAPI zend_class_entry *random_ce_Random_Engine_Secure;
-PHPAPI zend_class_entry *random_ce_Random_Engine_Xoshiro256StarStar;
 PHPAPI zend_class_entry *random_ce_Random_Randomizer;
 
 static zend_object_handlers random_engine_combinedlcg_object_handlers;
 static zend_object_handlers random_engine_mersennetwister_object_handlers;
 static zend_object_handlers random_engine_pcg64_object_handlers;
 static zend_object_handlers random_engine_secure_object_handlers;
-static zend_object_handlers random_engine_xoshiro256starstar_object_handlers;
 static zend_object_handlers random_randomizer_object_handlers;
 
 static uint32_t rand_range32(const php_random_engine_algo *algo, void *state, uint32_t umax, bool *engine_unsafe) {
@@ -281,19 +279,6 @@ static uint64_t rand_range64(const php_random_engine_algo *algo, void *state, ui
 }
 #endif
 
-static inline uint64_t splitmix64(uint64_t *seed) {
-	uint64_t r;
-
-	r = (*seed += 0x9e3779b97f4a7c15ULL);
-	r = (r ^ (r >> 30)) * 0xbf58476d1ce4e5b9ULL;
-	r = (r ^ (r >> 27)) * 0x94d049bb133111ebULL;
-	return (r ^ (r >> 31));
-}
-
-static inline uint64_t rotl(const uint64_t x, int k) {
-	return (x << k) | (x >> (64 - k));
-}
-
 static inline zend_object *php_random_engine_common_init(zend_class_entry *ce, const php_random_engine_algo *algo, const zend_object_handlers *handlers) {
 	php_random_engine *engine = zend_object_alloc(sizeof(php_random_engine), ce);
 
@@ -766,85 +751,6 @@ const php_random_engine_algo php_random_engine_algo_user = {
 
 /* User end */
 
-/* Xoshiro256StarStar start */
-
-static inline size_t xoshiro256starstar_dynamic_generate_size(void *state) {
-	return sizeof(uint64_t);
-}
-
-static uint64_t xoshiro256starstar_generate(void *state, bool *engine_unsafe) {
-	php_random_engine_state_xoshiro256starstar *s = state;
-	const uint64_t result = rotl(s->s[1] * 5, 7) * 9;
-	const uint64_t t = s->s[1] << 17;
-
-	s->s[2] ^= s->s[0];
-	s->s[3] ^= s->s[1];
-	s->s[1] ^= s->s[2];
-	s->s[0] ^= s->s[3];
-
-	s->s[2] ^= t;
-
-	s->s[3] = rotl(s->s[3], 45);
-
-	return result;
-}
-
-static void xoshiro256starstar_seed(void *state, const uint64_t seed) {
-	php_random_engine_state_xoshiro256starstar *s = state;
-	uint64_t sd = seed;
-
-	s->s[0] = splitmix64(&sd);
-	s->s[1] = splitmix64(&sd);
-	s->s[2] = splitmix64(&sd);
-	s->s[3] = splitmix64(&sd);
-}
-
-static int xoshiro256starstar_serialize(void *state, HashTable *data) {
-	php_random_engine_state_xoshiro256starstar *s = state;
-	zval tmp;
-	int i;
-
-	for (i = 0; i < 4; i++) {
-		ZVAL_STR(&tmp, zend_strpprintf(0, "%" PRIu64, s->s[i]));
-		zend_hash_next_index_insert(data, &tmp);
-	}
-
-	return SUCCESS;
-}
-
-static int xoshiro256starstar_unserialize(void *state, HashTable *data) {
-	php_random_engine_state_xoshiro256starstar *s = state;
-	zval *tmp;
-	int i;
-
-	for (i = 0; i < 4; i++) {
-		tmp = zend_hash_index_find(data, i);
-		if (!tmp || Z_TYPE_P(tmp) != IS_STRING) {
-			return FAILURE;
-		}
-
-		s->s[i] = strtoull(ZSTR_VAL(Z_STR_P(tmp)), NULL, 10);
-	}
-
-	return SUCCESS;
-}
-
-static zend_object *php_random_engine_xoshiro256starstar_new(zend_class_entry *ce) {
-	return php_random_engine_common_init(ce, &php_random_engine_algo_xoshiro256starstar, &random_engine_xoshiro256starstar_object_handlers);
-}
-
-const php_random_engine_algo php_random_engine_algo_xoshiro256starstar = {
-	sizeof(uint64_t),
-	xoshiro256starstar_dynamic_generate_size,
-	sizeof(php_random_engine_state_xoshiro256starstar),
-	xoshiro256starstar_generate,
-	xoshiro256starstar_seed,
-	xoshiro256starstar_serialize,
-	xoshiro256starstar_unserialize
-};
-
-/* Xoshiro256StarStar end */
-
 static zend_object *php_random_randomizer_new(zend_class_entry *ce) {
 	php_random_randomizer *randomizer = zend_object_alloc(sizeof(php_random_randomizer), ce);
 
@@ -1566,110 +1472,6 @@ PHP_METHOD(Random_Engine_PCG64, jump)
 }
 /* }}} */
 
-/* {{{ Construct object */
-PHP_METHOD(Random_Engine_Xoshiro256StarStar, __construct)
-{
-	php_random_engine *engine = Z_RANDOM_ENGINE_P(ZEND_THIS);
-	php_random_engine_state_xoshiro256starstar *state = engine->state;
-	zend_string *str_seed = NULL;
-	zend_long int_seed = 0;
-	bool seed_is_null = true;
-	int i, j;
-	
-	ZEND_PARSE_PARAMETERS_START(0, 1)
-		Z_PARAM_OPTIONAL;
-		Z_PARAM_STR_OR_LONG_OR_NULL(str_seed, int_seed, seed_is_null);
-	ZEND_PARSE_PARAMETERS_END();
-	
-	if (seed_is_null) {
-		for (i = 0; i < 4; i++) {
-			if (php_random_bytes_silent(&state->s[i], sizeof(uint64_t)) == FAILURE) {
-				zend_throw_exception(spl_ce_RuntimeException, "Random number generate failed", 0);
-				RETURN_THROWS();
-			}
-		}
-	} else {
-		if (str_seed) {
-			/* char (8 bit) * 32 = 256 bits */
-			if (ZSTR_LEN(str_seed) == 32) {
-				/* Endianness safe copy */
-				for (i = 0; i < 4; i++) {
-					state->s[i] = 0;
-					for (j = 0; j < 8; j++) {
-						state->s[i] += ((uint64_t) (unsigned char) ZSTR_VAL(str_seed)[(i * 8) + j]) << (j * 8);
-					}
-				}
-			}  else {
-				zend_argument_value_error(1, "state strings must be 32 bytes");
-				RETURN_THROWS();
-			}
-		} else {
-			engine->algo->seed(state, int_seed);
-		}
-	}
-}
-/* }}} */
-
-/* {{{ Jump a state */
-PHP_METHOD(Random_Engine_Xoshiro256StarStar, jump)
-{
-	php_random_engine *engine = Z_RANDOM_ENGINE_P(ZEND_THIS);
-	php_random_engine_state_xoshiro256starstar *s = engine->state;
-	static const uint64_t jmp[] = { 0x180ec6d33cfd0aba, 0xd5a61266f0c9392c, 0xa9582618e03fc9aa, 0x39abdc4529b1661c };
-	uint64_t s0 = 0, s1 = 0, s2 = 0, s3 = 0;
-	int i, j;
-
-	ZEND_PARSE_PARAMETERS_NONE();
-
-	for (i = 0; i < sizeof(jmp) / sizeof(*jmp); i++) {
-		for (j = 0; j < 64; j++) {
-			if (jmp[i] & 1ULL << j) {
-				s0 ^= s->s[0];
-				s1 ^= s->s[1];
-				s2 ^= s->s[2];
-				s3 ^= s->s[3];
-			}
-			engine->algo->generate(engine->state, NULL);
-		}
-	}
-
-	s->s[0] = s0;
-	s->s[1] = s1;
-	s->s[2] = s2;
-	s->s[3] = s3;
-}
-/* }}} */
-
-/* {{{ Jump a long state */
-PHP_METHOD(Random_Engine_Xoshiro256StarStar, jumpLong)
-{
-	php_random_engine *engine = Z_RANDOM_ENGINE_P(ZEND_THIS);
-	php_random_engine_state_xoshiro256starstar *s = engine->state;
-	static const uint64_t jmp[] = { 0x76e15d3efefdcbbf, 0xc5004e441c522fb3, 0x77710069854ee241, 0x39109bb02acbe635 };
-	uint64_t s0 = 0, s1 = 0, s2 = 0, s3 = 0;
-	int i, j;
-
-	ZEND_PARSE_PARAMETERS_NONE();
-
-	for (i = 0; i < sizeof(jmp) / sizeof(*jmp); i++) {
-		for (j = 0; j < 64; j++) {
-			if (jmp[i] & 1ULL << j) {
-				s0 ^= s->s[0];
-				s1 ^= s->s[1];
-				s2 ^= s->s[2];
-				s3 ^= s->s[3];
-			}
-			engine->algo->generate(engine->state, NULL);
-		}
-	}
-		
-	s->s[0] = s0;
-	s->s[1] = s1;
-	s->s[2] = s2;
-	s->s[3] = s3;
-}
-/* }}} */
-
 /* {{{ Construct object */
 PHP_METHOD(Random_Randomizer, __construct)
 {
@@ -1914,14 +1716,6 @@ PHP_MINIT_FUNCTION(random)
 	random_engine_secure_object_handlers.offset = XtOffsetOf(php_random_engine, std);
 	random_engine_secure_object_handlers.free_obj = php_random_engine_common_free_obj;
 	random_engine_secure_object_handlers.clone_obj = NULL;
-	
-	/* Random\Engine\Xoshiro256StarStar */
-	random_ce_Random_Engine_Xoshiro256StarStar = register_class_Random_Engine_Xoshiro256StarStar(random_ce_Random_SeedableEngine, random_ce_Random_SerializableEngine);
-	random_ce_Random_Engine_Xoshiro256StarStar->create_object = php_random_engine_xoshiro256starstar_new;
-	memcpy(&random_engine_xoshiro256starstar_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-	random_engine_xoshiro256starstar_object_handlers.offset = XtOffsetOf(php_random_engine, std);
-	random_engine_xoshiro256starstar_object_handlers.free_obj = php_random_engine_common_free_obj;
-	random_engine_xoshiro256starstar_object_handlers.clone_obj = php_random_engine_common_clone_obj;
 
 	/* Random\Randomizer */
 	random_ce_Random_Randomizer = register_class_Random_Randomizer();

ext/random/random.stub.php

@@ -82,27 +82,6 @@ class Secure implements Random\CryptoSafeEngine
         /** @implementation-alias Random\Engine\CombinedLCG::generate */
         public function generate(): string {}
     }
-
-    class Xoshiro256StarStar implements Random\SeedableEngine, Random\SerializableEngine
-    {
-        public function __construct(string|int|null $seed = null) {}
-
-        /** @implementation-alias Random\Engine\CombinedLCG::generate */
-        public function generate(): string {}
-
-        public function jump(): void {}
-
-        public function jumpLong(): void {}
-
-        /** @implementation-alias Random\Engine\CombinedLCG::__serialize */
-        public function __serialize(): array {}
-
-        /** @implementation-alias Random\Engine\CombinedLCG::__unserialize */
-        public function __unserialize(array $data): void {}
-
-        /** @implementation-alias Random\Engine\CombinedLCG::__debugInfo */
-        public function __debugInfo(): array {}
-    }
 }
 
 namespace Random

ext/random/random_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a0bc52433aa2b610b62996655bed08acd9d042e9 */
+ * Stub hash: 08434169eadaff969e4cd3b0c3c66b909f45fe81 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_lcg_value, 0, 0, IS_DOUBLE, 0)
 ZEND_END_ARG_INFO()
@@ -79,21 +79,6 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_class_Random_Engine_Secure_generate arginfo_class_Random_Engine_CombinedLCG_generate
 
-#define arginfo_class_Random_Engine_Xoshiro256StarStar___construct arginfo_class_Random_Engine_PCG64___construct
-
-#define arginfo_class_Random_Engine_Xoshiro256StarStar_generate arginfo_class_Random_Engine_CombinedLCG_generate
-
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Random_Engine_Xoshiro256StarStar_jump, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-#define arginfo_class_Random_Engine_Xoshiro256StarStar_jumpLong arginfo_class_Random_Engine_Xoshiro256StarStar_jump
-
-#define arginfo_class_Random_Engine_Xoshiro256StarStar___serialize arginfo_class_Random_Engine_CombinedLCG___serialize
-
-#define arginfo_class_Random_Engine_Xoshiro256StarStar___unserialize arginfo_class_Random_Engine_CombinedLCG___unserialize
-
-#define arginfo_class_Random_Engine_Xoshiro256StarStar___debugInfo arginfo_class_Random_Engine_CombinedLCG___serialize
-
 #define arginfo_class_Random_Engine_generate arginfo_class_Random_Engine_CombinedLCG_generate
 
 #define arginfo_class_Random_SerializableEngine___serialize arginfo_class_Random_Engine_CombinedLCG___serialize
@@ -138,9 +123,6 @@ ZEND_METHOD(Random_Engine_CombinedLCG, __debugInfo);
 ZEND_METHOD(Random_Engine_MersenneTwister, __construct);
 ZEND_METHOD(Random_Engine_PCG64, __construct);
 ZEND_METHOD(Random_Engine_PCG64, jump);
-ZEND_METHOD(Random_Engine_Xoshiro256StarStar, __construct);
-ZEND_METHOD(Random_Engine_Xoshiro256StarStar, jump);
-ZEND_METHOD(Random_Engine_Xoshiro256StarStar, jumpLong);
 ZEND_METHOD(Random_Randomizer, __construct);
 ZEND_METHOD(Random_Randomizer, getInt);
 ZEND_METHOD(Random_Randomizer, getBytes);
@@ -201,18 +183,6 @@ static const zend_function_entry class_Random_Engine_Secure_methods[] = {
 };
 
 
-static const zend_function_entry class_Random_Engine_Xoshiro256StarStar_methods[] = {
-	ZEND_ME(Random_Engine_Xoshiro256StarStar, __construct, arginfo_class_Random_Engine_Xoshiro256StarStar___construct, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(Random_Engine_CombinedLCG, generate, generate, arginfo_class_Random_Engine_Xoshiro256StarStar_generate, ZEND_ACC_PUBLIC)
-	ZEND_ME(Random_Engine_Xoshiro256StarStar, jump, arginfo_class_Random_Engine_Xoshiro256StarStar_jump, ZEND_ACC_PUBLIC)
-	ZEND_ME(Random_Engine_Xoshiro256StarStar, jumpLong, arginfo_class_Random_Engine_Xoshiro256StarStar_jumpLong, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(Random_Engine_CombinedLCG, __serialize, __serialize, arginfo_class_Random_Engine_Xoshiro256StarStar___serialize, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(Random_Engine_CombinedLCG, __unserialize, __unserialize, arginfo_class_Random_Engine_Xoshiro256StarStar___unserialize, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(Random_Engine_CombinedLCG, __debugInfo, __debugInfo, arginfo_class_Random_Engine_Xoshiro256StarStar___debugInfo, ZEND_ACC_PUBLIC)
-	ZEND_FE_END
-};
-
-
 static const zend_function_entry class_Random_Engine_methods[] = {
 	ZEND_ABSTRACT_ME_WITH_FLAGS(Random_Engine, generate, arginfo_class_Random_Engine_generate, ZEND_ACC_PUBLIC|ZEND_ACC_ABSTRACT)
 	ZEND_FE_END
@@ -293,17 +263,6 @@ static zend_class_entry *register_class_Random_Engine_Secure(zend_class_entry *c
 	return class_entry;
 }
 
-static zend_class_entry *register_class_Random_Engine_Xoshiro256StarStar(zend_class_entry *class_entry_Random_Engine_Random_SeedableEngine, zend_class_entry *class_entry_Random_Engine_Random_SerializableEngine)
-{
-	zend_class_entry ce, *class_entry;
-
-	INIT_NS_CLASS_ENTRY(ce, "Random\\Engine", "Xoshiro256StarStar", class_Random_Engine_Xoshiro256StarStar_methods);
-	class_entry = zend_register_internal_class_ex(&ce, NULL);
-	zend_class_implements(class_entry, 2, class_entry_Random_Engine_Random_SeedableEngine, class_entry_Random_Engine_Random_SerializableEngine);
-
-	return class_entry;
-}
-
 static zend_class_entry *register_class_Random_Engine(void)
 {
 	zend_class_entry ce, *class_entry;

ext/random/tests/02_engine/user_compatibility.phpt

@@ -30,15 +30,6 @@ for ($i = 0; $i < 1000; $i++) {
     }
 }
 
-$native_engine = new \Random\Engine\Xoshiro256StarStar(1234);
-$user_engine = new class (1234) extends \Random\Engine\Xoshiro256StarStar {};
-
-for ($i = 0; $i < 1000; $i++) {
-    if ($native_engine->generate() !== $user_engine->generate()) {
-        die('failure Xoshiro256StarStar');
-    }
-}
-
 die('success');
 ?>
 --EXPECT--