Non-boolean stable/rose/fell assertions supported, #39

Author: mikhailmoiseev

components/common/sctcommon/sct_assert.h

@@ -86,19 +86,19 @@ inline void sct_assert(bool expr, const char* msg) {}
 struct sct_property_mod
 {
     explicit sct_property_mod() {}
-    template<class T1, class T2>
-    explicit sct_property_mod(bool lexpr, bool rexpr, sc_event_finder& event,
+    template<class T1, class T2, class RT>
+    explicit sct_property_mod(bool lexpr, RT rexpr, sc_event_finder& event,
                               const char* name, T1 lotime, T2 hitime, 
                               unsigned stable) {}
-    template<class T1>
-    explicit sct_property_mod(bool lexpr, bool rexpr, sc_event_finder& event,
+    template<class T1, class RT>
+    explicit sct_property_mod(bool lexpr, RT rexpr, sc_event_finder& event,
                               const char* name, T1 time, unsigned stable) {}
-    template<class T1, class T2>
-    explicit sct_property_mod(bool lexpr, bool rexpr, sc_port_base& event,
+    template<class T1, class T2, class RT>
+    explicit sct_property_mod(bool lexpr, RT rexpr, sc_port_base& event,
                               const char* name, T1 lotime, T2 hitime,
                               unsigned stable) {}
-    template<class T1>
-    explicit sct_property_mod(bool lexpr, bool rexpr, sc_port_base& event,
+    template<class T1, class RT>
+    explicit sct_property_mod(bool lexpr, RT rexpr, sc_port_base& event,
                               const char* name, T1 time, unsigned stable) {}
 };
 
@@ -111,17 +111,17 @@ struct sct_property_mod
 
     #define SCT_ASSERT4_STABLE(LE, TIMES, RE, EVENT)\
         sct_property_mod SCT_TWO(sctTmpVar,__LINE__){\
-            static_cast<bool>(LE), static_cast<bool>(RE), EVENT,\
+            static_cast<bool>(LE), RE, EVENT,\
             "sctAssertLine" SCT_ONE(__LINE__), SCT_ARGS(TIMES), 1};
 
     #define SCT_ASSERT4_ROSE(LE, TIMES, RE, EVENT)\
         sct_property_mod SCT_TWO(sctTmpVar,__LINE__){\
-            static_cast<bool>(LE), static_cast<bool>(RE), EVENT,\
+            static_cast<bool>(LE), RE, EVENT,\
             "sctAssertLine" SCT_ONE(__LINE__), SCT_ARGS(TIMES), 2};
 
     #define SCT_ASSERT4_FELL(LE, TIMES, RE, EVENT)\
         sct_property_mod SCT_TWO(sctTmpVar,__LINE__){\
-            static_cast<bool>(LE), static_cast<bool>(RE), EVENT,\
+            static_cast<bool>(LE), RE, EVENT,\
             "sctAssertLine" SCT_ONE(__LINE__), SCT_ARGS(TIMES), 3};
 #else
     // No parameter passed, LE/RE can use not-bound port/not-allocated pointers
@@ -140,7 +140,7 @@ struct sct_property_mod
 
 #else
 #define SCT_ASSERT4(LE, TIMES, RE, EVENT)\
-    sct_property* SCT_TWO(sctTmpVar,__LINE__) =\
+    sct_property_base* SCT_TWO(sctTmpVar,__LINE__) =\
             sct_property_storage::getProperty(\
                     [&]()->bool{return ( LE );},\
                     [&]()->bool{return ( RE );},\
@@ -150,32 +150,32 @@ struct sct_property_mod
             );
 
 #define SCT_ASSERT4_STABLE(LE, TIMES, RE, EVENT)\
-    sct_property* SCT_TWO(sctTmpVar,__LINE__) =\
+    sct_property_base* SCT_TWO(sctTmpVar,__LINE__) =\
             sct_property_storage::getPropertyStable(\
                     [&]()->bool{return ( LE );},\
-                    [&]()->bool{return ( RE );},\
+                    [&]()->decltype(RE){return ( RE );},\
                     &EVENT,\
                     [&]()->sct_time{return (sct_time(SCT_ARGS(TIMES)));},\
                     std::string(__FILE__)+":"+std::to_string(__LINE__),\
                     stStable\
             );
 
 #define SCT_ASSERT4_ROSE(LE, TIMES, RE, EVENT)\
-    sct_property* SCT_TWO(sctTmpVar,__LINE__) =\
+    sct_property_base* SCT_TWO(sctTmpVar,__LINE__) =\
             sct_property_storage::getPropertyStable(\
                     [&]()->bool{return ( LE );},\
-                    [&]()->bool{return ( RE );},\
+                    [&]()->decltype(RE){return ( RE );},\
                     &EVENT,\
                     [&]()->sct_time{return (sct_time(SCT_ARGS(TIMES)));},\
                     std::string(__FILE__)+":"+std::to_string(__LINE__),\
                     stRose\
             );
 
 #define SCT_ASSERT4_FELL(LE, TIMES, RE, EVENT)\
-    sct_property* SCT_TWO(sctTmpVar,__LINE__) =\
+    sct_property_base* SCT_TWO(sctTmpVar,__LINE__) =\
             sct_property_storage::getPropertyStable(\
                     [&]()->bool{return ( LE );},\
-                    [&]()->bool{return ( RE );},\
+                    [&]()->decltype(RE){return ( RE );},\
                     &EVENT,\
                     [&]()->sct_time{return (sct_time(SCT_ARGS(TIMES)));},\
                     std::string(__FILE__)+":"+std::to_string(__LINE__),\

components/common/sctcommon/sct_property.cpp

@@ -42,73 +42,6 @@ std::string sct_property_utils::getFileName(const std::string& s)
 namespace sc_core {
 
 // Static container of created @sct_property instances
-std::unordered_map<std::size_t, sct_property*> sct_property_storage::stor;
+std::unordered_map<std::size_t, sct_property_base*> sct_property_storage::stor;
 
-// Put antecedent(left) and consequent (right) expressions every cycle
-void sct_property::check(bool lexpr, bool rexpr) {
-
-    assert (initalized && "sct_property is not initalized");
-
-    // Stored left expression or current one for single time zero
-    bool lcond = pastSize ? leftPast[lindx] : lexpr;
-
-    if (lcond) {
-        // Get current right expression for single time
-        bool rcond = rexpr;
-
-        // Join all stored right expressions for time interval
-        for (size_t i = 0; i < timeInt; i++) {
-            rcond = rcond || rightPast[i];
-        }
-
-        if (!rcond) {
-            std::cout << std::endl << sc_time_stamp() 
-                      << ", Error : sct_property violation " << msg 
-                      << std::endl;
-            assert (false);
-        }
-    }
-
-    // Store left and right expression values
-    if (pastSize) {
-        leftPast[lindx] = lexpr;
-        lindx = (lindx+1) % pastSize;
-    }
-    if (timeInt) {
-        rightPast[rindx] = rexpr;
-        rindx = (rindx+1) % timeInt;
-    }
-}
-
-void sct_property::check(StableType stable, bool lexpr, bool rexpr) {
-    
-    assert (initalized && "sct_property is not initalized");
-    assert (stable == stStable || timeInt == 0);
-    
-    bool lcond = pastSize ? leftPast[lindx] : lexpr;
-
-    if (lcond) {
-        
-        bool rcond = stable == stStable ? rexpr == rightPast[0] :
-                     stable == stRose ? rexpr > rightPast[0] : rexpr < rightPast[0];
-        for (size_t i = 0; i < timeInt; i++) {
-            rcond = rcond && rexpr == rightPast[i+1];
-        }
-        if (!rcond) {
-            std::cout << std::endl << sc_time_stamp() 
-                      << ", Error : sct_property " << stableStr 
-                      << " violation " << msg << std::endl;
-            assert (false);
-        }
-    }
-
-    // Store left and right expression values
-    if (pastSize) {
-        leftPast[lindx] = lexpr;
-        if (pastSize > 1) lindx = (lindx+1) % pastSize;
-    }
-    rightPast[rindx] = rexpr;
-    if (timeInt) rindx = (rindx+1) % (timeInt+1);
-}
-
-} // namespace sc_core
+}