Changeset b3048d4 for src/libcfa

Timestamp:

Jan 2, 2018, 2:19:30 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

300d75b

Parents:

8aa474a (diff), 54aba8d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src/libcfa

Files:

• bits/defs.h (modified) (2 diffs)
• stdlib (modified) (3 diffs)
• stdlib.c (modified) (3 diffs)

src/libcfa/bits/defs.h

@@ -1 @@
-//
+// 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-//
-// bits/defs.h --
-//
+// 
+// defs.h -- 
+// 
 // Author           : Thierry Delisle
-// Created On       : Thu Nov 09 13:24:10 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
-//
+// Created On       : Thu Nov  9 13:24:10 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jan  2 09:17:06 2018
+// Update Count     : 2
+// 
 
 #pragma once
@@ -20 +20 @@
 #include <stdint.h>
 
-#define unlikely(x)    __builtin_expect(!!(x), 0)
-#define likely  (x)    __builtin_expect(!!(x), 1)
+#define likely(x)   __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
 #define thread_local _Thread_local
 

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  1 17:35:43 2018
-// Update Count     : 291
+// Last Modified On : Tue Jan  2 12:21:04 2018
+// Update Count     : 292
 //
 
@@ -265 +265 @@
 //---------------------------------------
 
-void random_seed( long int s );
+extern "C" { void srandom( unsigned int seed ); }               // override C version
 char random( void );
 char random( char u );
@@ -275 +275 @@
 unsigned int random( unsigned int u );
 unsigned int random( unsigned int l, unsigned int u );
-extern "C" { long int random( void ); }
+extern "C" { long int random( void ); }                                 // override C version
 long int random( long int u );
 long int random( long int l, long int u );

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  1 19:03:16 2018
-// Update Count     : 437
+// Last Modified On : Tue Jan  2 12:20:32 2018
+// Update Count     : 441
 //
 
@@ -257 +257 @@
 //---------------------------------------
 
-void random_seed( long int s ) { srand48( s ); srandom( s ); } // call srandom to harmonize with C-lib random
+extern "C" { void srandom( unsigned int seed ) { srand48( seed ); } } // override C version
 char random( void ) { return (unsigned long int)random(); }
 char random( char u ) { return random( (unsigned long int)u ); }
@@ -267 +267 @@
 unsigned int random( unsigned int u ) { return random( (unsigned long int)u ); }
 unsigned int random( unsigned int l, unsigned int u ) { return random( (unsigned long int)l, (unsigned long int)u ); }
-//extern "C" { long int random() { return mrand48(); } }
+extern "C" { long int random( void ) { return mrand48(); } } // override C version
 long int random( long int u ) { if ( u < 0 ) return random( u, 0 ); else return random( 0, u ); }
 long int random( long int l, long int u ) { assert( l < u ); return lrand48() % (u - l) + l; }