Commit e69855506fdebfd6e050b5f73109cadc7f468036
2023-12-18T16:51:40
fix f64_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 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
diff --git a/libc3/f64.c b/libc3/f64.c
index 45e62dd..0221fe7 100644
--- a/libc3/f64.c
+++ b/libc3/f64.c
@@ -90,7 +90,8 @@ f64 * f64_random (f64 *x)
{
u64 i;
const u64 max = ((u64) 1 << 53) - 1;
- u64_random_uniform(&i, max);
+ u64_random(&i);
+ i &= max;
*x = (f64) i / max;
return x;
}
diff --git a/libc3/u.c.in b/libc3/u.c.in
index f212f01..5798376 100644
--- a/libc3/u.c.in
+++ b/libc3/u.c.in
@@ -94,23 +94,12 @@ u_bits$ * u_bits$_random (u_bits$ *u)
u_bits$ * u_bits$_random_uniform (u_bits$ *u, u_bits$ max)
{
- u_bits$ rest;
- u_bits$ result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("u_bits$_random_uniform: not implemented");
+ assert(! "u_bits$_random_uniform: not implemented");
+ return NULL;
}
#else
diff --git a/libc3/u16.c b/libc3/u16.c
index b518653..309e6a0 100644
--- a/libc3/u16.c
+++ b/libc3/u16.c
@@ -94,23 +94,12 @@ u16 * u16_random (u16 *u)
u16 * u16_random_uniform (u16 *u, u16 max)
{
- u16 rest;
- u16 result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("u16_random_uniform: not implemented");
+ assert(! "u16_random_uniform: not implemented");
+ return NULL;
}
#else
diff --git a/libc3/u32.c b/libc3/u32.c
index 7233179..f09d551 100644
--- a/libc3/u32.c
+++ b/libc3/u32.c
@@ -94,23 +94,12 @@ u32 * u32_random (u32 *u)
u32 * u32_random_uniform (u32 *u, u32 max)
{
- u32 rest;
- u32 result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("u32_random_uniform: not implemented");
+ assert(! "u32_random_uniform: not implemented");
+ return NULL;
}
#else
diff --git a/libc3/u64.c b/libc3/u64.c
index cf2ef47..082112e 100644
--- a/libc3/u64.c
+++ b/libc3/u64.c
@@ -94,23 +94,12 @@ u64 * u64_random (u64 *u)
u64 * u64_random_uniform (u64 *u, u64 max)
{
- u64 rest;
- u64 result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("u64_random_uniform: not implemented");
+ assert(! "u64_random_uniform: not implemented");
+ return NULL;
}
#else
diff --git a/libc3/u8.c b/libc3/u8.c
index f64bd2f..ee10592 100644
--- a/libc3/u8.c
+++ b/libc3/u8.c
@@ -94,23 +94,12 @@ u8 * u8_random (u8 *u)
u8 * u8_random_uniform (u8 *u, u8 max)
{
- u8 rest;
- u8 result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("u8_random_uniform: not implemented");
+ assert(! "u8_random_uniform: not implemented");
+ return NULL;
}
#else
diff --git a/libc3/uw.c b/libc3/uw.c
index dd77b80..2304b3f 100644
--- a/libc3/uw.c
+++ b/libc3/uw.c
@@ -94,23 +94,12 @@ uw * uw_random (uw *u)
uw * uw_random_uniform (uw *u, uw max)
{
- uw rest;
- uw result;
- assert(u);
- assert(max);
- rest = max;
- result = 0;
- while (rest > (u32) -1) {
- rest >>= 32;
- result <<= 32;
- result += arc4random();
- }
- if (rest) {
- result <<= 32;
- result += arc4random_uniform(rest);
- }
- *u = result;
- return u;
+ // TODO
+ (void) u;
+ (void) max;
+ err_puts("uw_random_uniform: not implemented");
+ assert(! "uw_random_uniform: not implemented");
+ return NULL;
}
#else