8.1.1

Author: quantum-leaps

examples

@@ -30,10 +30,10 @@
 #define QP_H_
 
 //============================================================================
-#define QP_VERSION_STR  "8.1.0"
-#define QP_VERSION      810U
-// <VER>=810 <DATE>=250930
-#define QP_RELEASE      0x6A6F1BB5U
+#define QP_VERSION_STR  "8.1.1"
+#define QP_VERSION      811U
+// <VER>=810 <DATE>=251008
+#define QP_RELEASE      0x6A6334D4U
 
 //----------------------------------------------------------------------------
 // default configuration settings
@@ -211,9 +211,7 @@ struct QAsmVtable {
     void (*dispatch)(QAsm * const me, QEvt const * const e,
                      uint_fast8_t const qsId);
     bool (*isIn)(QAsm * const me, QStateHandler const stateHndl);
-#ifdef Q_SPY
     QStateHandler (*getStateHandler)(QAsm const * const me);
-#endif // Q_SPY
 };
 
 #ifdef Q_SPY
@@ -230,6 +228,9 @@ struct QAsmVtable {
         (*((QAsm *)(me_))->vptr->dispatch)((QAsm *)(me_), (e_), 0U)
 #endif // ndef Q_SPY
 
+#define QASM_GET_STATE_HANDLER(me_) \
+    (*((QAsm *)(me_))->vptr->getStateHandler)((QAsm *)(me_))
+
 #define Q_ASM_UPCAST(ptr_) ((QAsm *)(ptr_))
 
 //----------------------------------------------------------------------------
@@ -258,10 +259,8 @@ bool QHsm_isIn_(
     QAsm * const me,
     QStateHandler const stateHndl);
 
-#ifdef Q_SPY
 //! @private @memberof QHsm
 QStateHandler QHsm_getStateHandler_(QAsm const * const me);
-#endif // def Q_SPY
 
 //! @protected @memberof QHsm
 QState QHsm_top(QHsm const * const me,
@@ -316,10 +315,8 @@ bool QMsm_isIn_(
     QAsm * const me,
     QStateHandler const stateHndl);
 
-#ifdef Q_SPY
-//! @public @memberof QMsm
+//! @private @memberof QMsm
 QStateHandler QMsm_getStateHandler_(QAsm const * const me);
-#endif // def Q_SPY
 
 //! @public @memberof QMsm
 QMState const * QMsm_topQMState(void);

include/qp.h

@@ -1,7 +1,7 @@
 30586f7f01a5bd978c0892f409b0542badbbf7ca *include/qequeue.h
 bd63f14424e83d23278e3de89a18b50d77bbc2f7 *include/qk.h
 58d7d73db5b4cef3e86dccd72172f28eb64b4a06 *include/qmpool.h
-526688b573ce2ea503200261b45e123e9918b00c *include/qp.h
+18b58801789db2abaa5aacbe262333f28b2a4667 *include/qp.h
 e6f3ababd17825a6bbdd9e657ec4c82b82f66fcd *include/qp_pkg.h
 7dbe3b848bad7bbdca50c00d498e7d1f72ade135 *include/qpc.h
 326d1f7bb5f4b00f256165afac1dbc6e5ebd46f1 *include/qs.h
@@ -13,17 +13,17 @@ f818617a4860bc194926a34a1611997dd7a1cfc2 *include/qv.h
 22fc043da8188d60e8cd582c4a71559ab9231b4e *include/qxk.h
 ea47fe108c83fd74c15db9d30729fccbc4a63277 *include/README.md
 7f54a0933a9dc2fcaca475919fa0067667ed99ed *src/qf/CMakeLists.txt
-3c4c555d53aceb0ec5213e1b8b1ee2b8ad2a63d7 *src/qf/qep_hsm.c
-46332e4a849d85ef4033860ac284723e850d24ec *src/qf/qep_msm.c
+cafa3462a51cf1eb4e483495cc672b38bd295f37 *src/qf/qep_hsm.c
+f4459b1e1156d80aa6c88810ebd7d87847753232 *src/qf/qep_msm.c
 9040750e4f99836661986a78a6a97f6fc3a0f26b *src/qf/qf_act.c
-93601569ee66aa1a8b39d791c8335f5ba73adb5b *src/qf/qf_actq.c
+01464c17fc74513591842e72fe6cd404180c03f2 *src/qf/qf_actq.c
 72ed0e6cc2f6ba2e2b7cb6343d43627a370e3830 *src/qf/qf_defer.c
 fed2215fc3ff1f271dd990b83498c756b63d5a8c *src/qf/qf_dyn.c
 e45285663a81ac93b639afd0744fa2e70287af6f *src/qf/qf_mem.c
 47cbf4a5a1f5cffe0128ff465c2467af1d634ddf *src/qf/qf_ps.c
-2a41f266f7fb60e2deda4779e884c25a8d566e07 *src/qf/qf_qact.c
+06c61ddfbe0afe419f88df7541c329b840db5c56 *src/qf/qf_qact.c
 fcfe58aadf24419f89eb0ebe685e6b6b86f2a79b *src/qf/qf_qeq.c
-8489d0055800cba557f0237d00e1bd3fb1063396 *src/qf/qf_qmact.c
+8f5b2a0ed1cb810dabcd80d1b4b06d2a9e850cd1 *src/qf/qf_qmact.c
 64022ced25d11d7dccde974a6d1fa7fd789a9326 *src/qf/qf_time.c
 878a737efe234f40dc8c9374acc351e510b4da1e *src/qk/CMakeLists.txt
 c8ac24ddfe457c52a8d9b27b6ae999bb503194b3 *src/qk/qk.c
@@ -33,7 +33,7 @@ b9682b2e5c73987ac777f10db5dd6a6fee2e59fd *src/qs/qs_64bit.c
 8a96a1a0c2072cdbd49326893fdd7951e075c39e *src/qs/qs_fp.c
 a40aeed969ce2a05c64da01df6a0f77fbf3457f4 *src/qs/qs_rx.c
 d1dd4fc7efd0c7ef0fc85107a00dc822cb82bf44 *src/qs/qstamp.c
-d5d6c4c69ebc05a309e21f3122cc6715d3bc566e *src/qs/qutest.c
+06b0029c55b9c90779ecadb6f6471a958f0b31a8 *src/qs/qutest.c
 b1d2def9b8f6cde464170af7682ab0f01f4f40f6 *src/qv/CMakeLists.txt
 77d7e5755081399426ae4b2f6df56c7c378ab8b9 *src/qv/qv.c
 f0015a5bb9bef698dd7438d1da6172ef9f5feece *src/qxk/qxk.c

qpc_8.1.0.sha1 renamed to qpc_8.1.1.sha1

@@ -1,6 +1,6 @@
 @setlocal
 
-set FNAME=qpc_8.1.0.sha1
+set FNAME=qpc_8.1.1.sha1
 
 :: usage
 @echo Usage: sha1 [gen]

sha1.bat

@@ -163,10 +163,8 @@ void QHsm_ctor(QHsm * const me,
     static struct QAsmVtable const vtable = { // QAsm virtual table
         &QHsm_init_,
         &QHsm_dispatch_,
-        &QHsm_isIn_
-#ifdef Q_SPY
-        ,&QHsm_getStateHandler_
-#endif
+        &QHsm_isIn_,
+        &QHsm_getStateHandler_
     };
     // no need to call the superclass' constructor QAsm_ctor() here
     me->super.vptr      = &vtable; // QHsm class' VTABLE
@@ -284,7 +282,6 @@ void QHsm_dispatch_(QAsm * const me,
 
     // process the event hierarchically...
     QStateHandler path[QHSM_MAX_NEST_DEPTH_]; // entry path array
-    path[0] = s; // save current state
     me->temp.fun = s;
     QState r; // state handler return value
     int_fast8_t ip = QHSM_MAX_NEST_DEPTH_; // path index & fixed loop bound
@@ -307,7 +304,10 @@ void QHsm_dispatch_(QAsm * const me,
         }
     } while (r == Q_RET_SUPER); // loop as long as superstate returned
 
-    if (r == Q_RET_HANDLED) { // did the last handler handle event e?
+    if (r == Q_RET_IGNORED) { // was event e ignored?
+        QS_TRAN0_(QS_QEP_IGNORED, me->state.fun); // output QS record
+    }
+    else if (r == Q_RET_HANDLED) { // did the last handler handle event e?
         QS_TRAN0_(QS_QEP_INTERN_TRAN, s); // output QS record
     }
     else if ((r == Q_RET_TRAN) || (r == Q_RET_TRAN_HIST)) { // tran. taken?
@@ -340,15 +340,13 @@ void QHsm_dispatch_(QAsm * const me,
         // enter the target (possibly recursively) by initial trans.
         QHsm_enter_target_(me, &path[0], ip, qsId);
         QS_TRAN_END_(QS_QEP_TRAN, s, path[0]); // output QS record
-    }
-    else if (r == Q_RET_IGNORED) { // was event e ignored?
-        QS_TRAN0_(QS_QEP_IGNORED, me->state.fun); // output QS record
+
+        me->state.fun = path[0]; // change the current active state
     }
     else {
         Q_ERROR_LOCAL(360); // last state handler returned impossible value
     }
 
-    me->state.fun = path[0]; // change the current active state
 #ifndef Q_UNSAFE
     // establish stable state configuration
     me->temp.uint = QP_DIS_UPDATE(uintptr_t, me->state.uint);
@@ -644,11 +642,9 @@ QStateHandler QHsm_state(QHsm const * const me) {
 }
 
 //............................................................................
-#ifdef Q_SPY
 //! @private @memberof QHsm
 QStateHandler QHsm_getStateHandler_(QAsm const * const me) {
     // NOTE: this function does NOT apply critical section, so it can
     // be safely called from an already established critical section.
     return me->state.fun;
 }
-#endif // def Q_SPY

src/qf/qep_hsm.c

@@ -142,10 +142,8 @@ void QMsm_ctor(QMsm * const me,
     static struct QAsmVtable const vtable = { // QAsm virtual table
         &QMsm_init_,
         &QMsm_dispatch_,
-        &QMsm_isIn_
-#ifdef Q_SPY
-        ,&QMsm_getStateHandler_
-#endif
+        &QMsm_isIn_,
+        &QMsm_getStateHandler_
     };
     // no need to call the superclass' constructor QAsm_ctor() here
     me->super.vptr      = &vtable;      // QMsm class' VTABLE
@@ -471,10 +469,8 @@ QMState const* QMsm_stateObj(QMsm const* const me) {
     return me->super.state.obj;
 }
 //............................................................................
-#ifdef Q_SPY
 //! @public @memberof QMsm
 QStateHandler QMsm_getStateHandler_(QAsm const * const me) {
     // return the current state handler (function pointer)
     return me->state.obj->stateHandler;
 }
-#endif

src/qf/qep_msm.c

@@ -406,10 +406,8 @@ void QTicker_ctor(QTicker * const me,
     static struct QAsmVtable const vtable = { // QTicker virtual table
         &QTicker_init_,
         &QTicker_dispatch_,
-        &QHsm_isIn_
-#ifdef Q_SPY
-        ,&QHsm_getStateHandler_
-#endif
+        &QHsm_isIn_,
+        &QHsm_getStateHandler_
     };
     me->super.super.vptr = &vtable; // hook the vptr
 

src/qf/qf_actq.c

@@ -61,10 +61,8 @@ void QActive_ctor(QActive * const me,
     static struct QAsmVtable const vtable = { // QActive virtual table
         &QHsm_init_,
         &QHsm_dispatch_,
-        &QHsm_isIn_
-#ifdef Q_SPY
-        ,&QHsm_getStateHandler_
-#endif
+        &QHsm_isIn_,
+        &QHsm_getStateHandler_
     };
     me->super.vptr = &vtable; // hook vptr to QActive vtable
 }

src/qf/qf_qact.c

@@ -55,10 +55,8 @@ void QMActive_ctor(QMActive * const me,
     static struct QAsmVtable const vtable = { // QMActive virtual table
         &QMsm_init_,
         &QMsm_dispatch_,
-        &QMsm_isIn_
-#ifdef Q_SPY
-        ,&QMsm_getStateHandler_
-#endif
+        &QMsm_isIn_,
+        &QMsm_getStateHandler_
     };
     me->super.super.vptr = &vtable; // hook vptr to QMActive vtable
 }