andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #1028. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12775 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2019-05-04 08:25:37 +00:00
parent 99ef5fe0a2
commit b68fc92f0b
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/common/ports/ARMCMx/chcore_v7m.c
View File

@ -116,8 +116,8 @@ void PendSV_Handler(void) {
/* Module exported functions. */ /* Module exported functions. */
/*===========================================================================*/ /*===========================================================================*/
#if (CH_DBG_ENABLE_STACK_CHECK == TRUE) || \ #if ((CH_DBG_ENABLE_STACK_CHECK == TRUE) && \
(PORT_ENABLE_GUARD_PAGES == TRUE) || \ (PORT_ENABLE_GUARD_PAGES == TRUE)) || \
defined(__DOXYGEN__) defined(__DOXYGEN__)
/** /**
* @brief Setting up MPU region for the current thread. * @brief Setting up MPU region for the current thread.

2
os/common/ports/ARMCMx/compilers/GCC/chcoreasm_v7m.S
View File

@ -103,7 +103,7 @@ _port_switch:
.thumb_func .thumb_func
.globl _port_thread_start .globl _port_thread_start
_port_thread_start: _port_thread_start:
#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES #if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
bl _port_set_region bl _port_set_region
#endif #endif
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK

4
os/common/ports/ARMCMx/compilers/IAR/chcoreasm_v7m.s
View File

@ -63,7 +63,7 @@ ICSR_PENDSVSET SET 0x10000000
EXTERN chThdExit EXTERN chThdExit
EXTERN chSchDoReschedule EXTERN chSchDoReschedule
#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES #if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
EXTERN _port_set_region EXTERN _port_set_region
#endif #endif
#if CH_DBG_STATISTICS #if CH_DBG_STATISTICS
@ -109,7 +109,7 @@ _port_switch:
*/ */
PUBLIC _port_thread_start PUBLIC _port_thread_start
_port_thread_start: _port_thread_start:
#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES #if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
bl _port_set_region bl _port_set_region
#endif #endif
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK

4
os/common/ports/ARMCMx/compilers/RVCT/chcoreasm_v7m.s
View File

@ -60,7 +60,7 @@ ICSR_PENDSVSET EQU 0x10000000
IMPORT chThdExit IMPORT chThdExit
IMPORT chSchDoReschedule IMPORT chSchDoReschedule
#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES #if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
IMPORT _port_set_region IMPORT _port_set_region
#endif #endif
#if CH_DBG_STATISTICS #if CH_DBG_STATISTICS
@ -105,7 +105,7 @@ _port_switch PROC
*/ */
EXPORT _port_thread_start EXPORT _port_thread_start
_port_thread_start PROC _port_thread_start PROC
#if CH_DBG_ENABLE_STACK_CHECK || PORT_ENABLE_GUARD_PAGES #if CH_DBG_ENABLE_STACK_CHECK && PORT_ENABLE_GUARD_PAGES
bl _port_set_region bl _port_set_region
#endif #endif
#if CH_DBG_SYSTEM_STATE_CHECK #if CH_DBG_SYSTEM_STATE_CHECK

2
readme.txt
View File

@ -94,6 +94,8 @@
- HAL: Added a new interface for range-finder devices (used by EX). - HAL: Added a new interface for range-finder devices (used by EX).
- HAL: Added mcuconf.h updater tool for STM32F407 (backported to 19.1.1). - HAL: Added mcuconf.h updater tool for STM32F407 (backported to 19.1.1).
- NIL: Integrated NIL 4.0. - NIL: Integrated NIL 4.0.
- FIX: Fixed MPU fix #1027 broke stack checking on Cortex-M devices without
MPU (bug #1028)(backported to 19.1.3)(backported to 18.2.3).
- FIX: Fixed MPU setup missing on thread start (bug #1027) - FIX: Fixed MPU setup missing on thread start (bug #1027)
(backported to 19.1.2)(backported to 18.2.3). (backported to 19.1.2)(backported to 18.2.3).
- FIX: Fixed invalid I2C4 DMAs for STM32F76x (bug #1026) - FIX: Fixed invalid I2C4 DMAs for STM32F76x (bug #1026)