Changeset bfc0f40

Timestamp:

Oct 30, 2017, 6:18:06 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

9f865d1

Parents:

bd7f401

Message:

add more unsigned int rand48 routines

Location:

src/libcfa

Files:

• stdlib (modified) (3 diffs)
• stdlib.c (modified) (2 diffs)

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 23 20:29:47 2017
-// Update Count     : 224
+// Last Modified On : Mon Oct 30 17:30:09 2017
+// Update Count     : 242
 //
 
@@ -27 +27 @@
 // allocation, non-array types
 static inline forall( dtype T | sized(T) ) T * malloc( void ) {
-        //printf( "X1\n" );
+        // printf( "* malloc\n" );
         return (T *)(void *)malloc( (size_t)sizeof(T) );        // C malloc
 } // malloc
+
+// static inline forall( dtype T | sized(T) ) T & malloc( void ) {
+//      int & p = *(T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
+//      printf( "& malloc %p\n", &p );
+//      return p;
+// //   return (T &)*(T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
+// } // malloc
 
 extern "C" { void * calloc( size_t dim, size_t size ); } // default C routine
@@ -208 +215 @@
 void rand48seed( long int s );
 char rand48( void );
+char rand48( char l, char u );
 int rand48( void );
 unsigned int rand48( void );
+unsigned int rand48( unsigned int u );
+unsigned int rand48( unsigned int l, unsigned int u );
 long int rand48( void );
 unsigned long int rand48( void );
+unsigned long int rand48( unsigned long int u );
+unsigned long int rand48( unsigned long int l, unsigned long int u );
 float rand48( void );
 double rand48( void );

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 Aug 23 20:30:44 2017
-// Update Count     : 292
+// Last Modified On : Mon Oct 30 17:53:04 2017
+// Update Count     : 295
 //
 
@@ -277 +277 @@
 void rand48seed( long int s ) { srand48( s ); }
 char rand48( void ) { return mrand48(); }
+char rand48( char l, char u ) { return lrand48() % (u - l) + l; }
 int rand48( void ) { return mrand48(); }
 unsigned int rand48( void ) { return lrand48(); }
+unsigned int rand48( unsigned int u ) { return lrand48() % u; }
+unsigned int rand48( unsigned int l, unsigned int u ) { return lrand48() % (u - l) + l; }
 long int rand48( void ) { return mrand48(); }
 unsigned long int rand48( void ) { return lrand48(); }
+unsigned long int rand48( unsigned long int u ) { return lrand48() % u; }
+unsigned long int rand48( unsigned long int l, unsigned long int u ) { return lrand48() % (u - l) + l; }
 float rand48( void ) { return (float)drand48(); }               // otherwise float uses lrand48
 double rand48( void ) { return drand48(); }