~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/perftest.c: Use from Glibc syscall numbers.
[catacomb]
/
rand
/
rand.c
diff --git
a/rand/rand.c
b/rand/rand.c
index
304c68d
..
665152a
100644
(file)
--- a/
rand/rand.c
+++ b/
rand/rand.c
@@
-163,11
+163,14
@@
static int trivial_quick(rand_pool *r) { return (-1); }
#if CPUFAM_X86 || CPUFAM_AMD64
extern int rand_quick_x86ish_rdrand(rand_pool */*r*/);
#if CPUFAM_X86 || CPUFAM_AMD64
extern int rand_quick_x86ish_rdrand(rand_pool */*r*/);
+extern int rand_quick_x86ish_rdseed(rand_pool */*r*/);
#endif
static quick__functype *pick_quick(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
#endif
static quick__functype *pick_quick(void)
{
#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdseed,
+ cpu_feature_p(CPUFEAT_X86_RDSEED));
DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdrand,
cpu_feature_p(CPUFEAT_X86_RDRAND));
#endif
DISPATCH_PICK_COND(rand_quick, rand_quick_x86ish_rdrand,
cpu_feature_p(CPUFEAT_X86_RDRAND));
#endif
@@
-331,7
+334,7
@@
void rand_gate(rand_pool *r)
r->o = RAND_SECSZ;
r->obits += r->ibits;
if (r->obits > RAND_OBITS) {
r->o = RAND_SECSZ;
r->obits += r->ibits;
if (r->obits > RAND_OBITS) {
- r->ibits = r->obits -
r->ibits
;
+ r->ibits = r->obits -
RAND_OBITS
;
r->obits = RAND_OBITS;
} else
r->ibits = 0;
r->obits = RAND_OBITS;
} else
r->ibits = 0;
@@
-410,7
+413,7
@@
void rand_get(rand_pool *r, void *p, size_t sz)
if (!sz)
return;
for (;;) {
if (!sz)
return;
for (;;) {
- if (
r->o + sz <= RAND_BUFSZ
) {
+ if (
sz <= RAND_BUFSZ - r->o
) {
memcpy(o, r->buf + r->o, sz);
r->o += sz;
break;
memcpy(o, r->buf + r->o, sz);
r->o += sz;
break;
@@
-425,8
+428,8
@@
void rand_get(rand_pool *r, void *p, size_t sz)
}
}
}
}
- if (r->obits >
sz * 8
)
- r->obits -=
sz * 8
;
+ if (r->obits >
8*sz
)
+ r->obits -=
8*sz
;
else
r->obits = 0;
}
else
r->obits = 0;
}
@@
-464,20
+467,24
@@
void rand_getgood(rand_pool *r, void *p, size_t sz)
while (sz) {
size_t chunk = sz;
while (sz) {
size_t chunk = sz;
- if (
chunk * 8
> r->obits) {
- if (
chunk * 8
> r->ibits + r->obits)
+ if (
8*chunk
> r->obits) {
+ if (
8*chunk
> r->ibits + r->obits)
do r->s->getnoise(r); while (r->ibits + r->obits < 256);
rand_gate(r);
do r->s->getnoise(r); while (r->ibits + r->obits < 256);
rand_gate(r);
- if (
chunk * 8
> r->obits)
- chunk = r->obits
/
8;
+ if (
8*chunk
> r->obits)
+ chunk = r->obits
/
8;
}
}
- if (chunk + r->o > RAND_BUFSZ)
+ if (chunk <= RAND_BUFSZ - r->o) {
+ memcpy(o, r->buf + r->o, chunk);
+ r->o += chunk;
+ } else {
chunk = RAND_BUFSZ - r->o;
chunk = RAND_BUFSZ - r->o;
+ memcpy(o, r->buf + r->o, chunk);
+ rand_stretch(r);
+ }
- memcpy(o, r->buf + r->o, chunk);
- r->o += chunk;
- r->obits -= chunk * 8;
+ r->obits -= 8*chunk;
o += chunk;
sz -= chunk;
}
o += chunk;
sz -= chunk;
}