Changeset 730f4f1


Ignore:
Timestamp:
May 12, 2020, 1:59:09 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
4fa44e7, 70ac8d0
Parents:
7c6b262 (diff), fe1025d (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:software/cfa/cfa-cc

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/exception.c

    r7c6b262 r730f4f1  
    121121
    122122
    123 // TERMINATION ===============================================================
    124 
    125 // MEMORY MANAGEMENT (still for integers)
    126 // May have to move to cfa for constructors and destructors (references).
     123// MEMORY MANAGEMENT =========================================================
    127124
    128125// How to clean up an exception in various situations.
     
    203200}
    204201
    205 // If this isn't a rethrow (*except==0), delete the provided exception.
    206 void __cfaehm_cleanup_terminate( void * except ) {
    207         if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except );
    208 }
     202// CANCELLATION ==============================================================
    209203
    210204// Function needed by force unwind
     
    228222}
    229223
     224// Cancel the current stack, prefroming approprate clean-up and messaging.
     225static __attribute__((noreturn)) void __cfaehm_cancel_stack(
     226                exception_t * exception ) {
     227        // TODO: Detect current stack and pick a particular stop-function.
     228        _Unwind_Reason_Code ret;
     229        ret = _Unwind_ForcedUnwind( &this_exception_storage, _Stop_Fn, (void*)0x22 );
     230        printf("UNWIND ERROR %d after force unwind\n", ret);
     231        abort();
     232}
     233
     234
     235// TERMINATION ===============================================================
     236
     237// If this isn't a rethrow (*except==0), delete the provided exception.
     238void __cfaehm_cleanup_terminate( void * except ) {
     239        if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except );
     240}
     241
    230242// The exception that is being thrown must already be stored.
    231243static __attribute__((noreturn)) void __cfaehm_begin_unwind(void) {
     
    245257        // the whole stack.
    246258
     259        // No handler found, go to the default operation.
     260        // Currently this will always be a cancellation.
    247261        if ( ret == _URC_END_OF_STACK ) {
    248                 // No proper handler was found. This can be handled in many ways, C++ calls std::terminate.
    249                 // Here we force unwind the stack, basically raising a cancellation.
    250                 printf("Uncaught exception %p\n", &this_exception_storage);
    251 
    252                 ret = _Unwind_ForcedUnwind( &this_exception_storage, _Stop_Fn, (void*)0x22 );
    253                 printf("UNWIND ERROR %d after force unwind\n", ret);
    254                 abort();
     262                __cfadbg_print_safe(exception, "Uncaught exception %p\n", &this_exception_storage);
     263
     264                __cfaehm_cancel_stack(this_exception_context()->current_exception);
    255265        }
    256266
  • tests/exceptions/.expect/resume.txt

    r7c6b262 r730f4f1  
    44end of try clause
    55Exiting: simple try clause
     6
     7catch-all
    68
    79throwing child exception
  • tests/exceptions/.expect/terminate.txt

    r7c6b262 r730f4f1  
    33simple catch
    44Exiting: simple catch clause
     5
     6catch-all
    57
    68throwing child exception
  • tests/exceptions/resume.cfa

    r7c6b262 r730f4f1  
    1919                loud_exit a = "simple catch clause";
    2020                printf("simple catch\n");
     21        }
     22        printf("\n");
     23
     24        // Throw catch-all test.
     25        try {
     26                throwResume &(zen){};
     27        } catchResume (exception_t * error) {
     28                printf("catch-all\n");
    2129        }
    2230        printf("\n");
  • tests/exceptions/terminate.cfa

    r7c6b262 r730f4f1  
    1717                printf("end of try clause\n");
    1818        } catch (zen * error) {
    19         loud_exit a = "simple catch clause";
     19                loud_exit a = "simple catch clause";
    2020                printf("simple catch\n");
     21        }
     22        printf("\n");
     23
     24        // Throw catch-all test.
     25        try {
     26                throw &(zen){};
     27        } catch (exception_t * error) {
     28                printf("catch-all\n");
    2129        }
    2230        printf("\n");
Note: See TracChangeset for help on using the changeset viewer.