Changeset 2e9b59b for src/CodeGen

Timestamp:

Apr 19, 2022, 3:00:04 PM (4 years ago)

Author:

m3zulfiq <m3zulfiq@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

5b84a321

Parents:

ba897d21 (diff), bb7c77d (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:

added benchmark and evaluations chapter to thesis

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• FixMain.cc (modified) (2 diffs)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -274 +274 @@
         void CodeGenerator::postvisit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                output << "enum ";
-                genAttributes( enumDecl->get_attributes() );
-
-                output << enumDecl->get_name();
-
                 std::list< Declaration* > &memb = enumDecl->get_members();
-
-                if ( ! memb.empty() ) {
-                        output << " {" << endl;
-
-                        ++indent;
+                if (enumDecl->base && ! memb.empty()) {
+                        unsigned long long last_val = -1;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj );
-                                if ( obj->get_init() ) {
-                                        output << " = ";
-                                        obj->get_init()->accept( *visitor );
-                                } // if
-                                output << "," << endl;
+                                output << "static const ";
+                                output << genType(enumDecl->base, "", options) << " ";
+                                output << mangleName( obj ) << " ";
+                                output << " = ";
+                                output << "(" << genType(enumDecl->base, "", options) << ")";
+                                if ( (BasicType *)(enumDecl->base) && ((BasicType *)(enumDecl->base))->isWholeNumber() ) {
+                                        if ( obj->get_init() ) {
+                                                obj->get_init()->accept( *visitor );
+                                                last_val = ((ConstantExpr *)(((SingleInit *)(obj->init))->value))->constant.get_ival();
+                                        } else {
+                                                output << ++last_val;
+                                        } // if
+                                } else {
+                                        if ( obj->get_init() ) {
+                                                obj->get_init()->accept( *visitor ); 
+                                        } else {
+                                                // Should not reach here!
+                                        }
+                                }
+                                output << ";" << endl;
                         } // for
-
+                } else {
+                        output << "enum ";
+                        genAttributes( enumDecl->get_attributes() );
+
+                        output << enumDecl->get_name();
+
+                        if ( ! memb.empty() ) {
+                                output << " {" << endl;
+
+                                ++indent;
+                                for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
+                                        ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
+                                        assert( obj );
+                                        output << indent << mangleName( obj );
+                                        if ( obj->get_init() ) {
+                                                output << " = ";
+                                                obj->get_init()->accept( *visitor );
+                                        } // if
+                                        output << "," << endl;
+                                } // for
                         --indent;
-
                         output << indent << "}";
+                        } // if
                 } // if
         }
@@ -347 +372 @@
                                 des->accept( *visitor );
                         } else {
-                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
+                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array element
                                 output << "[";
                                 des->accept( *visitor );
@@ -661 +686 @@
                         output << opInfo->symbol;
                 } else {
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
+                        //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';
+                        // }
                         output << mangleName( variableExpr->get_var() );
                 } // if

src/CodeGen/FixMain.cc

@@ -91 +91 @@
 }
 
-ObjectDecl * charStarObj() {
+ObjectDecl * makeArgvObj() {
         return new ObjectDecl(
                 "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
@@ -117 +117 @@
         main_type->get_returnVals().push_back( signedIntObj() );
         main_type->get_parameters().push_back( signedIntObj() );
-        main_type->get_parameters().push_back( charStarObj() );
+        main_type->get_parameters().push_back( makeArgvObj() );
         return create_mangled_main_function_name( main_type );
 }

src/CodeGen/GenType.cc

@@ -253 +253 @@
 
         void GenType::postvisit( EnumInstType * enumInst ) {
-                typeString = enumInst->name + " " + typeString;
-                if ( options.genC ) typeString = "enum " + typeString;
+                if ( enumInst->baseEnum->base ) {
+                        typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
+                } else {
+                        typeString = enumInst->name + " " + typeString;
+                        if ( options.genC ) {
+                                typeString = "enum " + typeString;
+                        } 
+                } 
                 handleQualifiers( enumInst );
         }