From 62cb008dfa3ea503b3159398478bb78c9cf06239 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Fri, 19 Mar 2010 18:08:58 +0000 Subject: Fixed bug 2973365. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1757 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/ports/GCC/ARM7/chcoreasm.s | 4 ++-- readme.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/os/ports/GCC/ARM7/chcoreasm.s b/os/ports/GCC/ARM7/chcoreasm.s index 098faf180..198de687a 100644 --- a/os/ports/GCC/ARM7/chcoreasm.s +++ b/os/ports/GCC/ARM7/chcoreasm.s @@ -106,8 +106,8 @@ _port_switch_thumb: _port_switch_arm: #ifdef CH_CURRP_REGISTER_CACHE stmfd sp!, {r4, r5, r6, r8, r9, r10, r11, lr} - str sp, [r1, #16] - ldr sp, [r0, #16] + str sp, [r1, #12] + ldr sp, [r0, #12] #ifdef THUMB_PRESENT ldmfd sp!, {r4, r5, r6, r8, r9, r10, r11, lr} bx lr diff --git a/readme.txt b/readme.txt index 915f7c498..d7c00dbd5 100644 --- a/readme.txt +++ b/readme.txt @@ -57,6 +57,8 @@ ***************************************************************************** *** 1.5.4 *** +- FIX: Fixed broken CH_CURRP_REGISTER_CACHE option in the ARM7 port (bug + 2973365). - FIX: Fixed missing memory recovery on thread reference release in chRegNextThread() (bug 2971878). - FIX: Fixed wrong thread state macro in STM32/spi_lld.c (bug 2968142). -- cgit v1.2.3