Merge branch 'master' into 1984-threadbase-intermittently-hangs-in-join_thread

Author: hchen99

include/trick/attributes.h

@@ -14,6 +14,7 @@
 #define TRICK_CHKPNT_OUTPUT 0x04
 #define TRICK_CHKPNT_INPUT 0x08
 #define TRICK_MODS_UNITSDASHDASH 0x04
+#define TRICK_ENUM_UNSIGNED 0x40000000
 
 #define TRICK_MAX_INDEX 8
 
@@ -33,7 +34,8 @@ typedef struct {
 
     const char *label;    /**< --  Enumeration label */
     int value;      /**< --  Enumeration value */
-    int mods;       /**< --  bit 32 = deprecated var */
+    int mods;       /**< --  bit 31 = deprecated var
+                             bit 30 = unsigned enum underlying type (0x40000000) */
 
 } ENUM_ATTR;
 

trick_source/codegen/Interface_Code_Gen/EnumValues.cpp

@@ -3,7 +3,7 @@
 
 #include "EnumValues.hh"
 
-EnumValues::EnumValues() : has_definition(true) {}
+EnumValues::EnumValues() : has_definition(true), is_unsigned(false) {}
 
 void EnumValues::addEnum( std::string in_name , long long in_val ) {
     std::pair< std::string , long long > new_enum(in_name, in_val) ;
@@ -24,6 +24,14 @@ bool EnumValues::getHasDefinition() {
     return has_definition ;
 }
 
+void EnumValues::setIsUnsigned( bool in ) {
+    is_unsigned = in ;
+}
+
+bool EnumValues::getIsUnsigned() {
+    return is_unsigned ;
+}
+
 std::ostream & operator << (std::ostream & ostream , EnumValues & ev ) {
     ostream << "    name = " << ev.name << std::endl ;
     ostream << "    file_name = " << ev.file_name << std::endl ;

trick_source/codegen/Interface_Code_Gen/EnumValues.hh

@@ -36,6 +36,9 @@ class EnumValues : public ConstructValues {
         void setHasDefinition( bool in ) ;
         bool getHasDefinition() ;
 
+        void setIsUnsigned( bool in ) ;
+        bool getIsUnsigned() ;
+
         const std::vector<NameValuePair>& getPairs() {
             return enum_values;
         }
@@ -57,6 +60,9 @@ class EnumValues : public ConstructValues {
 
         bool has_definition ;
 
+        /** Is the enum unsigned? */
+        bool is_unsigned;
+
 } ;
 
 #endif

trick_source/codegen/Interface_Code_Gen/EnumVisitor.cpp

@@ -28,6 +28,30 @@ bool EnumVisitor::VisitType(clang::Type *t) {
 
 bool EnumVisitor::VisitEnumDecl(clang::EnumDecl *ed) {
     eval.setFileName(getFileName(ci , ed->RBRACELOC(), hsd)) ;
+
+    // Get the underlying type of the enum regardless of whether it's fixed or not
+    clang::QualType underlying_type = ed->getIntegerType();
+    if (underlying_type.isNull()) {
+        // Fallback to the default int type (non-null QualType) if underlying type is null
+        underlying_type = ci.getASTContext().IntTy;
+    }
+    // Check if the explicit or implicit underlying type is unsigned
+    bool is_unsigned = underlying_type->isUnsignedIntegerType();
+    eval.setIsUnsigned(is_unsigned);
+
+    if (debug_level >= 3) {
+        // Print explicit if isFixed(), implicit if not
+        const std::string ex_im = ed->isFixed()? "explicit" : "implicit";
+
+        std::cout << "EnumDecl debug: name=\"" << ed->getName().str()
+                  << "\" qname=\"" << ed->getQualifiedNameAsString() << "\""
+                  << " scoped=" << (ed->isScoped()? "true":"false")
+                  << " fixed=" << (ed->isFixed()? "true":"false")
+                  << " " << ex_im << "_underlying=\"" << underlying_type.getAsString() << "\""
+                  << " unsigned=" << (is_unsigned? "true":"false")
+                  << std::endl;
+    }
+
     return true;
 }
 

trick_source/codegen/Interface_Code_Gen/FieldDescription.cpp

@@ -291,8 +291,17 @@ void FieldDescription::parseComment(std::string comment) {
 
     // The rest of the comment is the description of the variable.
 
-    // remove the c comment end marker.
-    comment = get_regex_field(comment , "(.*)\\*/" , 1) ;
+    // remove the c comment end marker if present.
+    // don't overwrite the comment with an empty string
+    // when there is no "*/" (e.g. // (var_unit) var description)
+    // to preserve the description of the variable.
+    // get_regex_field returns an empty string on no match.
+    {
+        std::string tmp = get_regex_field(comment , "(.*)\\*/" , 1) ;
+        if ( ! tmp.empty() ) {
+            comment = tmp ;
+        }
+    }
 
     // posix c regular expressions are terrible. the regexes above will leave "@" signs because
     // the regular expressions are so greedy.

trick_source/codegen/Interface_Code_Gen/PrintFileContents10.cpp

@@ -46,8 +46,20 @@ void PrintFileContents10::print_enum_attr(std::ostream & ostream , EnumValues *
     print_open_extern_c(ostream) ;
     ostream << "ENUM_ATTR enum" << e->getFullyQualifiedTypeName("__") << "[] = {\n" ;
     std::string name = e->getNamespacesAndContainerClasses();
+
+    // Determine mods value based on enum signedness
+    // unsigned enum = 0x40000000 (bit 30)
+    unsigned int mods_value = 0x0;
+    if (e->getIsUnsigned()) {
+        mods_value = 0x40000000;  // Set unsigned enum flag
+    }
+
+    // Print enum attributes in the form:
+    // if unsigned {"name", value, 0x40000000}
+    // if signed {"name", value, 0x0}
     for (auto& pair : e->getPairs()) {
-        ostream << "{\"" << name << pair.first << "\", " << pair.second << ", 0x0},\n" ;
+        ostream << "{\"" << name << pair.first << "\", " << pair.second << ", 0x" 
+                << std::hex << mods_value << std::dec << "},\n" ;
     }
     ostream << "{\"\", 0, 0x0}\n};\n" ;
     print_close_extern_c(ostream) ;

trick_source/sim_services/CheckPointAgent/ClassicCheckPointerAgent.cpp

@@ -322,6 +322,11 @@ static int getCompositeSubReference(
     }
 /*if member is an unarrayed struct, continue to call getCompositeSubReference.*/
     if (Ai->num_index == 0) {
+        /* if left_type specifies the current member, stop here */
+        if ( (left_type != NULL) && (*left_type != NULL) && (Ai->attr == (*left_type)->attr)) {
+            return 0;
+        }
+
         char buf[256];
         ret = getCompositeSubReference( rAddr, left_type, sAddr + Ai->offset, (ATTRIBUTES *) Ai->attr, buf);