Index: src/examples/abs.c =================================================================== --- src/examples/abs.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/abs.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -10,10 +10,10 @@ // Created On : Thu Jan 28 18:26:16 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Jan 31 09:24:45 2016 -// Update Count : 41 +// Last Modified On : Wed Feb 3 11:14:58 2016 +// Update Count : 43 // #include -#include +#include // abs int main( void ) { Index: src/examples/alloc.c =================================================================== --- src/examples/alloc.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/alloc.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -1,48 +1,74 @@ -#if 0 +// -*- Mode: C -*- +// +// 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. +// +// alloc.c -- +// +// Author : Peter A. Buhr +// Created On : Wed Feb 3 07:56:22 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Feb 3 16:32:04 2016 +// Update Count : 38 +// + +#include +#include extern "C" { - typedef long unsigned int size_t; - void *malloc( size_t size ); - void *calloc( size_t nmemb, size_t size ); - void *realloc( void *ptr, size_t size ); - void *memset( void *s, int c, size_t n ); - void free( void * ptr ); - int printf( const char *, ... ); -} +#include // access C malloc, realloc +#include +} // exten "C" -forall( type T ) T * malloc( void ) { - return (T *)malloc( sizeof(T) ); -} -forall( type T ) T * calloc( size_t size ) { - return (T *)calloc( size, sizeof(T) ); -} -#endif -typedef int size_t; -forall( type T ) T * realloc( T *ptr, size_t n ) { -// return (T *)(void *)realloc( ptr, sizeof(T) ); -} -//forall( type T ) T * realloc( T *ptr, size_t n, T c ) { -// return (T *)realloc( ptr, n ); -//} - -//int *foo( int *p, int c ); -//int *bar( int *p, int c ); -//int *baz( int *p, int c ); +int * foo( int * p, int c ) { return p; } +int * bar( int * p, int c ) { return p; } +int * baz( int * p, int c ) { return p; } int main( void ) { - // size_t size = 10; - //int * x = malloc(); - int * x; - // x = malloc(); - // x = calloc( 10 ); // calloc: array set to 0 - // x = realloc( x, 10 ); - // x = realloc( x, 10, '\0' ); - // x = malloc( 5 ); - // float *fp = malloc() + 1; + ofstream * sout = ofstream_stdout(); - struct St1 { int x; double y; }; - struct St1 * st1; -// double *y; - x = realloc( st1, 10 ); // SHOULD FAIL!! + size_t size = 10; + int * p; + struct S { int x; double y; } * s; + + p = malloc( sizeof(*p) ); // C malloc, type unsafe + printf( "here1\n" ); + free( p ); + p = malloc(); // CFA malloc, type safe + printf( "here2\n" ); + free( p ); + p = malloc( (char)'\0' ); // CFA malloc, type safe + printf( "here3\n" ); + p = malloc( p, 1000 ); // CFA remalloc, type safe + printf( "here4\n" ); + free( p ); + p = calloc( size, sizeof(*p) ); // C calloc, type unsafe + printf( "here5\n" ); + free( p ); + p = calloc( size ); // CFA calloc, type safe + printf( "here6\n" ); + free( p ); + p = calloc( size ); // CFA calloc, type safe + p = realloc( p, 1000 ); // C realloc, type unsafe + p = realloc( p, 1000, '\0' ); // CFA realloc, type unsafe + p = memset( p ); // CFA memset, type unsafe + printf( "here7\n" ); + free( p ); + p = memalign( 16 ); + printf( "here8\n" ); + free( p ); + posix_memalign( &p, 16 ); + printf( "here9\n" ); + free( p ); #if 0 + float * fp = malloc() + 1; + fprintf( stderr, "%p %p\n", fp, fp - 1 ); + free( fp - 1 ); + p = realloc( st1, size, '\0' ); // C realloc, type unsafe + + double *y; + x = memset( st1, '\0' ); // SHOULD FAIL!! + int *p; p = foo( bar( baz( malloc(), 0 ), 0 ), 0 ); @@ -74,3 +100,9 @@ free( x ); #endif + free( sout ); } + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa alloc.c" // +// End: // Index: src/examples/minmax.c =================================================================== --- src/examples/minmax.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/minmax.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -10,10 +10,10 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Feb 1 11:35:53 2016 -// Update Count : 44 +// Last Modified On : Wed Feb 3 11:14:49 2016 +// Update Count : 46 // #include -#include +#include // min, max int main( void ) { Index: src/examples/random.c =================================================================== --- src/examples/random.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/random.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -4,5 +4,5 @@ #include -#include // random +#include // random int main() { Index: src/examples/sum.c =================================================================== --- src/examples/sum.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/sum.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Thu Jan 28 17:05:53 2016 -// Update Count : 130 +// Last Modified On : Fri Feb 5 16:47:44 2016 +// Update Count : 139 // @@ -33,13 +33,13 @@ // Required to satisfy sumable as char does not have addition. -const char 0; -char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion -char ++?( char *op ) { *op += 1; return *op; } -char ?++( char *op ) { char temp = *op; *op += 1; return temp; } +// const char 0; +// char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion +// char ++?( char *op ) { *op += 1; return *op; } +// char ?++( char *op ) { char temp = *op; *op += 1; return temp; } int main( void ) { const int low = 5, High = 15, size = High - low; - ofstream *sout = ofstream_stdout(); +#if 0 char s = 0, a[size]; @@ -69,7 +69,8 @@ sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is " | sum( size, (float *)a ) | ", check " | (float)s | endl; +#endif + double s = 0, a[size]; + double v = low / 10.0; - double s = 0.0, a[size]; - double v = low / 10.0; for ( int i = 0; i < size; i += 1, v += 0.1 ) { s += (double)v; @@ -78,4 +79,13 @@ sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is " | sum( size, (double *)a ) | ", check " | (double)s | endl; + + // struct S { int i, j; } sarr[size]; + // struct S 0 = { 0, 0 }; + // struct S 1 = { 1, 1 }; + // S ?+?( S t1, S t2 ) { S s = { t1.i + t1.j, t2.i + t2.j }; return s; } + // S ?+=?( S *t1, S t2 ) { *t1 = *t1 + t2; return *t1; } + // S ++?( S *t ) { *t += 1; return *t; } + // S ?++( S *t ) { S temp = *t; *t += 1; return temp; } + // sum( size, sarr ); } // main Index: src/examples/swap.c =================================================================== --- src/examples/swap.c (revision 5721a6da612c3a9661eb16d198fe90326b196c40) +++ src/examples/swap.c (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) @@ -10,10 +10,10 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Feb 1 12:30:15 2016 -// Update Count : 61 +// Last Modified On : Wed Feb 3 11:14:04 2016 +// Update Count : 63 // #include -#include +#include // swap int main( void ) {