diff -rupN gcc-4.5.2/libcpp/Makefile.in gcc-4.5.2-my/libcpp/Makefile.in --- gcc-4.5.2/libcpp/Makefile.in 2010-12-16 14:49:03.000000000 +0200 +++ gcc-4.5.2-my/libcpp/Makefile.in 2011-01-07 05:09:56.149414000 +0200 @@ -89,11 +89,11 @@ endif libcpp_a_OBJS = charset.o directives.o directives-only.o errors.o \ expr.o files.o identifiers.o init.o lex.o line-map.o macro.o \ - mkdeps.o pch.o symtab.o traditional.o + mkdeps.o pch.o symtab.o traditional.o mt19937ar.o libcpp_a_SOURCES = charset.c directives.c directives-only.c errors.c \ expr.c files.c identifiers.c init.c lex.c line-map.c macro.c \ - mkdeps.c pch.c symtab.c traditional.c + mkdeps.c pch.c symtab.c traditional.c mt19937ar.c all: libcpp.a $(USED_CATALOGS) diff -rupN gcc-4.5.2/libcpp/RAND_example.c gcc-4.5.2-my/libcpp/RAND_example.c --- gcc-4.5.2/libcpp/RAND_example.c 1970-01-01 02:00:00.000000000 +0200 +++ gcc-4.5.2-my/libcpp/RAND_example.c 2011-01-10 09:21:00.000000000 +0200 @@ -0,0 +1,8 @@ +#include + +int main() +{ + printf ("%d\n", __RAND__&0xFF); + printf ("%d\n", __RAND__&0x7FFF); + printf ("%d\n", __RAND__); +}; diff -rupN gcc-4.5.2/libcpp/include/cpplib.h gcc-4.5.2-my/libcpp/include/cpplib.h --- gcc-4.5.2/libcpp/include/cpplib.h 2009-11-20 10:18:16.000000000 +0200 +++ gcc-4.5.2-my/libcpp/include/cpplib.h 2011-01-06 19:42:29.377929600 +0200 @@ -601,6 +601,7 @@ enum cpp_builtin_type BT_STDC, /* `__STDC__' */ BT_PRAGMA, /* `_Pragma' operator */ BT_TIMESTAMP, /* `__TIMESTAMP__' */ + BT_RAND, /* `__RAND__' */ BT_COUNTER /* `__COUNTER__' */ }; diff -rupN gcc-4.5.2/libcpp/init.c gcc-4.5.2-my/libcpp/init.c --- gcc-4.5.2/libcpp/init.c 2010-02-11 21:49:17.000000000 +0200 +++ gcc-4.5.2-my/libcpp/init.c 2011-01-06 19:35:34.287109300 +0200 @@ -117,6 +117,8 @@ cpp_set_lang (cpp_reader *pfile, enum c_ CPP_OPTION (pfile, uliterals) = l->uliterals; } +void init_genrand(unsigned long s); /* mt19937ar.c */ + /* Initialize library global state. */ static void init_library (void) @@ -136,6 +138,7 @@ init_library (void) (void) bindtextdomain (PACKAGE, LOCALEDIR); #endif } + init_genrand(time(NULL)); } /* Initialize a cpp_reader structure. */ @@ -346,6 +349,7 @@ static const struct builtin_macro builti B("__FILE__", BT_FILE, false), B("__BASE_FILE__", BT_BASE_FILE, false), B("__LINE__", BT_SPECLINE, true), + B("__RAND__", BT_RAND, true), B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true), B("__COUNTER__", BT_COUNTER, true), /* Keep builtins not used for -traditional-cpp at the end, and diff -rupN gcc-4.5.2/libcpp/macro.c gcc-4.5.2-my/libcpp/macro.c --- gcc-4.5.2/libcpp/macro.c 2009-11-20 10:18:16.000000000 +0200 +++ gcc-4.5.2-my/libcpp/macro.c 2011-01-06 19:36:06.333984300 +0200 @@ -111,6 +111,8 @@ static const char * const monthnames[] = "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; +unsigned long genrand_int32(void); /* mt19937ar.c */ + /* Helper function for builtin_macro. Returns the text generated by a builtin macro. */ const uchar * @@ -206,6 +208,10 @@ _cpp_builtin_macro_text (cpp_reader *pfi : pfile->cur_token[-1].src_loc); break; + case BT_RAND: + number = genrand_int32(); + break; + /* __STDC__ has the value 1 under normal circumstances. However, if (a) we are in a system header, (b) the option stdc_0_in_system_headers is true (set by target config), and diff -rupN gcc-4.5.2/libcpp/mt19937ar.c gcc-4.5.2-my/libcpp/mt19937ar.c --- gcc-4.5.2/libcpp/mt19937ar.c 1970-01-01 02:00:00.000000000 +0200 +++ gcc-4.5.2-my/libcpp/mt19937ar.c 2011-01-07 06:20:31.972656200 +0200 @@ -0,0 +1,191 @@ +/* + A C-program for MT19937, with initialization improved 2002/1/26. + Coded by Takuji Nishimura and Makoto Matsumoto. + + Before using, initialize the state by using init_genrand(seed) + or init_by_array(init_key, key_length). + + Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. 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. + + 3. The names of its contributors may not 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. + + + Any feedback is very welcome. + http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html + email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space) +*/ + +#include + +/* Period parameters */ +#define N 624 +#define M 397 +#define MATRIX_A 0x9908b0dfUL /* constant vector a */ +#define UPPER_MASK 0x80000000UL /* most significant w-r bits */ +#define LOWER_MASK 0x7fffffffUL /* least significant r bits */ + +static unsigned long mt[N]; /* the array for the state vector */ +static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */ + +/* initializes mt[N] with a seed */ +void init_genrand(unsigned long s) +{ + mt[0]= s & 0xffffffffUL; + for (mti=1; mti> 30)) + mti); + /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */ + /* In the previous versions, MSBs of the seed affect */ + /* only MSBs of the array mt[]. */ + /* 2002/01/09 modified by Makoto Matsumoto */ + mt[mti] &= 0xffffffffUL; + /* for >32 bit machines */ + } +} +#if 0 +/* initialize by an array with array-length */ +/* init_key is the array for initializing keys */ +/* key_length is its length */ +/* slight change for C++, 2004/2/26 */ +void init_by_array(unsigned long init_key[], int key_length) +{ + int i, j, k; + init_genrand(19650218UL); + i=1; j=0; + k = (N>key_length ? N : key_length); + for (; k; k--) { + mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL)) + + init_key[j] + j; /* non linear */ + mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */ + i++; j++; + if (i>=N) { mt[0] = mt[N-1]; i=1; } + if (j>=key_length) j=0; + } + for (k=N-1; k; k--) { + mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL)) + - i; /* non linear */ + mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */ + i++; + if (i>=N) { mt[0] = mt[N-1]; i=1; } + } + + mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */ +} +#endif +/* generates a random number on [0,0xffffffff]-interval */ +unsigned long genrand_int32(void) +{ + unsigned long y; + static unsigned long mag01[2]={0x0UL, MATRIX_A}; + /* mag01[x] = x * MATRIX_A for x=0,1 */ + + if (mti >= N) { /* generate N words at one time */ + int kk; + + if (mti == N+1) /* if init_genrand() has not been called, */ + init_genrand(5489UL); /* a default initial seed is used */ + + for (kk=0;kk> 1) ^ mag01[y & 0x1UL]; + } + for (;kk> 1) ^ mag01[y & 0x1UL]; + } + y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK); + mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL]; + + mti = 0; + } + + y = mt[mti++]; + + /* Tempering */ + y ^= (y >> 11); + y ^= (y << 7) & 0x9d2c5680UL; + y ^= (y << 15) & 0xefc60000UL; + y ^= (y >> 18); + + return y; +} +#if 0 +/* generates a random number on [0,0x7fffffff]-interval */ +long genrand_int31(void) +{ + return (long)(genrand_int32()>>1); +} + +/* generates a random number on [0,1]-real-interval */ +double genrand_real1(void) +{ + return genrand_int32()*(1.0/4294967295.0); + /* divided by 2^32-1 */ +} + +/* generates a random number on [0,1)-real-interval */ +double genrand_real2(void) +{ + return genrand_int32()*(1.0/4294967296.0); + /* divided by 2^32 */ +} + +/* generates a random number on (0,1)-real-interval */ +double genrand_real3(void) +{ + return (((double)genrand_int32()) + 0.5)*(1.0/4294967296.0); + /* divided by 2^32 */ +} + +/* generates a random number on [0,1) with 53-bit resolution*/ +double genrand_res53(void) +{ + unsigned long a=genrand_int32()>>5, b=genrand_int32()>>6; + return(a*67108864.0+b)*(1.0/9007199254740992.0); +} +/* These real versions are due to Isaku Wada, 2002/01/09 added */ + +int main(void) +{ + int i; + unsigned long init[4]={0x123, 0x234, 0x345, 0x456}, length=4; + init_by_array(init, length); + printf("1000 outputs of genrand_int32()\n"); + for (i=0; i<1000; i++) { + printf("%10lu ", genrand_int32()); + if (i%5==4) printf("\n"); + } + printf("\n1000 outputs of genrand_real2()\n"); + for (i=0; i<1000; i++) { + printf("%10.8f ", genrand_real2()); + if (i%5==4) printf("\n"); + } + return 0; +} +#endif