Changeset 15d248e


Ignore:
Timestamp:
Jan 23, 2018, 1:12:35 PM (4 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
764b4b2, b6838214
Parents:
84e8423 (diff), 81e1f32 (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
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • src/Concurrency/Waitfor.cc

    r84e8423 r15d248e  
    507507                        new ListInit({
    508508                                new SingleInit( new AddressExpr( new VariableExpr( index ) ) ),
    509                                 new SingleInit( new VariableExpr( acceptables ) ),
    510                                 new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
     509                                new ListInit({
     510                                        new SingleInit( new VariableExpr( acceptables ) ),
     511                                        new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
     512                                })
    511513                        })
    512514                );
  • src/benchmark/Makefile.am

    r84e8423 r15d248e  
    198198
    199199waitfor-cfa1$(EXEEXT):
    200         ${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     200        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    201201
    202202waitfor-cfa2$(EXEEXT):
  • src/benchmark/Makefile.in

    r84e8423 r15d248e  
    607607
    608608waitfor-cfa1$(EXEEXT):
    609         ${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     609        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    610610
    611611waitfor-cfa2$(EXEEXT):
  • src/libcfa/concurrency/preemption.c

    r84e8423 r15d248e  
    300300        // Check if it is safe to preempt here
    301301        if( !preemption_ready() ) { return; }
     302
     303        // __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
    302304
    303305        preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler
  • src/tests/.expect/alloc-ERROR.txt

    r84e8423 r15d248e  
    11alloc.c:264:1 error: No reasonable alternatives for expression Applying untyped:
     2  Name: ?=?
     3...to:
     4  Name: p
     5  Applying untyped:
     6    Name: realloc
     7  ...to:
     8    Name: stp
     9    Applying untyped:
     10      Name: ?*?
     11    ...to:
     12      Name: dim
     13      Sizeof Expression on: Applying untyped:
     14          Name: *?
     15        ...to:
     16          Name: stp
     17
     18
     19
     20
     21alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
    222  Name: ?=?
    323...to:
     
    1939
    2040
    21 alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped:
     41alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
    2242  Name: ?=?
    2343...to:
     
    3050
    3151
    32 alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped:
     52alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped:
    3353  Name: ?=?
    3454...to:
  • src/tests/.expect/alloc.txt

    r84e8423 r15d248e  
    6060pointer arithmetic 0
    6161CFA deep malloc 0xdeadbeef
    62 
    63 SHOULD FAIL
  • src/tests/alloc.c

    r84e8423 r15d248e  
    1010// Created On       : Wed Feb  3 07:56:22 2016
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Nov 24 23:06:42 2017
    13 // Update Count     : 319
     12// Last Modified On : Mon Jan 22 21:26:40 2018
     13// Update Count     : 326
    1414//
    1515
     
    3232        // allocation, non-array types
    3333
    34         // int &r = malloc();
     34        // int & r = malloc();
    3535        // r = 0xdeadbeef;
    3636        // printf( "C   malloc %#x\n", r );
    3737        // free( &r );
    3838
    39         p = (int *)(void *)malloc( sizeof(*p) );                        // C malloc, type unsafe
     39        p = (int *)malloc( sizeof(*p) );                                        // C malloc, type unsafe
    4040        *p = 0xdeadbeef;
    4141        printf( "C   malloc %#x\n", *p );
     
    8888        printf( "\n" );
    8989
    90         p = (int *)(void *)realloc( p, dim * sizeof(*p) );      // C realloc
     90        p = (int *)realloc( p, dim * sizeof(*p) );                      // C realloc
    9191        for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
    9292        printf( "C   realloc\n" );
     
    259259        free( p );
    260260
     261#ifdef ERR1
    261262        stp = malloc();
    262263        printf( "\nSHOULD FAIL\n" );
    263 #ifdef ERR1
    264         p = alloc( stp, dim * sizeof(*stp) );
     264        p = realloc( stp, dim * sizeof( *stp ) );
     265        p = alloc( stp, dim * sizeof( *stp ) );
    265266        p = memset( stp, 10 );
    266267        p = memcpy( &st1, &st );
Note: See TracChangeset for help on using the changeset viewer.