Changeset ac12f1f


Ignore:
Timestamp:
Nov 13, 2020, 11:37:11 AM (11 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
a056f56
Parents:
1b033b8
Message:

canary is now a void * so it prints in hexa in gdb

Location:
libcfa/src/concurrency
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/invoke.h

    r1b033b8 rac12f1f  
    195195
    196196                #if defined( __CFA_WITH_VERIFY__ )
    197                         unsigned long long canary;
     197                        void * canary;
    198198                #endif
    199199        };
  • libcfa/src/concurrency/kernel.cfa

    r1b033b8 rac12f1f  
    255255                /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst ); // add escape condition if we are setting up the processor
    256256                /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
    257                 /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
     257                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
    258258
    259259
     
    263263                // when __cfactx_switch returns we are back in the processor coroutine
    264264
    265                 /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
     265                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
    266266                /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst );
    267267                /* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst );
     
    335335                #endif
    336336                /* paranoid */ verify( proc_cor->context.SP );
    337                 /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
     337                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
    338338                __cfactx_switch( &thrd_src->context, &proc_cor->context );
    339                 /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
     339                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
    340340                #if defined( __i386 ) || defined( __x86_64 )
    341341                        __x87_load;
     
    370370        /* paranoid */ #endif
    371371        /* paranoid */ verifyf( thrd->link.next == 0p, "Expected null got %p", thrd->link.next );
    372         /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd->canary );
     372        /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
    373373
    374374
  • libcfa/src/concurrency/kernel/startup.cfa

    r1b033b8 rac12f1f  
    456456        link.prev = 0p;
    457457        #if defined( __CFA_WITH_VERIFY__ )
    458                 canary = 0x0D15EA5E0D15EA5E;
     458                canary = 0x0D15EA5E0D15EA5Ep;
    459459        #endif
    460460
  • libcfa/src/concurrency/thread.cfa

    r1b033b8 rac12f1f  
    4141        link.preferred = -1;
    4242        #if defined( __CFA_WITH_VERIFY__ )
    43                 canary = 0x0D15EA5E0D15EA5E;
     43                canary = 0x0D15EA5E0D15EA5Ep;
    4444        #endif
    4545
     
    5353void ^?{}($thread& this) with( this ) {
    5454        #if defined( __CFA_WITH_VERIFY__ )
    55                 canary = 0xDEADDEADDEADDEAD;
     55                canary = 0xDEADDEADDEADDEADp;
    5656        #endif
    5757        unregister(curr_cluster, this);
Note: See TracChangeset for help on using the changeset viewer.