Changeset 730f4f1
- Timestamp:
- May 12, 2020, 1:59:09 PM (4 years ago)
- 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. - Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
libcfa/src/exception.c
r7c6b262 r730f4f1 121 121 122 122 123 // TERMINATION =============================================================== 124 125 // MEMORY MANAGEMENT (still for integers) 126 // May have to move to cfa for constructors and destructors (references). 123 // MEMORY MANAGEMENT ========================================================= 127 124 128 125 // How to clean up an exception in various situations. … … 203 200 } 204 201 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 ============================================================== 209 203 210 204 // Function needed by force unwind … … 228 222 } 229 223 224 // Cancel the current stack, prefroming approprate clean-up and messaging. 225 static __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. 238 void __cfaehm_cleanup_terminate( void * except ) { 239 if ( *(void**)except ) __cfaehm_delete_exception( *(exception_t **)except ); 240 } 241 230 242 // The exception that is being thrown must already be stored. 231 243 static __attribute__((noreturn)) void __cfaehm_begin_unwind(void) { … … 245 257 // the whole stack. 246 258 259 // No handler found, go to the default operation. 260 // Currently this will always be a cancellation. 247 261 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); 255 265 } 256 266 -
tests/exceptions/.expect/resume.txt
r7c6b262 r730f4f1 4 4 end of try clause 5 5 Exiting: simple try clause 6 7 catch-all 6 8 7 9 throwing child exception -
tests/exceptions/.expect/terminate.txt
r7c6b262 r730f4f1 3 3 simple catch 4 4 Exiting: simple catch clause 5 6 catch-all 5 7 6 8 throwing child exception -
tests/exceptions/resume.cfa
r7c6b262 r730f4f1 19 19 loud_exit a = "simple catch clause"; 20 20 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"); 21 29 } 22 30 printf("\n"); -
tests/exceptions/terminate.cfa
r7c6b262 r730f4f1 17 17 printf("end of try clause\n"); 18 18 } catch (zen * error) { 19 19 loud_exit a = "simple catch clause"; 20 20 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"); 21 29 } 22 30 printf("\n");
Note: See TracChangeset
for help on using the changeset viewer.