deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define threads stack size by stack-def.h.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka
2017-09-05 14:34:25 +09:00
parent a1b993c2e2
commit af5982507f
5 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2017-09-05 NIIBE Yutaka <gniibe@fsij.org>
* example-cdc: Use stack-def.h.
* example-cdc/stack-def.h: New.
2017-09-04 NIIBE Yutaka <gniibe@fsij.org> 2017-09-04 NIIBE Yutaka <gniibe@fsij.org>
* mcu/sys-stm32f103.h (nvic_system_reset): Add noreturn attribute. * mcu/sys-stm32f103.h (nvic_system_reset): Add noreturn attribute.

16
example-cdc/sample.c
View File

@@ -61,14 +61,14 @@ blk (void *arg)
#define PRIO_PWM 3 #define PRIO_PWM 3
#define PRIO_BLK 2 #define PRIO_BLK 2
extern uint8_t __process1_stack_base__[], __process1_stack_size__[]; #define STACK_MAIN
extern uint8_t __process2_stack_base__[], __process2_stack_size__[]; #define STACK_PROCESS_1
#define STACK_PROCESS_2
#define STACK_ADDR_PWM ((uint32_t)__process1_stack_base__) #include "stack-def.h"
#define STACK_SIZE_PWM ((uint32_t)__process1_stack_size__) #define STACK_ADDR_PWM ((uint32_t)process1_base)
#define STACK_SIZE_PWM (sizeof process1_base)
#define STACK_ADDR_BLK ((uint32_t)__process2_stack_base__) #define STACK_ADDR_BLK ((uint32_t)process2_base)
#define STACK_SIZE_BLK ((uint32_t)__process2_stack_size__) #define STACK_SIZE_BLK (sizeof process2_base)
static char hexchar (uint8_t x) static char hexchar (uint8_t x)

28
example-cdc/sample.ld
View File

@@ -1,11 +1,6 @@
/* /*
* ST32F103 memory setup. * ST32F103 memory setup.
*/ */
__main_stack_size__ = 0x0100; /* Idle+Exception handlers */
__process0_stack_size__ = 0x0400; /* Main program */
__process1_stack_size__ = 0x0200; /* first thread program */
__process2_stack_size__ = 0x0200; /* second thread program */
__process3_stack_size__ = 0x0200; /* third thread program */
MEMORY MEMORY
{ {
@@ -81,31 +76,18 @@ SECTIONS
.process_stack : .process_stack :
{ {
. = ALIGN(8); . = ALIGN(8);
__process3_stack_base__ = .; *(.process_stack.3)
. += __process3_stack_size__; *(.process_stack.2)
*(.process_stack.1)
*(.process_stack.0)
. = ALIGN(8); . = ALIGN(8);
__process3_stack_end__ = .;
__process2_stack_base__ = .;
. += __process2_stack_size__;
. = ALIGN(8);
__process2_stack_end__ = .;
__process1_stack_base__ = .;
. += __process1_stack_size__;
. = ALIGN(8);
__process1_stack_end__ = .;
__process0_stack_base__ = .;
. += __process0_stack_size__;
. = ALIGN(8);
__process0_stack_end__ = .;
} > ram } > ram
.main_stack : .main_stack :
{ {
. = ALIGN(8); . = ALIGN(8);
__main_stack_base__ = .; *(.main_stack)
. += __main_stack_size__;
. = ALIGN(8); . = ALIGN(8);
__main_stack_end__ = .;
} > ram } > ram
.data : .data :

24
example-cdc/stack-def.h Normal file
View File

@@ -0,0 +1,24 @@
#if defined(STACK_MAIN)
/* Idle+Exception handlers */
char __main_stack_end__[0] __attribute__ ((section(".main_stack")));
char main_base[0x0100] __attribute__ ((section(".main_stack")));
/* Main program */
char __process0_stack_end__[0] __attribute__ ((section(".process_stack.0")));
char process0_base[0x0400] __attribute__ ((section(".process_stack.0")));
#endif
/* First thread program */
#if defined(STACK_PROCESS_1)
char process1_base[0x0200] __attribute__ ((section(".process_stack.1")));
#endif
/* Second thread program */
#if defined(STACK_PROCESS_2)
char process2_base[0x0200] __attribute__ ((section(".process_stack.2")));
#endif
/* Third thread program */
#if defined(STACK_PROCESS_3)
char process3_base[0x0200] __attribute__ ((section(".process_stack.3")));
#endif

7
example-cdc/usb-cdc.c
View File

@@ -642,9 +642,10 @@ static void *tty_main (void *arg);
#define INTR_REQ_USB 20 #define INTR_REQ_USB 20
#define PRIO_TTY 4 #define PRIO_TTY 4
extern uint8_t __process3_stack_base__[], __process3_stack_size__[]; #define STACK_PROCESS_3
#define STACK_ADDR_TTY ((uint32_t)__process3_stack_base__) #include "stack-def.h"
#define STACK_SIZE_TTY ((uint32_t)__process3_stack_size__) #define STACK_ADDR_TTY ((uint32_t)process3_base)
#define STACK_SIZE_TTY (sizeof process3_base)
struct tty * struct tty *
tty_open (void) tty_open (void)