[bsp][tms320f28379d] Fix compile ti (#6254)

CuttySark1869 · QY7 · web-flow · commit b43f0e72056c · 2022-08-20T13:16:41.000-04:00
* compile_ok

Issues fixed:
(1) update .config: select FINSH_USING_SYMTAB
(2) add rt_size_t in rtconfig_project.h
(3) fix finsh problems of using sym table
(4) update .project to include ipc source codes.
Todo list:
(1) automate the build source selection of ccs and reconcile it with scons

* change compiler

* msh can run now

the key step is to swap the order of rt_interrupt_nest -- and RT_OBJECT_HOOK_CALL(rt_interrupt_leave_hook,()) in irq.c. This is an improvised solution and an issue has been raised.

* Update 2837x_FLASH_lnk_cpu1.cmd

The original one is also fine. Just to make it more rigorous since FSymTab is in data section.

* update readme.md

Complier selection and maintainer update.

Co-authored-by: YuQi &lt;qiyu_sjtu@163.com&gt;
diff --git a/bsp/tms320f28379d/.config b/bsp/tms320f28379d/.config
diff --git a/bsp/tms320f28379d/.cproject b/bsp/tms320f28379d/.cproject
diff --git a/bsp/tms320f28379d/.gitignore b/bsp/tms320f28379d/.gitignore
@@ -0,0 +1 @@
+.launches/
diff --git a/bsp/tms320f28379d/.project b/bsp/tms320f28379d/.project
@@ -51,9 +51,9 @@
 			<locationURI>PARENT-2-PROJECT_LOC/components/drivers/serial/serial.c</locationURI>
 		</link>
 		<link>
-			<name>DeviceDrivers/src</name>
+			<name>DeviceDrivers/ipc</name>
 			<type>2</type>
-			<locationURI>PARENT-2-PROJECT_LOC/components/drivers/src</locationURI>
+			<locationURI>PARENT-2-PROJECT_LOC/components/drivers/ipc</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs b/bsp/tms320f28379d/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
-encoding//Debug/DeviceDrivers/src/subdir_rules.mk=UTF-8
-encoding//Debug/DeviceDrivers/src/subdir_vars.mk=UTF-8
+encoding//Debug/DeviceDrivers/ipc/subdir_rules.mk=UTF-8
+encoding//Debug/DeviceDrivers/ipc/subdir_vars.mk=UTF-8
 encoding//Debug/DeviceDrivers/subdir_rules.mk=UTF-8
 encoding//Debug/DeviceDrivers/subdir_vars.mk=UTF-8
 encoding//Debug/Kernel/subdir_rules.mk=UTF-8
diff --git a/bsp/tms320f28379d/2837x_FLASH_lnk_cpu1.cmd b/bsp/tms320f28379d/2837x_FLASH_lnk_cpu1.cmd
@@ -6,8 +6,6 @@ PAGE 0 :  /* Program Memory */
           /* BEGIN is used for the "boot to Flash" bootloader mode   */
 
    BEGIN           	: origin = 0x080000, length = 0x000002
-   RAMM0           	: origin = 0x000122, length = 0x0002DE
-   RAMD0           	: origin = 0x00B000, length = 0x000800
    RAMLS0          	: origin = 0x008000, length = 0x000800
    RAMLS1          	: origin = 0x008800, length = 0x000800
    RAMLS2      		: origin = 0x009000, length = 0x000800
@@ -39,6 +37,8 @@ PAGE 1 : /* Data Memory */
    BOOT_RSVD       : origin = 0x000002, length = 0x000120     /* Part of M0, BOOT rom will use this for stack */
    RAMM1           : origin = 0x000400, length = 0x000400     /* on-chip RAM block M1 */
    RAMD1           : origin = 0x00B800, length = 0x000800
+   RAMM0           : origin = 0x000122, length = 0x0002DE
+   RAMD0           : origin = 0x00B000, length = 0x000800
 
    RAMLS5      : origin = 0x00A800, length = 0x000800
 
@@ -94,7 +94,11 @@ SECTIONS
                          PAGE = 0, ALIGN(4)   
    #endif
 #endif
-						 
+
+   FSymTab : > RAMD0, PAGE = 1, ALIGN(4)
+   LOAD_START(___fsymtab_start)
+   LOAD_END(___fsymtab_end)
+   
    /* Allocate uninitalized data sections: */
    .stack              : > RAMM1        PAGE = 1
    .ebss               : >> RAMLS5 | RAMGS0 | RAMGS1       PAGE = 1
diff --git a/bsp/tms320f28379d/README.md b/bsp/tms320f28379d/README.md
@@ -46,9 +46,7 @@ TMS320F28379D 程序的编译和下载要使用的是 TI 官方提供的 Code Co
 ![import_dia](figures/import_dia.png)
 
 ### 2.2 编译工程
-使用 CCS 内置的 C 编译器可以进行工程的编译，本文使用的是 Code Composer Studio 8.1.0 和 TI v18.1.3.LTS 编译器的组合。
-
-导入工程后，在右边的 Project Explorer 列表里可以看到刚刚导入的 rt-thread 工程，右键点击，在弹出的菜单中选择 Build Project 即可开始编译。
+使用 CCS 内置的 C 编译器可以进行工程的编译。CCS 8 需要使用 TI v18.1.3.LTS 编译器。CCS 10 需要使用 TI v20.2.1.LTS 及以上版本编译器（v20.2.0.LTS及以下版本的编译器有bug编译时会出现segmentation fault）。本文使用的是 Code Composer Studio 10.1.1 和 TI v20.2.4.LTS 编译器的组合（已经配置在工程文件中）。导入工程后，在右边的 Project Explorer 列表里可以看到刚刚导入的 rt-thread 工程，右键点击，在弹出的菜单中选择 Build Project 即可开始编译。
 
 ![build](figures/build.png)
 
@@ -70,9 +68,9 @@ TMS320F28379D 程序的编译和下载要使用的是 TI 官方提供的 Code Co
 ```bash
  \ | /
 - RT -     Thread Operating System
- / | \     4.0.1 build Feb 21 2019
- 2006 - 2019 Copyright by rt-thread team
-finsh >
+ / | \     4.1.1 build Jul  4 2022 22:33:37
+ 2006 - 2022 Copyright by RT-Thread team
+ msh >
  ```
 
 ## 4. 注意事项
@@ -97,6 +95,8 @@ finsh >
 ## 6. 联系人信息
 
 维护人：xuzhuoyi < xzy476386434@vip.qq.com >
+qiyu < qiyu_sjtu@163.com >
+guyunjie < yunjie.gu1@gmail.com >
 
 ## 7. 参考
 
diff --git a/bsp/tms320f28379d/drivers/board.c b/bsp/tms320f28379d/drivers/board.c
@@ -1,26 +1,44 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2009-09-22     Bernard      add board.h to this bsp
  * 2018-09-02     xuzhuoyi     modify for TMS320F28379D version
+ * 2022-06-21     guyunjie     fix bugs in trap_rtosint and enable interrupt nesting
  */
 #include <rtthread.h>
 #include "board.h"
 #include "drv_sci.h"
 #include "F28x_Project.h"
 
+#ifndef RT_USING_SMP
+extern volatile rt_uint8_t rt_interrupt_nest;
+#endif
+
 extern rt_uint32_t rt_thread_switch_interrupt_flag;
 
 extern interrupt void RTOSINT_Handler();
 
 void trap_rtosint()
 {
     if(rt_thread_switch_interrupt_flag)
-        asm(" trap #16");
+    {
+        /* only do pendsv at the end of the last level of interrupt nesting,
+         * so that threads do not preempt any isrs. */
+        if(rt_interrupt_nest == 1)
+        {
+            /* rt_interrupt_leave_hook is called before rt_interrupt_nest --
+             * in rt_interrupt_leave. We need to do this manually here to indicate
+             * that all isrs have been cleared before we switch to thread. */
+            rt_interrupt_nest --;
+            asm(" trap #16");
+            /* increment rt_interrupt_nest to compensate for the previous decrement. */
+            rt_interrupt_nest ++;
+        }
+    }
 }
 
 /**
@@ -30,6 +48,9 @@ void trap_rtosint()
 interrupt void cpu_timer2_isr(void)
 {
     CpuTimer2Regs.TCR.all = 0xC000;
+
+    ALLOW_ISR_PREEMPT();
+
     /* enter interrupt */
     rt_interrupt_enter();
 
@@ -76,5 +97,6 @@ void rt_hw_board_init()
 #if defined(RT_USING_CONSOLE) && defined(RT_USING_DEVICE)
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
+    /*this hook may cause problem for reasons unknown*/
     rt_interrupt_leave_sethook((void (*)(void))trap_rtosint);
 }
diff --git a/bsp/tms320f28379d/drivers/drv_sci.c b/bsp/tms320f28379d/drivers/drv_sci.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -181,6 +181,8 @@ static const struct rt_uart_ops c28x_uart_ops =
 //
 interrupt void sciaRxFifoIsr(void)
 {
+    ALLOW_ISR_PREEMPT();
+
     /* enter interrupt */
     rt_interrupt_enter();
 
diff --git a/bsp/tms320f28379d/rtconfig.h b/bsp/tms320f28379d/rtconfig.h
@@ -15,6 +15,7 @@
 #define RT_THREAD_PRIORITY_MAX 8
 #define RT_TICK_PER_SECOND 100
 #define RT_USING_HOOK
+#define RT_HOOK_USING_FUNC_PTR
 #define RT_USING_IDLE_HOOK
 #define RT_IDLE_HOOK_LIST_SIZE 4
 #define IDLE_THREAD_STACK_SIZE 1024
@@ -45,71 +46,53 @@
 #define RT_USING_CONSOLE
 #define RT_CONSOLEBUF_SIZE 128
 #define RT_CONSOLE_DEVICE_NAME "scia"
-#define RT_VER_NUM 0x40100
+#define RT_VER_NUM 0x40101
 #define ARCH_TIDSP
 #define ARCH_TIDSP_C28X
 #define ARCH_CPU_STACK_GROWS_UPWARD
 
 /* RT-Thread Components */
 
 #define RT_USING_COMPONENTS_INIT
-
-/* C++ features */
-
-
-/* Command shell */
-
-#define RT_USING_FINSH
 #define RT_USING_MSH
+#define RT_USING_FINSH
 #define FINSH_USING_MSH
 #define FINSH_THREAD_NAME "tshell"
-#define FINSH_THREAD_PRIORITY 6
+#define FINSH_THREAD_PRIORITY 4
 #define FINSH_THREAD_STACK_SIZE 4096
 #define FINSH_USING_HISTORY
 #define FINSH_HISTORY_LINES 5
+#define FINSH_USING_SYMTAB
 #define FINSH_CMD_SIZE 80
 #define MSH_USING_BUILT_IN_COMMANDS
+#define FINSH_USING_DESCRIPTION
 #define FINSH_ARG_MAX 10
 
-/* Device virtual file system */
-
-
 /* Device Drivers */
 
 #define RT_USING_DEVICE_IPC
-#define RT_PIPE_BUFSZ 512
 #define RT_USING_SERIAL
 #define RT_USING_SERIAL_V1
-#define RT_SERIAL_USING_DMA
 #define RT_SERIAL_RB_BUFSZ 64
 #define RT_USING_PIN
 
 /* Using USB */
 
 
-/* POSIX layer and C standard library */
+/* C/C++ and POSIX layer */
 
-#define RT_LIBC_USING_TIME
 #define RT_LIBC_DEFAULT_TIMEZONE 8
 
 /* POSIX (Portable Operating System Interface) layer */
 
 
-/* Network */
-
-/* Socket abstraction layer */
-
-
-/* Network interface device */
+/* Interprocess Communication (IPC) */
 
 
-/* light weight TCP/IP stack */
+/* Socket is in the 'Network' category */
 
 
-/* AT commands */
-
-
-/* VBUS(Virtual Software BUS) */
+/* Network */
 
 
 /* Utilities */
@@ -142,44 +125,20 @@
 
 /* multimedia packages */
 
-/* LVGL: powerful and easy-to-use embedded GUI library */
-
-
-/* u8g2: a monochrome graphic library */
-
-
-/* PainterEngine: A cross-platform graphics application framework written in C language */
-
 
 /* tools packages */
 
 
 /* system packages */
 
-/* rt_kprintf: enhanced rt_kprintf packages */
-
-
-/* acceleration: Assembly language or algorithmic acceleration packages */
-
-
-/* CMSIS: ARM Cortex-M Microcontroller Software Interface Standard */
-
-
-/* Micrium: Micrium software products porting for RT-Thread */
-
 
 /* peripheral libraries and drivers */
 
 
-/* AI packages */
-
-
 /* miscellaneous packages */
 
-/* samples: kernel and components samples */
-
 
-/* entertainment: terminal games and other interesting software packages */
+/* samples: kernel and components samples */
 
 #include "rtconfig_project.h"
 
diff --git a/bsp/tms320f28379d/rtconfig_project.h b/bsp/tms320f28379d/rtconfig_project.h
@@ -19,5 +19,11 @@ typedef unsigned char                   rt_uint8_t;     /**<  8bit unsigned inte
 typedef unsigned short                  rt_uint16_t;    /**< 16bit unsigned integer type */
 typedef unsigned long                   rt_uint32_t;    /**< 32bit unsigned integer type */
 typedef unsigned long long              rt_uint64_t;    /**< 64bit unsigned integer type */
+typedef unsigned long                   rt_size_t;      /**< Type for size number */
+
+/* C28X automatically disable interrupt in interrupt service routine.
+ * We need to enable manually to allow for interrupt nesting by calling
+ * this macro at the start of preemptible interrupt service routines*/
+#define ALLOW_ISR_PREEMPT() __asm(" CLRC INTM")
 
 #endif
diff --git a/libcpu/ti-dsp/c28x/context.s b/libcpu/ti-dsp/c28x/context.s
@@ -9,7 +9,7 @@
 ; 2019-06-17     zhaoxiaowei  fix bugs of old c28x interrupt api.
 ; 2019-07-03     zhaoxiaowei  add _rt_hw_calc_csb function to support __rt_ffs.
 ; 2019-12-05     xiaolifan    add support for hardware fpu32
-;
+; 2022-06-21     guyunjie     trim pendsv (RTOSINT_Handler)
 
     .ref   _rt_interrupt_to_thread
     .ref   _rt_interrupt_from_thread
@@ -191,8 +191,8 @@ _reswitch2:
 
      .asmfunc
 _RTOSINT_Handler:
-; disable interrupt to protect context switch
-    DINT
+    ; disable interrupt to protect context switch
+    ; DINT ;this is done by hardware so not needed
 
     ; get rt_thread_switch_interrupt_flag
     MOV     AR0, #_rt_thread_switch_interrupt_flag
@@ -248,8 +248,8 @@ switch_to_thread:
     RT_CTX_RESTORE     ; pop r4 - r11 register
 
 rtosint_exit:
-    ; restore interrupt
-    EINT
+    ; do not restore interrupt here: to be restored according to the
+    ; switched-to context during IRET (automaticlly by hardware)
 
     IRET
     .endasmfunc
diff --git a/src/irq.c b/src/irq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -11,6 +11,7 @@
  * 2018-11-22     Jesven       rt_interrupt_get_nest function add disable irq
  * 2021-08-15     Supperthomas fix the comment
  * 2022-01-07     Gabriel      Moving __on_rt_xxxxx_hook to irq.c
+ * 2022-07-04     Yunjie       fix RT_DEBUG_LOG
  */
 
 #include <rthw.h>
@@ -87,7 +88,7 @@ void rt_interrupt_enter(void)
     rt_hw_interrupt_enable(level);
 
     RT_DEBUG_LOG(RT_DEBUG_IRQ, ("irq has come..., irq current nest:%d\n",
-                                rt_interrupt_nest));
+                                (rt_int32_t)rt_interrupt_nest));
 }
 RTM_EXPORT(rt_interrupt_enter);
 
@@ -104,7 +105,7 @@ void rt_interrupt_leave(void)
     rt_base_t level;
 
     RT_DEBUG_LOG(RT_DEBUG_IRQ, ("irq is going to leave, irq current nest:%d\n",
-                                rt_interrupt_nest));
+                                (rt_int32_t)rt_interrupt_nest));
 
     level = rt_hw_interrupt_disable();
     RT_OBJECT_HOOK_CALL(rt_interrupt_leave_hook,());

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2006-2018, RT-Thread Development Team`
	`2`	`+ * Copyright (c) 2006-2022, RT-Thread Development Team`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: Apache-2.0`
`5`	`5`	`*`
`@@ -181,6 +181,8 @@ static const struct rt_uart_ops c28x_uart_ops =`
`181`	`181`	`//`
`182`	`182`	`interrupt void sciaRxFifoIsr(void)`
`183`	`183`	`{`
	`184`	`+ ALLOW_ISR_PREEMPT();`
	`185`	`+`
`184`	`186`	`/* enter interrupt */`
`185`	`187`	`rt_interrupt_enter();`
`186`	`188`