8.0.4

Author: quantum-leaps

3rd_party

@@ -30,10 +30,10 @@
 #define QP_H_
 
 //============================================================================
-#define QP_VERSION_STR "8.0.3"
-#define QP_VERSION     803U
-// <VER>=803 <DATE>=250407
-#define QP_RELEASE     0x6ABEE96CU
+#define QP_VERSION_STR "8.0.4"
+#define QP_VERSION     804U
+// <VER>=804 <DATE>=250531
+#define QP_RELEASE     0x6AABFDABU
 
 //============================================================================
 // default configuration settings
@@ -167,6 +167,7 @@ union QAsmAttr {
     QXThreadHandler thr;          //!< @private @memberof QAsmAttr
     QMTranActTable  const *tatbl; //!< @private @memberof QAsmAttr
     struct QMState  const *obj;   //!< @private @memberof QAsmAttr
+    uintptr_t       uint;         //!< @private @memberof QAsmAttr
 };
 
 #define Q_STATE_CAST(handler_) ((QStateHandler)(handler_))

examples

@@ -1,25 +1,26 @@
 //============================================================================
-// SafeQP/C Real-Time Event Framework (RTEF)
+// QP/C/C++ Real-Time Event Framework (RTEF)
 //
 // Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
 //
 //                    Q u a n t u m  L e a P s
 //                    ------------------------
 //                    Modern Embedded Software
 //
-// SPDX-License-Identifier: LicenseRef-QL-commercial
+// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
 //
-// This software is licensed under the terms of the Quantum Leaps commercial
-// licenses. Please contact Quantum Leaps for more information about the
-// available licensing options.
+// This software is dual-licensed under the terms of the open-source GNU
+// General Public License (GPL) or under the terms of one of the closed-
+// source Quantum Leaps commercial licenses.
 //
-// RESTRICTIONS
-// You may NOT :
-// (a) redistribute, encumber, sell, rent, lease, sublicense, or otherwise
-//     transfer rights in this software,
-// (b) remove or alter any trademark, logo, copyright or other proprietary
-//     notices, legends, symbols or labels present in this software,
-// (c) plagiarize this software to sidestep the licensing obligations.
+// Redistributions in source code must retain this top-level comment block.
+// Plagiarizing this software to sidestep the license obligations is illegal.
+//
+// NOTE:
+// The GPL does NOT permit the incorporation of this code into proprietary
+// programs. Please contact Quantum Leaps for commercial licensing options,
+// which expressly supersede the GPL and are designed explicitly for
+// closed-source distribution.
 //
 // Quantum Leaps contact information:
 // <www.state-machine.com/licensing>
@@ -43,6 +44,10 @@
     #define QF_CRIT_EXIT() ((void)0)
 #endif
 
+#ifndef QF_CRIT_EST
+    #define QF_CRIT_EST() ((void)0)
+#endif
+
 #define Q_DEFINE_THIS_MODULE(name_) \
     static char const Q_this_module_[] = name_;
 
@@ -60,36 +65,50 @@
 } while (false)
 
 #define Q_ERROR_ID(id_) do { \
-    QF_CRIT_STAT \
-    QF_CRIT_ENTRY(); \
+    QF_CRIT_EST(); \
     Q_onError(&Q_this_module_[0], (id_)); \
-    QF_CRIT_EXIT(); \
+} while (false)
+
+#define Q_ASSERT_LOCAL(id_, expr_) do { \
+    if (expr_) {} else { \
+        QF_CRIT_EST(); \
+        Q_onError(&Q_this_module_[0], (id_)); \
+    } \
 } while (false)
 
 // QF-FuSa disabled ==========================================================
 #else
 
 #define Q_DEFINE_THIS_MODULE(name_)
-#define Q_ASSERT_INCRIT(id_, expr_) ((void)0)
-#define Q_ERROR_INCRIT(id_) ((void)0)
-#define Q_ASSERT_ID(id_, expr_) ((void)0)
-#define Q_ERROR_ID(id_) ((void)0)
+#define Q_ASSERT_INCRIT(id_, expr_)    ((void)0)
+#define Q_ERROR_INCRIT(id_)            ((void)0)
+#define Q_ASSERT_ID(id_, expr_)        ((void)0)
+#define Q_ERROR_ID(id_)                ((void)0)
+#define Q_ASSERT_LOCAL(id_, expr_)     ((void)0)
 
 #endif // QF-FuSa disabled
 
 //============================================================================
 #define Q_DEFINE_THIS_FILE             Q_DEFINE_THIS_MODULE(__FILE__)
 #define Q_ASSERT(expr_)                Q_ASSERT_ID(__LINE__, (expr_))
 #define Q_ERROR()                      Q_ERROR_ID(__LINE__)
-#define Q_REQUIRE_ID(id_, expr_)       Q_ASSERT_ID((id_), (expr_))
+
 #define Q_REQUIRE(expr_)               Q_ASSERT(expr_)
+#define Q_REQUIRE_ID(id_, expr_)       Q_ASSERT_ID((id_), (expr_))
 #define Q_REQUIRE_INCRIT(id_, expr_)   Q_ASSERT_INCRIT((id_), (expr_))
-#define Q_ENSURE_ID(id_, expr_)        Q_ASSERT_ID((id_), (expr_))
+#define Q_REQUIRE_LOCAL(id_, expr_)    Q_ASSERT_LOCAL((id_), (expr_))
+
 #define Q_ENSURE(expr_)                Q_ASSERT(expr_)
+#define Q_ENSURE_ID(id_, expr_)        Q_ASSERT_ID((id_), (expr_))
 #define Q_ENSURE_INCRIT(id_, expr_)    Q_ASSERT_INCRIT((id_), (expr_))
-#define Q_INVARIANT_ID(id_, expr_)     Q_ASSERT_ID((id_), (expr_))
+#define Q_ENSURE_LOCAL(id_, expr_)     Q_ASSERT_LOCAL((id_), (expr_))
+
 #define Q_INVARIANT(expr_)             Q_ASSERT(expr_)
+#define Q_INVARIANT_ID(id_, expr_)     Q_ASSERT_ID((id_), (expr_))
 #define Q_INVARIANT_INCRIT(id_, expr_) Q_ASSERT_INCRIT((id_), (expr_))
+#define Q_INVARIANT_LOCAL(id_, expr_)  Q_ASSERT_LOCAL((id_), (expr_))
+
+#define Q_ERROR_LOCAL(id_)             Q_ERROR_ID(id_)
 
 #ifndef Q_ASSERT_STATIC
     #define Q_ASSERT_STATIC(expr_) extern char Q_static_assert_[(expr_) ? 1 : -1]

include/qp.h

@@ -62,7 +62,6 @@ void NMI_Handler(void);
 // For best performance, these functions are implemented in assembly,
 // but they can be implemented in C as well.
 
-//int32_t volatile QF_int_lock_nest_; // not used
 extern char const QF_port_module_[];
 char const QF_port_module_[] = "qk_port";
 

include/qsafe.h

@@ -52,7 +52,7 @@
 #define QF_CRIT_STAT
 #define QF_CRIT_ENTRY()         (QF_crit_entry_())
 #define QF_CRIT_EXIT()          (QF_crit_exit_())
-
+#define QF_CRIT_EST()           (QF_crit_entry_())
 #define QF_CRIT_EXIT_NOP()      __asm volatile ("isb" ::: "memory")
 
 // Efficient log2() ----------------------------------------------------------
@@ -163,8 +163,6 @@ void QF_int_enable_(void);
 void QF_crit_entry_(void);
 void QF_crit_exit_(void);
 
-extern int32_t volatile QF_int_lock_nest_;
-
 //============================================================================
 // NOTE1:
 // The critical section policy does not use the "saving and restoring"

ports/arm-cm/qk/armclang/qk_port.c

@@ -62,7 +62,6 @@ void NMI_Handler(void);
 // For best performance, these functions are implemented in assembly,
 // but they can be implemented in C as well.
 
-//int32_t volatile QF_int_lock_nest_; // not used
 extern char const QF_port_module_[];
 char const QF_port_module_[] = "qk_port";
 
@@ -124,7 +123,6 @@ __asm volatile (
 #else                   //--------- use PRIMASK for enabling interrupts
     "  CPSIE   i                \n" // clear PRIMASK
 #endif                  //--------- use PRIMASK for enabling interrupts
-
     "  BX      lr               \n"
     "QF_int_enable_error:       \n"
     "  LDR     r0,=QF_port_module_ \n"

ports/arm-cm/qk/armclang/qp_port.h

@@ -52,7 +52,7 @@
 #define QF_CRIT_STAT
 #define QF_CRIT_ENTRY()         (QF_crit_entry_())
 #define QF_CRIT_EXIT()          (QF_crit_exit_())
-
+#define QF_CRIT_EST()           (QF_crit_entry_())
 #define QF_CRIT_EXIT_NOP()      __asm volatile ("isb" ::: "memory")
 
 // Efficient log2() ----------------------------------------------------------

ports/arm-cm/qk/gnu/qk_port.c

@@ -0,0 +1,108 @@
+// dummy system calls to eliminate the following GNU linker warning:
+// "warning: xxxx is not implemented and will always fail"
+
+#include <sys/stat.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+
+extern int __io_putchar(int ch) __attribute__((weak));
+extern int __io_getchar(void) __attribute__((weak));
+
+char *__env[1] = { 0 };
+char **environ = __env;
+
+void initialise_monitor_handles() {
+}
+int _getpid(void) {
+    return 1;
+}
+int _kill(int pid, int sig) {
+    (void)pid;
+    (void)sig;
+    errno = EINVAL;
+    return -1;
+}
+void _exit (int status) {
+    _kill(status, -1);
+    while (1) { // do not return
+    }
+}
+__attribute__((weak)) int _read(int file, char *ptr, int len) {
+    (void)file;
+    for (int i = len; i != 0; --i) {
+        *ptr++ = __io_getchar();
+    }
+    return len;
+}
+__attribute__((weak)) int _write(int file, char *ptr, int len) {
+    (void)file;
+    for (int i = len; i != 0; --i) {
+        __io_putchar(*ptr++);
+    }
+    return len;
+}
+int _close(int file) {
+    (void)file;
+    return -1;
+}
+int _fstat(int file, struct stat *st) {
+    (void)file;
+    st->st_mode = S_IFCHR;
+    return 0;
+}
+int _isatty(int file) {
+    (void)file;
+    return 1;
+}
+int _lseek(int file, int ptr, int dir) {
+    (void)file;
+    (void)ptr;
+    (void)dir;
+    return 0;
+}
+int _open(char *path, int flags, ...) {
+    (void)path;
+    (void)flags;
+    return -1;
+}
+int _wait(int *status) {
+    (void)status;
+    errno = ECHILD;
+    return -1;
+}
+int _unlink(char *name) {
+    (void)name;
+    errno = ENOENT;
+    return -1;
+}
+int _times(struct tms *buf) {
+    (void)buf;
+    return -1;
+}
+int _stat(char *file, struct stat *st) {
+    (void)file;
+    st->st_mode = S_IFCHR;
+    return 0;
+}
+int _link(char *old, char *new) {
+    (void)old;
+    (void)new;
+    errno = EMLINK;
+    return -1;
+}
+int _fork(void) {
+    errno = EAGAIN;
+    return -1;
+}
+int _execve(char *name, char **argv, char **env) {
+    (void)name;
+    (void)argv;
+    (void)env;
+    errno = ENOMEM;
+    return -1;
+}

ports/arm-cm/qk/gnu/qp_port.h

@@ -67,7 +67,6 @@ void NMI_Handler(void);
 #pragma weak QF_crit_entry_
 #pragma weak QF_crit_exit_
 
-//int32_t volatile QF_int_lock_nest_; // not used
 extern char const QF_port_module_[];
 char const QF_port_module_[] = "qk_port";