luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FastNorm3.c, use int32_t for some 32 bit specific operations

This commit is contained in:
rlar 2013-10-01 21:50:28 +02:00
parent 1156164056
commit 5ec3042c19
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontend/trannoise/FastNorm3.c
View File

@ -64,6 +64,7 @@ Normal (a very fast routine)
#ifndef NOSPICE #ifndef NOSPICE
#include "ngspice/ngspice.h" #include "ngspice/ngspice.h"
#endif #endif
#include <stdint.h>
#include <math.h> #include <math.h>
#include "ngspice/FastNorm3.h" #include "ngspice/FastNorm3.h"
@ -250,18 +251,18 @@ static Sw mt [128] = {
double double
c7rand(Sw *is) c7rand(Sw *is)
{ {
Sw it, leh; int32_t it, leh;
it = is [0]; it = is [0];
leh = is [1]; leh = is [1];
/* Do a 7-place right cyclic shift of it */ /* Do a 7-place right cyclic shift of it */
it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25); it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25);
if (!(it & 0x80000000)) if (it >= 0)
it = it ^ MASK; it = it ^ MASK;
leh = (leh * mt[it & 127] + it) & 0xFFFFFFFF; leh = leh * mt[it & 127] + it;
is [0] = it; is [1] = leh; is [0] = it; is [1] = leh;
if (leh & 0x80000000) if (leh < 0)
leh = leh ^ 0xFFFFFFFF; leh = ~leh;
return (SCALE * leh); return (SCALE * leh);
} }
@ -269,18 +270,18 @@ c7rand(Sw *is)
Sw Sw
irandm(Sw *is) irandm(Sw *is)
{ {
Sw it, leh; int32_t it, leh;
it = is [0]; it = is [0];
leh = is [1]; leh = is [1];
/* Do a 7-place right cyclic shift of it */ /* Do a 7-place right cyclic shift of it */
it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25); it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25);
if (!(it & 0x80000000)) if (it >= 0)
it = it ^ MASK; it = it ^ MASK;
leh = (leh * mt[it & 127] + it) & 0xFFFFFFFF; leh = leh * mt[it & 127] + it;
is [0] = it; is [1] = leh; is [0] = it; is [1] = leh;
if (leh & 0x80000000) if (leh < 0)
leh = leh ^ 0xFFFFFFFF; leh = ~leh;
return (leh); return (leh);
} }
@ -288,17 +289,17 @@ irandm(Sw *is)
unsigned int unsigned int
urandm(Sw *is) urandm(Sw *is)
{ {
Sw it, leh; int32_t it, leh;
it = is [0]; it = is [0];
leh = is [1]; leh = is [1];
/* Do a 7-place right cyclic shift of it */ /* Do a 7-place right cyclic shift of it */
it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25); it = ((it >> 7) & 0x01FFFFFF) + ((it & 0x7F) << 25);
if (!(it & 0x80000000)) if (it >= 0)
it = it ^ MASK; it = it ^ MASK;
leh = (leh * mt[it & 127] + it) & 0xFFFFFFFF; leh = leh * mt[it & 127] + it;
is [0] = it; is [1] = leh; is [0] = it; is [1] = leh;
return (leh); return (uint32_t) leh;
} }