Changeset ac12f1f

Timestamp:

Nov 13, 2020, 11:37:11 AM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

a056f56

Parents:

1b033b8

Message:

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

Location:

libcfa/src/concurrency

Files:

• invoke.h (modified) (1 diff)
• kernel.cfa (modified) (4 diffs)
• kernel/startup.cfa (modified) (1 diff)
• thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/invoke.h

@@ -195 +195 @@
 
                 #if defined( __CFA_WITH_VERIFY__ )
-                        unsigned long long canary;
+                        void * canary;
                 #endif
         };

libcfa/src/concurrency/kernel.cfa

@@ -255 +255 @@
                 /* 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
                 /* 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
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
 
 
@@ -263 +263 @@
                 // when __cfactx_switch returns we are back in the processor coroutine
 
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
                 /* 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 );
                 /* 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 );
@@ -335 +335 @@
                 #endif
                 /* paranoid */ verify( proc_cor->context.SP );
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
                 __cfactx_switch( &thrd_src->context, &proc_cor->context );
-                /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+                /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
                 #if defined( __i386 ) || defined( __x86_64 )
                         __x87_load;
@@ -370 +370 @@
         /* paranoid */ #endif
         /* paranoid */ verifyf( thrd->link.next == 0p, "Expected null got %p", thrd->link.next );
-        /* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd->canary );
+        /* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
 

libcfa/src/concurrency/kernel/startup.cfa

@@ -456 +456 @@
         link.prev = 0p;
         #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0x0D15EA5E0D15EA5E;
+                canary = 0x0D15EA5E0D15EA5Ep;
         #endif
 

libcfa/src/concurrency/thread.cfa

@@ -41 +41 @@
         link.preferred = -1;
         #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0x0D15EA5E0D15EA5E;
+                canary = 0x0D15EA5E0D15EA5Ep;
         #endif
 
@@ -53 +53 @@
 void ^?{}($thread& this) with( this ) {
         #if defined( __CFA_WITH_VERIFY__ )
-                canary = 0xDEADDEADDEADDEAD;
+                canary = 0xDEADDEADDEADDEADp;
         #endif
         unregister(curr_cluster, this);