Changeset 70a06f6 for src/libcfa/stdlib.c

Timestamp:

Apr 14, 2016, 4:13:10 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

356189a

Parents:

db4ecc5 (diff), 37f0da8 (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' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/AddVisit.h
src/SymTab/Validate.cc
src/SynTree/Expression.cc
src/SynTree/Expression.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/iostream.c

File:

• src/libcfa/stdlib.c (modified) (4 diffs)

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 23 13:26:42 2016
-// Update Count     : 146
+// Last Modified On : Wed Apr 13 14:49:58 2016
+// Update Count     : 155
 //
 
@@ -28 +28 @@
 
 forall( otype T ) T * malloc( void ) {
-        printf( "malloc1\n" );
+        //printf( "malloc1\n" );
     return (T *)malloc( sizeof(T) );
 } // malloc
-forall( otype T ) T * malloc( size_t size ) {
-        printf( "malloc2\n" );
-    return (T *)(void *)malloc( size );
-} // malloc
 forall( otype T ) T * malloc( char fill ) {
-        printf( "malloc3\n" );
+        //printf( "malloc3\n" );
         T * ptr = (T *)malloc( sizeof(T) );
     return memset( ptr );
 } // malloc
 
-forall( otype T ) T * calloc( size_t size ) {
-        printf( "calloc\n" );
-    return (T *)calloc( size, sizeof(T) );
+forall( otype T ) T * calloc( size_t nmemb ) {
+        //printf( "calloc\n" );
+    return (T *)calloc( nmemb, sizeof(T) );
 } // calloc
 
 forall( otype T ) T * realloc( T * ptr, size_t size ) {
-        printf( "realloc1\n" );
+        //printf( "realloc1\n" );
     return (T *)(void *)realloc( (void *)ptr, size );
 } // realloc
 forall( otype T ) T * realloc( T * ptr, size_t size, unsigned char fill ) {
-        printf( "realloc2\n" );
+        //printf( "realloc2\n" );
     char * nptr = (T *)(void *)realloc( (void *)ptr, size );
     size_t unused = malloc_usable_size( nptr );
@@ -59 +55 @@
 
 forall( otype T ) T * malloc( T * ptr, size_t size ) {
-        printf( "malloc4\n" );
+        //printf( "malloc4\n" );
     return (T *)realloc( ptr, size );
 } // malloc
 forall( otype T ) T * malloc( T * ptr, size_t size, unsigned char fill ) {
-        printf( "malloc5\n" );
+        //printf( "malloc5\n" );
     return (T *)realloc( ptr, size, fill );
 } // malloc
 
 forall( otype T ) T * aligned_alloc( size_t alignment ) {
-        printf( "aligned_alloc\n" );
+        //printf( "aligned_alloc\n" );
     return (T *)memalign( alignment, sizeof(T) );
 } // aligned_alloc
 
 forall( otype T ) T * memalign( size_t alignment ) {
-        printf( "memalign\n" );
+        //printf( "memalign\n" );
     return (T *)memalign( alignment, sizeof(T) );
 } // memalign
 
 forall( otype T ) int posix_memalign( T ** ptr, size_t alignment ) {
-        printf( "posix_memalign\n" );
+        //printf( "posix_memalign\n" );
     return posix_memalign( (void **)ptr, alignment, sizeof(T) );
 } // posix_memalign
 
 forall( otype T ) T * memset( T * ptr, unsigned char fill ) { // use default value '\0' for fill
-        printf( "memset1\n" );
+        //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" );
+        //printf( "memset2\n" );
     return (T *)memset( ptr, 0, malloc_usable_size( ptr ) );
 } // memset
@@ -240 +236 @@
 double _Complex abs( double _Complex v ) { return cabs( v ); }
 long double _Complex abs( long double _Complex v ) { return cabsl( v ); }
+
+//---------------------------------------
+
+float floor( float v ) { return floorf( v ); }
+long double floor( long double v ) { return floorl( v ); }
+
+float ceil( float v ) { return ceilf( v ); }
+long double ceil( long double v ) { return ceill( v ); }
 
 //---------------------------------------