Version 1.3.8

Author: mikhailmoiseev

CMakeLists.txt

@@ -95,7 +95,7 @@ install(FILES ${PROJECT_BINARY_DIR}/SVCConfig.cmake cmake/svc_target.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/SVC)
 
 # Install sctMemory
-install(DIRECTORY components/memory/sctmemory DESTINATION include)
+#install(DIRECTORY components/memory/sctmemory DESTINATION include)
 
 # Install sctCommon
 install(DIRECTORY components/common/sctcommon DESTINATION include)

components/memory/sctmemory/README.md

@@ -115,33 +115,28 @@ Object* getOuterArray(SCDesign& designDB, Object* memberObj)
 void SCElabASTConsumer::HandleTranslationUnit(clang::ASTContext &astCtx)
 {
     std::cout << "--------------------------------------------------------------" << std::endl;
-    std::cout << " Intel Compiler for SystemC (ICSC) version 1.3.7, 23 Oct 2020" << std::endl;
+    std::cout << " Intel Compiler for SystemC (ICSC) version 1.3.8, 06 Nov 2020" << std::endl;
     std::cout << "--------------------------------------------------------------" << std::endl;
 
     ENABLE_REMOVE_EXTRA_CODE = noRemoveExtraCode ? 0 : 0xFFFFFFFF;
 
     using namespace std;
     using namespace DebugOptions;
-    //const char* optNames[] = {doModuleBuilder, doUseDef, doConstStmt, doConstFuncCall};
-    //const char* optNames[] = {doModuleBuilder, doGenStmt, doGenFuncCall, doGenRTL};
-    //const char* optNames[] = {doModuleBuilder, doConstCfg, doConstStmt, doConstFuncCall};
-    //const char* optNames[] = {doModuleBuilder, doGenCfg, doGenStmt, doGenFuncCall, doGenRTL};
-    //const char* optNames[] = {doModuleBuilder, doGenCfg, doGenStmt, doGenFuncCall, doGenRTL};
-    //const char* optNames[] = {doConstStmt, doState};
     //const char* optNames[] = {doElab};
+    //const char* optNames[] = {doConstCfg, doGenCfg};
     //const char* optNames[] = {doModuleBuilder, doGenCfg, doGenTerm, doGenRTL, doGenStmt, doGenBlock};
     //const char* optNames[] = {doModuleBuilder, doGenCfg, doGenStmt, doGenFuncCall, doVerWriter};
     //const char* optNames[] = {doModuleBuilder, doGenStmt, doGenName, doGenRTL}; 
     //const char* optNames[] = {doModuleBuilder, doConstCfg, doConstTerm, doConstBlock, doGenCfg};
     //const char* optNames[] = {doConstStmt}; 
-    //const char* optNames[] = {doConstCfg, doConstBlock, doModuleBuilder};
+    //const char* optNames[] = {doConstCfg, doElab};
     //const char* optNames[] = {doGenCfg, doGenLoop, doGenBlock, doModuleBuilder}; 
-    //const char* optNames[] = {doModuleBuilder, doGenCfg, doGenStmt, doGenRTL};
-    const char* optNames[] = {doModuleBuilder, doGenStmt, doGenRTL};
+    //const char* optNames[] = {doModuleBuilder, doConstCfg, doConstStmt, doState};
+    const char* optNames[] = {doModuleBuilder, doGenStmt};
     //const char* optNames[] = {doModuleBuilder};
     size_t optSize = sizeof(optNames)/sizeof(const char*);
     //DebugOptions::enable(optNames, optSize);  
-    
+   
     //keepConstVariables = true;
 
     // Find pointer to top-level module by SystemC name

sc_tool/lib/sc_tool/SCToolFrontendAction.cpp

@@ -2191,9 +2191,12 @@ void ScTraverseProc::printFunctionBody(std::ostream &os)
     } else {
         topGraph = scopeGraph;
     }
-    //cout << "Top function scopeGraph #" << hex << topGraph.get() << dec << endl;
+    topGraph->putNotReplacedVars(codeWriter->getNotReplacedVars());
+    topGraph->putVarAssignStmts(codeWriter->getVarAssignStmts());
 
-    topGraph->printAllScopes(os);
+    //cout << "--------------------------------------------" << endl;
+    //cout << "Top function scopeGraph #" << hex << topGraph.get() << dec << endl;
+    topGraph->printAllScopes(os); 
 }
 
 // Print temporal assertion in thread process, printed in @always_ff

sc_tool/lib/sc_tool/cfg/ScTraverseProc.cpp

@@ -160,6 +160,9 @@ class ScDiag {
         SYNTH_CPP_COMMA             = 188,
         CPP_COMMA_SIMPLE_LHS        = 189,
         SC_CONCAT_INT_TO_BOOL       = 190,
+        SC_BIT_WRONG_INDEX          = 191,
+        SC_BIT_WRONG_BASE           = 192,
+        CPP_NONSTD_TYPE_WIDTH       = 193,
 
         SC_FATAL_ELAB_TYPES_NS      = 200,
         SC_WARN_ELAB_UNSUPPORTED_TYPE,
@@ -239,30 +242,41 @@ class ScDiag {
         idFormatMap[SYNTH_ZERO_TYPE_WIDTH] =
             {clang::DiagnosticIDs::Fatal, 
             "Zero type width not allowed for variable : %0"};
+        idFormatMap[CPP_NONSTD_TYPE_WIDTH] =
+            {clang::DiagnosticIDs::Warning, 
+            "C++ type width differs from SC synth standard requirements : %0"};
+        
 
         idFormatMap[SYNTH_WIDTH_WIDENNING] =
             {clang::DiagnosticIDs::Remark, 
             "Widening width in type cast : %0 to %1"};
 
         idFormatMap[SC_RANGE_DIFF_VARS] =
             {clang::DiagnosticIDs::Fatal, 
-            "Incorrect range, different variables in lo/hi"};
+            "Incorrect range access, different variables in lo/hi"};
         idFormatMap[SC_RANGE_WRONG_INDEX] =
             {clang::DiagnosticIDs::Fatal, 
-            "Incorrect range, low index bigger than high or negative one"};
+            "Incorrect range access, low index bigger than high or negative one"};
         idFormatMap[SC_RANGE_WRONG_WIDTH] =
             {clang::DiagnosticIDs::Fatal, 
-            "Incorrect range, high index out of variable width"};
+            "Incorrect range access, high index out of variable width"};
         idFormatMap[SC_RANGE_WRONG_BASE] =
             {clang::DiagnosticIDs::Error, 
-            "Incorrect range, base cannot be expression or literal"};
+            "Incorrect range access, base cannot be expression or literal"};
         idFormatMap[SYNTH_SWITCH_LAST_EMPTY_CASE] =
             {clang::DiagnosticIDs::Fatal, 
             "Incorrect switch statement, no break in last case"};
         idFormatMap[SYNTH_SWITCH_ALL_EMPTY_CASE] =
             {clang::DiagnosticIDs::Fatal, 
             "Incorrect switch statement, all cases are empty"};
 
+        idFormatMap[SC_BIT_WRONG_INDEX] =
+            {clang::DiagnosticIDs::Fatal, 
+            "Incorrect bit access, index out of variable width"};
+        idFormatMap[SC_BIT_WRONG_BASE] =
+            {clang::DiagnosticIDs::Error, 
+            "Incorrect bit access, base cannot be expression or literal"};
+        
         idFormatMap[CPP_FOR_WITHOUT_INIT] =
             {clang::DiagnosticIDs::Warning, 
             "For loop without counter initialization"};

sc_tool/lib/sc_tool/diag/ScToolDiagnostic.h

@@ -330,7 +330,8 @@ void DesignDbGenerator::addChildrenRecursive(TypedObject hostTO, Object* hostEO)
 
         bool isConstArray = hostTO.getType().isConstQualified() ||
                             hostEO->is_constant();
-        bool intArray = isAnyInteger(arrayObj->getInnerElementType());
+        bool intArray = arrayObj->size() != 0 && 
+                        isAnyInteger(arrayObj->getInnerElementType());
 
         // For efficiency, array elements for non-const integer arrays are not created
         // TODO: support small array here
@@ -351,9 +352,11 @@ void DesignDbGenerator::addChildrenRecursive(TypedObject hostTO, Object* hostEO)
 
         } else {
             // Create dummy primitive inside array to hold bitwidth
-            auto intObj = arrayObj->getFirstInnerElement().getAs<IntegerObject>();
-            hostEO->mutable_primitive()->set_kind(Primitive::VALUE);
-            fillIntValue(hostEO, *intObj);
+            if (arrayObj->size() != 0) {
+                auto intObj = arrayObj->getFirstInnerElement().getAs<IntegerObject>();
+                hostEO->mutable_primitive()->set_kind(Primitive::VALUE);
+                fillIntValue(hostEO, *intObj);
+            }
         }
     }
 

sc_tool/lib/sc_tool/dyn_elab/DesignDbGenerator.cpp

@@ -503,11 +503,15 @@ clang::QualType ArrayObject::getElementType() const
 
 clang::QualType ArrayObject::getInnerElementType() const
 {
+    assert (size() != 0 && "Zero-size array/vector getInnerElementType()");
     return getFirstInnerElement().getType();
 }
 
-TypedObject ArrayObject::getFirstInnerElement() const {
+TypedObject ArrayObject::getFirstInnerElement() const 
+{
+    assert (size() != 0 && "Zero-size array/vector getFirstInnerElement()");
     TypedObject element = (*this)[0];
+    
     while (element.isArrayObject()) {
         element = element.getAs<ArrayObject>()->operator[](0);
     }