7.0.1

Adapted QP/C++ source code to avoid warings from the new C++20 standard about: "compound assignment with 'volatile'-qualified left operand is deprecated".

Author: quantum-leaps

doxygen/Doxyfile

@@ -7,7 +7,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = QP/C++
-PROJECT_NUMBER         = 7.0.0
+PROJECT_NUMBER         = 7.0.1
 PROJECT_BRIEF          = "Real-Time Embedded Framework"
 PROJECT_LOGO           = images/logo_ql.png
 OUTPUT_DIRECTORY       =

doxygen/history.dox

@@ -2,6 +2,10 @@ namespace QP {
 
 /** @page history Revision History
 
+@section qpcpp_7_0_1 Version 7.0.1, 2022-05-14
+Adapted QP/C++ source code to avoid warings from the new C++20 standard about: "compound assignment with 'volatile'-qualified left operand is deprecated".
+
+
 @section qpcpp_7_0_0 Version 7.0.0, 2022-04-30
 This major focus of this release is the adaptation of the code and documentation to better support safety certification (see [QP Certification Pack](https://www.state-machine.com/products/qp#CERT))
 

doxygen/metrics.dox

@@ -0,0 +1,317 @@
+##############################################################################
+# Product: Makefile for QP/C++ on EMF32-SLSTK3401A, QK kernel, GNU-ARM
+# Last Updated for Version: 7.0.0
+# Date of the Last Update:  2022-05-13
+#
+#                    Q u a n t u m  L e a P s
+#                    ------------------------
+#                    Modern Embedded Software
+#
+# Copyright (C) 2005-2022 Quantum Leaps, LLC. All rights reserved.
+#
+# This program is open source software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Alternatively, this program may be distributed and modified under the
+# terms of Quantum Leaps commercial licenses, which expressly supersede
+# the GNU General Public License and are specifically designed for
+# licensees interested in retaining the proprietary status of their code.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses>.
+#
+# Contact information:
+# <www.state-machine.com/licensing>
+# <[email protected]>
+##############################################################################
+# examples of invoking this Makefile:
+# building configurations: Debug (default), Release, and Spy
+# make
+# make CONF=rel
+# make CONF=spy
+#
+# cleaning configurations: Debug (default), Release, and Spy
+# make clean
+# make CONF=rel clean
+# make CONF=spy clean
+#
+# NOTE:
+# To use this Makefile on Windows, you will need the GNU make utility, which
+# is included in the Qtools collection for Windows, see:
+#    https://github.com/QuantumLeaps/qtools/releases
+#
+
+#-----------------------------------------------------------------------------
+# project name
+#
+PROJECT     := dpp-qk
+
+#-----------------------------------------------------------------------------
+# project directories
+#
+
+# location of the QP/C++ framework (if not provided in an environemnt var.)
+ifeq ($(QPCPP),)
+QPCPP := ../../../../..
+endif
+
+# QP port used in this project
+QP_PORT_DIR := $(QPCPP)/ports/arm-cm/qk/gnu
+
+# list of all source directories used by this project
+VPATH = \
+	.. \
+	../.. \
+	$(QPCPP)/src/qf \
+	$(QPCPP)/src/qk \
+	$(QPCPP)/src/qs \
+	$(QP_PORT_DIR) \
+	$(QPCPP)/3rd_party/efm32pg1b \
+	$(QPCPP)/3rd_party/efm32pg1b/gnu
+
+# list of all include directories needed by this project
+INCLUDES  = \
+	-I../.. \
+	-I$(QPCPP)/include \
+	-I$(QPCPP)/src \
+	-I$(QP_PORT_DIR) \
+	-I$(QPCPP)/3rd_party/CMSIS/Include \
+	-I$(QPCPP)/3rd_party/efm32pg1b
+
+#-----------------------------------------------------------------------------
+# files
+#
+
+# assembler source files
+ASM_SRCS :=
+
+# C source files
+C_SRCS := \
+	startup_efm32pg1b.c \
+	system_efm32pg1b.c \
+	em_cmu.c \
+	em_emu.c \
+	em_gpio.c \
+	em_usart.c
+
+# C++ source files
+CPP_SRCS := \
+	bsp.cpp \
+	main.cpp \
+	philo.cpp \
+	table.cpp
+
+OUTPUT    := $(PROJECT)
+LD_SCRIPT := $(PROJECT).ld
+
+QP_SRCS := \
+	qep_hsm.cpp \
+	qep_msm.cpp \
+	qf_act.cpp \
+	qf_actq.cpp \
+	qf_defer.cpp \
+	qf_dyn.cpp \
+	qf_mem.cpp \
+	qf_ps.cpp \
+	qf_qact.cpp \
+	qf_qeq.cpp \
+	qf_qmact.cpp \
+	qf_time.cpp \
+	qk.cpp \
+	qk_port.cpp
+
+QP_ASMS :=
+
+QS_SRCS := \
+	qs.cpp \
+	qs_rx.cpp \
+	qs_fp.cpp
+
+LIB_DIRS  :=
+LIBS      :=
+
+# defines
+DEFINES   := -DEFM32PG1B200F256GM48=1 \
+	-DQK_USE_IRQ_NUM=25 \
+	-DQK_USE_IRQ_HANDLER=CRYPTO_IRQHandler
+
+# ARM CPU, ARCH, FPU, and Float-ABI types...
+# ARM_CPU:   [cortex-m0 | cortex-m0plus | cortex-m1 | cortex-m3 | cortex-m4]
+# ARM_FPU:   [ | vfp]
+# FLOAT_ABI: [ | soft | softfp | hard]
+#
+ARM_CPU   := -mcpu=cortex-m4
+ARM_FPU   := -mfpu=vfp
+FLOAT_ABI := -mfloat-abi=softfp
+
+#-----------------------------------------------------------------------------
+# GNU-ARM toolset (NOTE: You need to adjust to your machine)
+# see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads
+#
+ifeq ($(GNU_ARM),)
+GNU_ARM := $(QTOOLS)/gnu_arm-none-eabi
+endif
+
+# make sure that the GNU-ARM toolset exists...
+ifeq ("$(wildcard $(GNU_ARM))","")
+$(error GNU_ARM toolset not found. Please adjust the Makefile)
+endif
+
+CC    := $(GNU_ARM)/bin/arm-none-eabi-gcc
+CPP   := $(GNU_ARM)/bin/arm-none-eabi-g++
+AS    := $(GNU_ARM)/bin/arm-none-eabi-as
+LINK  := $(GNU_ARM)/bin/arm-none-eabi-g++
+BIN   := $(GNU_ARM)/bin/arm-none-eabi-objcopy
+
+
+##############################################################################
+# Typically, you should not need to change anything below this line
+
+# basic utilities (included in Qtools for Windows), see:
+#    http://sourceforge.net/projects/qpc/files/Qtools
+
+MKDIR := mkdir
+RM    := rm
+
+#-----------------------------------------------------------------------------
+# build options for various configurations for ARM Cortex-M4F
+#
+
+# combine all the soruces...
+CPP_SRCS += $(QP_SRCS)
+ASM_SRCS += $(QP_ASMS)
+
+ifeq (rel, $(CONF)) # Release configuration ..................................
+
+BIN_DIR := rel
+
+ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU)
+
+CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \
+	-ffunction-sections -fdata-sections \
+	-O1 $(INCLUDES) $(DEFINES) -DNDEBUG
+
+CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -std=c++20 -mthumb -Wall \
+	-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \
+	-O1 $(INCLUDES) $(DEFINES) -DNDEBUG
+
+else ifeq (spy, $(CONF))  # Spy configuration ................................
+
+BIN_DIR := spy
+
+CPP_SRCS += $(QS_SRCS)
+
+ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU)
+
+CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \
+	-ffunction-sections -fdata-sections \
+	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+
+CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -std=c++20 -mthumb -Wall \
+	-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \
+	-O $(INCLUDES) $(DEFINES) -DQ_SPY
+
+else # default Debug configuration ..........................................
+
+BIN_DIR := dbg
+
+ASFLAGS = -g $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU)
+
+CFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \
+	-ffunction-sections -fdata-sections \
+	-O $(INCLUDES) $(DEFINES)
+
+CPPFLAGS = -c -g $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -std=c++20 -mthumb -Wall \
+	-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \
+	-O $(INCLUDES) $(DEFINES)
+
+endif # ......................................................................
+
+
+LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \
+	-specs=nosys.specs -specs=nano.specs \
+	-Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS)
+
+
+ASM_OBJS     := $(patsubst %.s,%.o,  $(notdir $(ASM_SRCS)))
+C_OBJS       := $(patsubst %.c,%.o,  $(notdir $(C_SRCS)))
+CPP_OBJS     := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS)))
+
+TARGET_BIN   := $(BIN_DIR)/$(OUTPUT).bin
+TARGET_ELF   := $(BIN_DIR)/$(OUTPUT).elf
+ASM_OBJS_EXT := $(addprefix $(BIN_DIR)/, $(ASM_OBJS))
+C_OBJS_EXT   := $(addprefix $(BIN_DIR)/, $(C_OBJS))
+C_DEPS_EXT   := $(patsubst %.o, %.d, $(C_OBJS_EXT))
+CPP_OBJS_EXT := $(addprefix $(BIN_DIR)/, $(CPP_OBJS))
+CPP_DEPS_EXT := $(patsubst %.o, %.d, $(CPP_OBJS_EXT))
+
+# create $(BIN_DIR) if it does not exist
+ifeq ("$(wildcard $(BIN_DIR))","")
+$(shell $(MKDIR) $(BIN_DIR))
+endif
+
+#-----------------------------------------------------------------------------
+# rules
+#
+
+all: $(TARGET_BIN)
+#all: $(TARGET_ELF)
+
+$(TARGET_BIN): $(TARGET_ELF)
+	$(BIN) -O binary $< $@
+
+$(TARGET_ELF) : $(ASM_OBJS_EXT) $(C_OBJS_EXT) $(CPP_OBJS_EXT)
+	$(CPP) $(CPPFLAGS) $(QPCPP)/include/qstamp.cpp -o $(BIN_DIR)/qstamp.o
+	$(LINK) $(LINKFLAGS) -o $@ $^ $(BIN_DIR)/qstamp.o $(LIBS)
+
+$(BIN_DIR)/%.d : %.c
+	$(CC) -MM -MT $(@:.d=.o) $(CFLAGS) $< > $@
+
+$(BIN_DIR)/%.d : %.cpp
+	$(CPP) -MM -MT $(@:.d=.o) $(CPPFLAGS) $< > $@
+
+$(BIN_DIR)/%.o : %.s
+	$(AS) $(ASFLAGS) $< -o $@
+
+$(BIN_DIR)/%.o : %.c
+	$(CC) $(CFLAGS) $< -o $@
+
+$(BIN_DIR)/%.o : %.cpp
+	$(CPP) $(CPPFLAGS) $< -o $@
+
+# include dependency files only if our goal depends on their existence
+ifneq ($(MAKECMDGOALS),clean)
+  ifneq ($(MAKECMDGOALS),show)
+-include $(C_DEPS_EXT) $(CPP_DEPS_EXT)
+  endif
+endif
+
+
+.PHONY : clean
+clean:
+	-$(RM) $(BIN_DIR)/*.o \
+	$(BIN_DIR)/*.d \
+	$(BIN_DIR)/*.bin \
+	$(BIN_DIR)/*.elf \
+	$(BIN_DIR)/*.map
+	
+show:
+	@echo PROJECT = $(PROJECT)
+	@echo CONF = $(CONF)
+	@echo DEFINES = $(DEFINES)
+	@echo ASM_FPU = $(ASM_FPU)
+	@echo ASM_SRCS = $(ASM_SRCS)
+	@echo C_SRCS = $(C_SRCS)
+	@echo CPP_SRCS = $(CPP_SRCS)
+	@echo ASM_OBJS_EXT = $(ASM_OBJS_EXT)
+	@echo C_OBJS_EXT = $(C_OBJS_EXT)
+	@echo C_DEPS_EXT = $(C_DEPS_EXT)
+	@echo CPP_DEPS_EXT = $(CPP_DEPS_EXT)
+	@echo TARGET_ELF = $(TARGET_ELF)