random.cc (7575:0002812cefe5) random.cc (8658:f1a69b7246f7)
1/*
2 * Copyright (c) 2003-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 15 unchanged lines hidden (view full) ---

24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Authors: Nathan Binkert
29 * Ali Saidi
30 */
31
1/*
2 * Copyright (c) 2003-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 15 unchanged lines hidden (view full) ---

24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Authors: Nathan Binkert
29 * Ali Saidi
30 */
31
32#include <limits>
32#include "base/fenv.hh"
33#include "base/intmath.hh"
34#include "base/misc.hh"
35#include "base/random.hh"
36#include "sim/serialize.hh"
37
38using namespace std;
39

--- 22 unchanged lines hidden (view full) ---

62// random number to the nearest power of two greater than max. If
63// this number doesn't fall between 0 and max, we try again. Anything
64// else would skew the distribution.
65uint32_t
66Random::genrand(uint32_t max)
67{
68 if (max == 0)
69 return 0;
33#include "base/fenv.hh"
34#include "base/intmath.hh"
35#include "base/misc.hh"
36#include "base/random.hh"
37#include "sim/serialize.hh"
38
39using namespace std;
40

--- 22 unchanged lines hidden (view full) ---

63// random number to the nearest power of two greater than max. If
64// this number doesn't fall between 0 and max, we try again. Anything
65// else would skew the distribution.
66uint32_t
67Random::genrand(uint32_t max)
68{
69 if (max == 0)
70 return 0;
70 int log = ceilLog2(max) + 1;
71 if (max == std::numeric_limits<uint32_t>::max())
72 return genrand();
73
74 int log = ceilLog2(max + 1);
71 int shift = (sizeof(uint32_t) * 8 - log);
72 uint32_t random;
73
74 do {
75 random = genrand() >> shift;
76 } while (random > max);
77
78 return random;
79}
80
81uint64_t
82Random::genrand(uint64_t max)
83{
84 if (max == 0)
85 return 0;
75 int shift = (sizeof(uint32_t) * 8 - log);
76 uint32_t random;
77
78 do {
79 random = genrand() >> shift;
80 } while (random > max);
81
82 return random;
83}
84
85uint64_t
86Random::genrand(uint64_t max)
87{
88 if (max == 0)
89 return 0;
86 int log = ceilLog2(max) + 1;
90 if (max == std::numeric_limits<uint64_t>::max())
91 return genrand();
92
93 int log = ceilLog2(max + 1);
87 int shift = (sizeof(uint64_t) * 8 - log);
88 uint64_t random;
89
90 do {
91 random = (uint64_t)genrand() << 32 | (uint64_t)genrand();
92 random = random >> shift;
93 } while (random > max);
94

--- 26 unchanged lines hidden --- 		94 int shift = (sizeof(uint64_t) * 8 - log);
95 uint64_t random;
96
97 do {
98 random = (uint64_t)genrand() << 32 | (uint64_t)genrand();
99 random = random >> shift;
100 } while (random > max);
101

--- 26 unchanged lines hidden ---