version 2

Author: SakiTakamachi

ext/random/php_random.h

@@ -217,30 +217,16 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(random)
 /* Bytes swap */
 #ifdef _MSC_VER
 #  include <stdlib.h>
-#  define RANDOM_BSWAP32(u) _byteswap_ulong(u)
 #  define RANDOM_BSWAP64(u) _byteswap_uint64(u)
 #else
 #  ifdef __GNUC__
-#    define RANDOM_BSWAP32(u) __builtin_bswap32(u)
 #    define RANDOM_BSWAP64(u) __builtin_bswap64(u)
 #  elif defined(__has_builtin)
-#    if __has_builtin(__builtin_bswap32)
-#      define RANDOM_BSWAP32(u) __builtin_bswap32(u)
-#    endif // __has_builtin(__builtin_bswap32)
 #    if __has_builtin(__builtin_bswap64)
 #      define RANDOM_BSWAP64(u) __builtin_bswap64(u)
 #    endif // __has_builtin(__builtin_bswap64)
 #  endif // __GNUC__
 #endif // _MSC_VER
-#ifndef RANDOM_BSWAP32
-static inline uint32_t RANDOM_BSWAP32(uint32_t u)
-{
-  return (((u & 0xff000000) >> 24)
-          | ((u & 0x00ff0000) >>  8)
-          | ((u & 0x0000ff00) <<  8)
-          | ((u & 0x000000ff) << 24));
-}
-#endif
 #ifndef RANDOM_BSWAP64
 static inline uint64_t RANDOM_BSWAP64(uint64_t u)
 {

ext/random/randomizer.c

@@ -270,43 +270,6 @@ PHP_METHOD(Random_Randomizer, getInt)
 }
 /* }}} */
 
-static zend_always_inline char *bulk_convert_generated_result_to_char_32(char *ptr, uint64_t result, size_t *to_read)
-{
-	if (*to_read >= sizeof(uint32_t)) {
-		uint32_t tmp = (uint32_t) result;
-#ifdef WORDS_BIGENDIAN
-		tmp = RANDOM_BSWAP32(tmp);
-#endif
-		memcpy(ptr, &tmp, sizeof(uint32_t));
-		ptr += sizeof(uint32_t);
-		*to_read -= sizeof(uint32_t);
-	} else {
-		while (*to_read > 0) {
-			*ptr++ = result & 0xff;
-			result >>= 8;
-			*to_read -= 1;
-		}
-	}
-
-	return ptr;
-}
-
-static zend_always_inline char *bulk_convert_generated_result_to_char_64(char *ptr, uint64_t result, size_t *to_read)
-{
-	if (*to_read >= sizeof(uint64_t)) {
-#ifdef WORDS_BIGENDIAN
-		result = RANDOM_BSWAP64(result);
-#endif
-		memcpy(ptr, &result, sizeof(uint64_t));
-		ptr += sizeof(uint64_t);
-		*to_read -= sizeof(uint64_t);
-	} else {
-		ptr = bulk_convert_generated_result_to_char_32(ptr, result, to_read);
-	}
-
-	return ptr;
-}
-
 /* {{{ Generate random bytes string in ordered length */
 PHP_METHOD(Random_Randomizer, getBytes)
 {
@@ -336,12 +299,16 @@ PHP_METHOD(Random_Randomizer, getBytes)
 			zend_string_free(retval);
 			RETURN_THROWS();
 		}
-		if (EXPECTED(result.size == sizeof(uint64_t))) {
-			rptr = bulk_convert_generated_result_to_char_64(rptr, result.result, &to_read);
-		} else if (EXPECTED(result.size == sizeof(uint32_t))){
-			rptr = bulk_convert_generated_result_to_char_32(rptr, result.result, &to_read);
+
+		uint64_t tmp_ret = result.result;
+		if (to_read >= result.size && result.size == sizeof(uint64_t)) {
+#ifdef WORDS_BIGENDIAN
+			tmp_ret = RANDOM_BSWAP64(tmp_ret);
+#endif
+			memcpy(rptr, &tmp_ret, sizeof(uint64_t));
+			to_read -= sizeof(uint64_t);
+			rptr += sizeof(uint64_t);
 		} else {
-			uint64_t tmp_ret = result.result;
 			for (size_t i = 0; i < result.size; i++) {
 				*rptr++ = tmp_ret & 0xff;
 				tmp_ret >>= 8;