Commit 65bf7f3074b65f43c53b137b0a0988e5b01e3d63
2023-12-18T11:46:04
wip random
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186
diff --git a/libc3/u.c.in b/libc3/u.c.in
index aa34b3d..f212f01 100644
--- a/libc3/u.c.in
+++ b/libc3/u.c.in
@@ -94,23 +94,17 @@ u_bits$ * u_bits$_random (u_bits$ *u)
u_bits$ * u_bits$_random_uniform (u_bits$ *u, u_bits$ max)
{
- u16 bits;
- u8 i;
u_bits$ rest;
u_bits$ result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);
diff --git a/libc3/u16.c b/libc3/u16.c
index de2eb63..b518653 100644
--- a/libc3/u16.c
+++ b/libc3/u16.c
@@ -94,23 +94,17 @@ u16 * u16_random (u16 *u)
u16 * u16_random_uniform (u16 *u, u16 max)
{
- u16 bits;
- u8 i;
u16 rest;
u16 result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);
diff --git a/libc3/u32.c b/libc3/u32.c
index 9e3f11e..7233179 100644
--- a/libc3/u32.c
+++ b/libc3/u32.c
@@ -94,23 +94,17 @@ u32 * u32_random (u32 *u)
u32 * u32_random_uniform (u32 *u, u32 max)
{
- u16 bits;
- u8 i;
u32 rest;
u32 result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);
diff --git a/libc3/u64.c b/libc3/u64.c
index 9fdb100..cf2ef47 100644
--- a/libc3/u64.c
+++ b/libc3/u64.c
@@ -94,23 +94,17 @@ u64 * u64_random (u64 *u)
u64 * u64_random_uniform (u64 *u, u64 max)
{
- u16 bits;
- u8 i;
u64 rest;
u64 result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);
diff --git a/libc3/u8.c b/libc3/u8.c
index b4652c9..f64bd2f 100644
--- a/libc3/u8.c
+++ b/libc3/u8.c
@@ -94,23 +94,17 @@ u8 * u8_random (u8 *u)
u8 * u8_random_uniform (u8 *u, u8 max)
{
- u16 bits;
- u8 i;
u8 rest;
u8 result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);
diff --git a/libc3/uw.c b/libc3/uw.c
index f1d7795..dd77b80 100644
--- a/libc3/uw.c
+++ b/libc3/uw.c
@@ -94,23 +94,17 @@ uw * uw_random (uw *u)
uw * uw_random_uniform (uw *u, uw max)
{
- u16 bits;
- u8 i;
uw rest;
uw result;
- u8 words;
assert(u);
assert(max);
- bits = log2l(max) - 1;
- words = bits / 32;
+ rest = max;
result = 0;
- i = 0;
- while (i < words) {
+ while (rest > (u32) -1) {
+ rest >>= 32;
result <<= 32;
result += arc4random();
- i++;
}
- rest = max >> (words * 32);
if (rest) {
result <<= 32;
result += arc4random_uniform(rest);