Changes in doc/working/exception/impl/main.c [6b72040:4a58895]

File:

• doc/working/exception/impl/main.c (modified) (5 diffs)

doc/working/exception/impl/main.c

@@ -1 +1 @@
 #include <stdio.h>
 #include "except.h"
-
-// Requires -fexceptions to work.
 
 #define EXCEPTION 2
@@ -28 +26 @@
 extern int this_exception;
 _Unwind_Reason_Code foo_try_match() {
-        printf(" (foo_try_match called)");
-        return this_exception == EXCEPTION ? _URC_HANDLER_FOUND : _URC_CONTINUE_UNWIND;
+        return this_exception == 3 ? _URC_HANDLER_FOUND : _URC_CONTINUE_UNWIND;
 }
 
@@ -37 +34 @@
 //for details
 __attribute__((noinline))
-void try( void (*try_block)(), void (*catch_block)(),
-          _Unwind_Reason_Code (*match_block)() )
+void try( void (*try_block)(), void (*catch_block)() )
 {
-        volatile int xy = 0;
-        printf("%p %p %p %p\n", &try_block, &catch_block, &match_block, &xy);
-
         //Setup statments
         //These 2 statments won't actually result in any code,
@@ -102 +95 @@
         "       .uleb128 .CATCH-try\n"                          //Hanlder landing pad adress  (relative to start of function)
         "       .uleb128 1\n"                                           //Action code, gcc seems to use always 0
+        //Beyond this point we don't match gcc data'
+        "       .uleb128 foo_try_match-try\n"                   //Handler routine to check if the exception is matched
         ".LLSDACSECFA2:\n"                                              //BODY end
         "       .text\n"                                                        //TABLE footer
@@ -127 +122 @@
 
         //Actual call to the try block
-        try( foo_try_block, foo_catch_block, foo_try_match );
+        try( foo_try_block, foo_catch_block );
 
         printf( "Foo exited normally\n" );
 }
 
-// Not in main.cfa
-void fy() {
-        // Currently not destroyed if the exception is caught in fee.
-        raii_t a = { "Fy dtor" };
-
-        void fy_try_block() {
-                raii_t b = { "Fy try dtor" };
-
-                throw( 3 );
-        }
-
-        void fy_catch_block() {
-                printf("Fy caught exception\n");
-        }
-
-        _Unwind_Reason_Code fy_match_block() {
-                return this_exception == 2 ? _URC_HANDLER_FOUND : _URC_CONTINUE_UNWIND;
-        }
-
-        try(fy_try_block, fy_catch_block, fy_match_block);
-
-        printf( "Fy exited normally\n" );
-}
-
-void fee() {
-        raii_t a = { "Fee dtor" };
-
-        void fee_try_block() {
-                raii_t b = { "Fee try dtor" };
-
-                fy();
-
-                printf("fy returned\n");
-        }
-
-        void fee_catch_block() {
-                printf("Fee caught exception\n");
-        }
-
-        _Unwind_Reason_Code fee_match_block() {
-                return this_exception == 3 ? _URC_HANDLER_FOUND : _URC_CONTINUE_UNWIND;
-        }
-
-        try(fee_try_block, fee_catch_block, fee_match_block);
-
-        printf( "Fee exited normally\n" );
-}
-// End not in main.cfa
-
 int main() {
         raii_t a = { "Main dtor" };
 
-        //for (unsigned int i = 0 ; i < 100000000 ; ++i)
-        foo();
-        fee();
+        for (unsigned int i = 0 ; i < 100000000 ; ++i) foo();
 
         printf("End of program reached\n");