Changeset 0438091

Timestamp:

Mar 22, 2016, 10:39:34 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

6a57da5

Parents:

94980502

Message:

modify stdlib random to not use C library routine

Location:

src

Files:

• examples/random.c (modified) (1 diff)
• libcfa/builtins.cf (modified) (1 diff)
• libcfa/stdlib (modified) (4 diffs)
• libcfa/stdlib.c (modified) (4 diffs)

src/examples/random.c

@@ -7 +7 @@
 
 int main() {
-        randseed( getpid() );                                                           // set random seed
+        rand48seed( getpid() );                                                         // set random seed
 
         // test polymorphic calls to random and stream
-        char c = random();
+        char c = rand48();
         sout | c | endl;
-        int i = random();
+        int i = rand48();
     sout | i | endl;
-        unsigned int ui = random();
+        unsigned int ui = rand48();
     sout | ui | endl;
-        long int li = random();
+        long int li = rand48();
     sout | li | endl;
-        unsigned long int uli = random();
+        unsigned long int uli = rand48();
     sout | uli | endl;
-    float f = random();
+    float f = rand48();
     sout | f | endl;
-    double d = random();
+    double d = rand48();
     sout | d | endl;
-    float _Complex fc = random();
+    float _Complex fc = rand48();
     sout | fc | endl;
-    double _Complex dc = random();
+    double _Complex dc = rand48();
     sout | dc | endl;
-    long double _Complex ldc = random();
+    long double _Complex ldc = rand48();
     sout | ldc | endl;
 } // main

src/libcfa/builtins.cf

@@ -584 +584 @@
 int __builtin_LINE();
 extern const char *__PRETTY_FUNCTION__;
-typedef int wchar_t;

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:38:21 2016
-// Update Count     : 64
+// Last Modified On : Tue Mar 22 22:34:24 2016
+// Update Count     : 69
 //
 
@@ -19 +19 @@
 #include <stddef.h>                                                                             // size_t
 } // extern "C"
-
-forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
-forall( otype T ) T * memset( T * ptr );                                        // remove when default value available
 
 forall( otype T ) T * malloc( void );
@@ -34 +31 @@
 forall( otype T ) T * memalign( size_t alignment );             // deprecated
 forall( otype T ) int posix_memalign( T ** ptr, size_t alignment );
+
+forall( otype T ) T * memset( T * ptr, unsigned char fill ); // use default value '\0' for fill
+forall( otype T ) T * memset( T * ptr );                                // remove when default value available
 
 //---------------------------------------
@@ -93 +93 @@
 //---------------------------------------
 
-void randseed( long int s );
-char random();
-int random();
-unsigned int random();
-long int random();
-unsigned long int random();
-float random();
-double random();
-float _Complex random();
-double _Complex random();
-long double _Complex random();
+void rand48seed( long int s );
+char rand48();
+int rand48();
+unsigned int rand48();
+long int rand48();
+unsigned long int rand48();
+float rand48();
+double rand48();
+float _Complex rand48();
+double _Complex rand48();
+long double _Complex rand48();
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:38:47 2016
-// Update Count     : 143
+// Last Modified On : Tue Mar 22 22:34:26 2016
+// Update Count     : 145
 //
 
@@ -26 +26 @@
 #include <complex.h>                                                                    // _Complex_I, cabsf, cabs, cabsl
 } // extern "C"
-
-forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
-        printf( "memset1\n" );
-    return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
-} // memset
-forall( otype T ) T * memset( T * ptr ) {                               // remove when default value available
-        printf( "memset2\n" );
-    return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
-} // memset
 
 forall( otype T ) T * malloc( void ) {
@@ -91 +82 @@
 } // posix_memalign
 
+forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
+        printf( "memset1\n" );
+    return (T *)memset( ptr, (int)fill, malloc_usable_size( ptr ) );
+} // memset
+forall( otype T ) T * memset( T * ptr ) {                               // remove when default value available
+        printf( "memset2\n" );
+    return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
+} // memset
+
 //---------------------------------------
 
@@ -243 +243 @@
 //---------------------------------------
 
-void randseed( long int s ) { srand48( s ); }
-char random() { return lrand48(); }
-int random() { return mrand48(); }
-unsigned int random() { return lrand48(); }
-long int random() { return mrand48(); }
-unsigned long int random() { return lrand48(); }
-float random() { return (float)drand48(); }                             // otherwise float uses lrand48
-double random() { return drand48(); }
-float _Complex random() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
-double _Complex random() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
-long double _Complex random() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
+void rand48seed( long int s ) { srand48( s ); }
+char rand48() { return lrand48(); }
+int rand48() { return mrand48(); }
+unsigned int rand48() { return lrand48(); }
+long int rand48() { return mrand48(); }
+unsigned long int rand48() { return lrand48(); }
+float rand48() { return (float)drand48(); }                             // otherwise float uses lrand48
+double rand48() { return drand48(); }
+float _Complex rand48() { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
+double _Complex rand48() { return drand48() + (double _Complex)(drand48() * _Complex_I); }
+long double _Complex rand48() { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
 //---------------------------------------