From 11d76c6e6c1d225ee32111b19ab20c800eca92da Mon Sep 17 00:00:00 2001 From: zhangyu117 Date: Mon, 31 Aug 2026 14:03:12 +0800 Subject: [PATCH 1/2] arch/tricore: Simplify header files and implementation in FPU 1. replace __mtcr/mfcr with arch's tricore_mtcr/tricore_mfcr, donot dependon illd 2. Simplify header files 3. define registers address self Signed-off-by: zhangyu117 --- arch/tricore/include/irq.h | 12 ++++++------ arch/tricore/src/common/tricore_fpu.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/tricore/include/irq.h b/arch/tricore/include/irq.h index f4109c6f5bd72..f2ff77438c544 100644 --- a/arch/tricore/include/irq.h +++ b/arch/tricore/include/irq.h @@ -147,14 +147,14 @@ /* FPU registers */ #ifdef CONFIG_ARCH_TC1V6 -# define FPU_SYNC_TRAP_REG CPU_FPU_TRAP_CON -# define FPU_ASYNC_TRAP_REG CPU_FPU_TRAP_CON +# define FPU_SYNC_TRAP_REG 0xA000 +# define FPU_ASYNC_TRAP_REG 0xA000 #else -# define FPU_SYNC_TRAP_REG CPU_FPU_SYNC_TRAP_CON -# define FPU_ASYNC_TRAP_REG CPU_FPU_TRAP_CON +# define FPU_SYNC_TRAP_REG 0xA030 +# define FPU_ASYNC_TRAP_REG 0xA000 #endif -#define FPU_TRAP_FZE_SHIFT 20 -#define FPU_TRAP_TCL_SHIFT 1 +#define FPU_TRAP_FZE_SHIFT 20 +#define FPU_TRAP_TCL_SHIFT 1 #ifndef __ASSEMBLY__ diff --git a/arch/tricore/src/common/tricore_fpu.c b/arch/tricore/src/common/tricore_fpu.c index ec1c4343e9033..5b7c117d9c163 100644 --- a/arch/tricore/src/common/tricore_fpu.c +++ b/arch/tricore/src/common/tricore_fpu.c @@ -28,7 +28,7 @@ #include -#include "tricore_internal.h" +#include /**************************************************************************** * Public Functions @@ -42,8 +42,8 @@ void tricore_fpuinit(void) { /* FPU zero-divide trap enable */ - __mtcr(FPU_SYNC_TRAP_REG, - __mfcr(FPU_SYNC_TRAP_REG) | (1U << FPU_TRAP_FZE_SHIFT)); + tricore_mtcr(FPU_SYNC_TRAP_REG, tricore_mfcr(FPU_SYNC_TRAP_REG) | + (1U << FPU_TRAP_FZE_SHIFT)); } /**************************************************************************** From 84eb4fc866e75eb9f37f601ffa84bba629182e08 Mon Sep 17 00:00:00 2001 From: zhangyu117 Date: Mon, 31 Aug 2026 14:09:57 +0800 Subject: [PATCH 2/2] arch/tricore: fix bug about less ')" in makefile error: Makefile:241: *** unterminated call to function "call": missing ")". Stop. Signed-off-by: zhangyu117 --- arch/tricore/src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/tricore/src/Makefile b/arch/tricore/src/Makefile index 524d0865428f8..3e28447cbfb20 100644 --- a/arch/tricore/src/Makefile +++ b/arch/tricore/src/Makefile @@ -239,7 +239,7 @@ distclean:: clean ifeq ($(BOARDMAKE),y) $(Q) $(MAKE) -C board distclean endif - $(call DELFILE, $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds) + $(call DELFILE, $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)) $(call DELFILE, Make.dep) $(call DELFILE, .depend)