63fdabf191
pretty close to compiling w/ suns compiler
briefly:
add dummy return after panic()/fatal()
split out flags by compiler vendor
include cstring and cmath where appropriate
use std namespace for string ops
SConstruct:
Add code to detect compiler and choose cflags based on detected compiler
Fix zlib check to work with suncc
src/SConscript:
split out flags by compiler vendor
src/arch/sparc/isa/decoder.isa:
use correct namespace for sqrt
src/arch/sparc/isa/formats/basic.isa:
add dummy return around panic
src/arch/sparc/isa/formats/integerop.isa:
use correct namespace for stringops
src/arch/sparc/isa/includes.isa:
include cstring and cmath where appropriate
src/arch/sparc/isa_traits.hh:
remove dangling comma
src/arch/sparc/system.cc:
dummy return to make sun cc front end happy
src/arch/sparc/tlb.cc:
src/base/compression/lzss_compression.cc:
use std namespace for string ops
src/arch/sparc/utility.hh:
no reason to say something is unsigned unsigned int
src/base/compression/null_compression.hh:
dummy returns to for suncc front end
src/base/cprintf.hh:
use standard variadic argument syntax instead of gnuc specefic renaming
src/base/hashmap.hh:
don't need to define hash for suncc
src/base/hostinfo.cc:
need stdio.h for sprintf
src/base/loader/object_file.cc:
munmap is in std namespace not null
src/base/misc.hh:
use M5 generic noreturn macros
use standard variadic macro __VA_ARGS__
src/base/pollevent.cc:
we need file.h for file flags
src/base/random.cc:
mess with include files to make suncc happy
src/base/remote_gdb.cc:
malloc memory for function instead of having a non-constant in an array size
src/base/statistics.hh:
use std namespace for floor
src/base/stats/text.cc:
include math.h for rint (cmath won't work)
src/base/time.cc:
use suncc version of ctime_r
src/base/time.hh:
change macro to work with both gcc and suncc
src/base/timebuf.hh:
include cstring from memset and use std::
src/base/trace.hh:
change variadic macros to be normal format
src/cpu/SConscript:
add dummy returns where appropriate
src/cpu/activity.cc:
include cstring for memset
src/cpu/exetrace.hh:
include cstring fro memcpy
src/cpu/simple/base.hh:
add dummy return for panic
src/dev/baddev.cc:
src/dev/pciconfigall.cc:
src/dev/platform.cc:
src/dev/sparc/t1000.cc:
add dummy return where appropriate
src/dev/ide_atareg.h:
make define work for both gnuc and suncc
src/dev/io_device.hh:
add dummy returns where approirate
src/dev/pcidev.hh:
src/mem/cache/cache_impl.hh:
src/mem/cache/miss/blocking_buffer.cc:
src/mem/cache/tags/lru.hh:
src/mem/cache/tags/split.hh:
src/mem/cache/tags/split_lifo.hh:
src/mem/cache/tags/split_lru.hh:
src/mem/dram.cc:
src/mem/packet.cc:
src/mem/port.cc:
include cstring for string ops
src/dev/sparc/mm_disk.cc:
add dummy return where appropriate
include cstring for string ops
src/mem/cache/miss/blocking_buffer.hh:
src/mem/port.hh:
Add dummy return where appropriate
src/mem/cache/tags/iic.cc:
cast hastSets to double for log() call
src/mem/physical.cc:
cast pmemAddr to char* for munmap
src/sim/byteswap.hh:
make define work for suncc and gnuc
--HG--
extra : convert_revision : ef8a1f1064e43b6c39838a85c01aee4f795497bd
126 lines
3 KiB
C++
126 lines
3 KiB
C++
/*
|
|
* Copyright (c) 2003-2005 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Nathan Binkert
|
|
* Ali Saidi
|
|
*/
|
|
|
|
#if defined(__sun)
|
|
#include <ieeefp.h>
|
|
#endif
|
|
#ifdef __SUNPRO_CC
|
|
#include <stdlib.h>
|
|
#include <math.h>
|
|
#endif
|
|
|
|
#include <cstdlib>
|
|
#include <cmath>
|
|
|
|
|
|
#include "sim/param.hh"
|
|
#include "base/random.hh"
|
|
#include "base/trace.hh"
|
|
|
|
using namespace std;
|
|
|
|
class RandomContext : public ParamContext
|
|
{
|
|
public:
|
|
RandomContext(const string &_iniSection)
|
|
: ::ParamContext(_iniSection) {}
|
|
~RandomContext() {}
|
|
|
|
void checkParams();
|
|
};
|
|
|
|
RandomContext paramContext("random");
|
|
|
|
Param<unsigned>
|
|
seed(¶mContext, "seed", "seed to random number generator", 1);
|
|
|
|
void
|
|
RandomContext::checkParams()
|
|
{
|
|
::srand48(seed);
|
|
}
|
|
|
|
long
|
|
getLong()
|
|
{
|
|
return mrand48();
|
|
}
|
|
|
|
double
|
|
m5round(double r)
|
|
{
|
|
#if defined(__sun)
|
|
double val;
|
|
fp_rnd oldrnd = fpsetround(FP_RN);
|
|
val = rint(r);
|
|
fpsetround(oldrnd);
|
|
return val;
|
|
#else
|
|
return round(r);
|
|
#endif
|
|
}
|
|
|
|
int64_t
|
|
getUniform(int64_t min, int64_t max)
|
|
{
|
|
double r;
|
|
r = drand48() * (max-min) + min;
|
|
|
|
return (int64_t)m5round(r);
|
|
}
|
|
|
|
uint64_t
|
|
getUniformPos(uint64_t min, uint64_t max)
|
|
{
|
|
double r;
|
|
r = drand48() * (max-min) + min;
|
|
|
|
return (uint64_t)m5round(r);
|
|
}
|
|
|
|
|
|
// idea for generating a double from erand48
|
|
double
|
|
getDouble()
|
|
{
|
|
union {
|
|
uint32_t _long[2];
|
|
uint16_t _short[4];
|
|
};
|
|
|
|
_long[0] = mrand48();
|
|
_long[1] = mrand48();
|
|
|
|
return ldexp((double) _short[0], -48) +
|
|
ldexp((double) _short[1], -32) +
|
|
ldexp((double) _short[2], -16);
|
|
}
|