Changes in src/ControlStruct/ExceptTranslate.cc [ad0be81:1abc5ab]

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (16 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jun 30 13:30:00 2017
+// Last Modified On : Thr Jun 29 15:18:00 2017
 // Update Count     : 1
 //
@@ -22 +22 @@
 #include "SynTree/Attribute.h"
 
-namespace ControlStruct {
+namespace ControlFlow {
 
         // This (large) section could probably be moved out of the class
@@ -29 +29 @@
         // Type(Qualifiers &, false, std::list<Attribute *> &)
 
-        // void (*function)();
-        static FunctionType try_func_t(Type::Qualifiers(), false);
+        // void (*function)()
+        static FunctionType void_func_t(Type::Qualifiers(), false);
         // void (*function)(int, exception);
         static FunctionType catch_func_t(Type::Qualifiers(), false);
@@ -37 +37 @@
         // bool (*function)(exception);
         static FunctionType handle_func_t(Type::Qualifiers(), false);
-        // void (*function)(__attribute__((unused)) void *);
-        static FunctionType finally_func_t(Type::Qualifiers(), false);
 
         static void init_func_types() {
@@ -50 +48 @@
                         LinkageSpec::Cforall,
                         /*bitfieldWidth*/ NULL,
-                        new BasicType( emptyQualifiers, BasicType::SignedInt ),
+                        new BasicType(emptyQualifiers, BasicType::UnsignedInt),
                         /*init*/ NULL
-                        );
+                );
                 ObjectDecl exception_obj(
                         "__exception_inst",
@@ -58 +56 @@
                         LinkageSpec::Cforall,
                         /*bitfieldWidth*/ NULL,
-                        new PointerType(
-                                emptyQualifiers,
-                                new BasicType( emptyQualifiers, BasicType::SignedInt )
-                                ),
+                        new BasicType(emptyQualifiers, BasicType::UnsignedInt),
                         /*init*/ NULL
-                        );
+                );
                 ObjectDecl bool_obj(
                         "__ret_bool",
@@ -71 +66 @@
                         new BasicType(emptyQualifiers, BasicType::Bool),
                         /*init*/ NULL
-                        );
-                ObjectDecl voidptr_obj(
-                        "__hook",
-                        Type::StorageClasses(),
-                        LinkageSpec::Cforall,
-                        NULL,
-                        new PointerType(
-                                emptyQualifiers,
-                                new VoidType(
-                                        emptyQualifiers
-                                        ),
-                                std::list<Attribute *>{new Attribute("unused")}
-                                ),
-                        NULL
-                        );
-
-                catch_func_t.get_parameters().push_back( index_obj.clone() );
-                catch_func_t.get_parameters().push_back( exception_obj.clone() );
-                match_func_t.get_returnVals().push_back( index_obj.clone() );
-                match_func_t.get_parameters().push_back( exception_obj.clone() );
-                handle_func_t.get_returnVals().push_back( bool_obj.clone() );
-                handle_func_t.get_parameters().push_back( exception_obj.clone() );
-                finally_func_t.get_parameters().push_back( voidptr_obj.clone() );
+                );
+
+                catch_func_t.get_parameters().push_back(index_obj.clone());
+                catch_func_t.get_parameters().push_back(exception_obj.clone());
+                match_func_t.get_returnVals().push_back(index_obj.clone());
+                match_func_t.get_parameters().push_back(exception_obj.clone());
+                handle_func_t.get_returnVals().push_back(bool_obj.clone());
+                handle_func_t.get_parameters().push_back(exception_obj.clone());
 
                 init_complete = true;
@@ -134 +114 @@
         // ThrowStmt Mutation Helpers
 
-        Statement * create_given_throw(
-                        const char * throwFunc, ThrowStmt * throwStmt ) {
-                // { int NAME = EXPR; throwFunc( &NAME ); }
-                CompoundStmt * result = new CompoundStmt( noLabels );
-                ObjectDecl * local = new ObjectDecl(
-                        "__local_exception_copy",
-                        Type::StorageClasses(),
-                        LinkageSpec::Cforall,
-                        NULL,
-                        new BasicType( emptyQualifiers, BasicType::SignedInt ),
-                        new SingleInit( throwStmt->get_expr() )
-                        );
-                appendDeclStmt( result, local );
-                UntypedExpr * call = new UntypedExpr( new NameExpr( throwFunc ) );
-                call->get_args().push_back( new AddressExpr( nameOf( local ) ) );
-                result->push_back( new ExprStmt( throwStmt->get_labels(), call ) );
+        Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
+                // __throw_terminate( EXPR );
+                UntypedExpr * call = new UntypedExpr( new NameExpr(
+                        "__cfaehm__throw_termination" ) );
+                call->get_args().push_back( throwStmt->get_expr() );
+                Statement * result = new ExprStmt( throwStmt->get_labels(), call );
                 throwStmt->set_expr( nullptr );
                 delete throwStmt;
                 return result;
-        }
-
-        Statement * create_terminate_throw( ThrowStmt *throwStmt ) {
-                // { int NAME = EXPR; __throw_terminate( &NAME ); }
-                return create_given_throw( "__cfaehm__throw_termination", throwStmt );
         }
         Statement * create_terminate_rethrow( ThrowStmt *throwStmt ) {
@@ -171 +136 @@
         Statement * create_resume_throw( ThrowStmt *throwStmt ) {
                 // __throw_resume( EXPR );
-                return create_given_throw( "__cfaehm__throw_resumption", throwStmt );
+                UntypedExpr * call = new UntypedExpr( new NameExpr(
+                        "__cfaehm__throw_resumption" ) );
+                call->get_args().push_back( throwStmt->get_expr() );
+                Statement * result = new ExprStmt( throwStmt->get_labels(), call );
+                throwStmt->set_expr( nullptr );
+                delete throwStmt;
+                return result;
         }
         Statement * create_resume_rethrow( ThrowStmt *throwStmt ) {
@@ -193 +164 @@
 
                 return new FunctionDecl( "try", Type::StorageClasses(),
-                        LinkageSpec::Cforall, try_func_t.clone(), body );
+                        LinkageSpec::Cforall, void_func_t.clone(), body );
         }
 
@@ -264 +235 @@
                         std::list<Expression *> args;
                         args.push_back( number );
-
-                        std::list<Expression *> rhs_args;
-                        rhs_args.push_back( nameOf( except_obj ) );
-                        Expression * rhs = new UntypedExpr(
-                                new NameExpr( "*?" ), rhs_args );
-                        args.push_back( rhs );
-
+                        args.push_back( nameOf( except_obj ) );
                         cond = new UntypedExpr( new NameExpr( "?==?" /*???*/), args );
                 }
@@ -311 +276 @@
                         *it = nullptr;
                 }
-
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_int( 0 ) ) ) );
 
                 return new FunctionDecl("match", Type::StorageClasses(),
@@ -354 +316 @@
                         }
                         handling_code->push_back( new ReturnStmt( noLabels,
-                                new ConstantExpr( Constant::from_bool( true ) ) ) );
+                                new ConstantExpr( Constant::from_bool( false ) ) ) );
                         handler->set_body( handling_code );
 
@@ -361 +323 @@
                         *it = nullptr;
                 }
-
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_bool( false ) ) ) );
 
                 return new FunctionDecl("handle", Type::StorageClasses(),
@@ -405 +364 @@
                 UntypedExpr *setup = new UntypedExpr( new NameExpr(
                         "__cfaehm__try_resume_setup" ) );
-                setup->get_args().push_back( new AddressExpr( nameOf( obj ) ) );
+                setup->get_args().push_back( nameOf( obj ) );
                 setup->get_args().push_back( nameOf( resume_handler ) );
 
@@ -422 +381 @@
 
                 return new FunctionDecl("finally", Type::StorageClasses(),
-                        LinkageSpec::Cforall, finally_func_t.clone(), body);
+                        LinkageSpec::Cforall, void_func_t.clone(), body);
         }