Repository: incubator-mynewt-larva Updated Branches: refs/heads/master 69f4de712 -> f34359789
Merge cortex-m0 Hard Fault handler display fix to m4 Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/f3435978 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/f3435978 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/f3435978 Branch: refs/heads/master Commit: f343597893fbc0248f57079e782bc9ee14c69a5b Parents: 69f4de7 Author: wes3 <w...@micosa.io> Authored: Tue Feb 2 22:21:22 2016 -0800 Committer: wes3 <w...@micosa.io> Committed: Tue Feb 2 22:21:29 2016 -0800 ---------------------------------------------------------------------- libs/os/src/arch/cortex_m0/os_fault.c | 2 +- libs/os/src/arch/cortex_m4/os_fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f3435978/libs/os/src/arch/cortex_m0/os_fault.c ---------------------------------------------------------------------- diff --git a/libs/os/src/arch/cortex_m0/os_fault.c b/libs/os/src/arch/cortex_m0/os_fault.c index c578d69..7906c36 100644 --- a/libs/os/src/arch/cortex_m0/os_fault.c +++ b/libs/os/src/arch/cortex_m0/os_fault.c @@ -61,7 +61,7 @@ struct trap_frame { uint32_t r9; uint32_t r10; uint32_t r11; - uint32_t lr; + uint32_t lr; /* this LR holds EXC_RETURN */ }; void http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/f3435978/libs/os/src/arch/cortex_m4/os_fault.c ---------------------------------------------------------------------- diff --git a/libs/os/src/arch/cortex_m4/os_fault.c b/libs/os/src/arch/cortex_m4/os_fault.c index 63404ad..475c5c2 100644 --- a/libs/os/src/arch/cortex_m4/os_fault.c +++ b/libs/os/src/arch/cortex_m4/os_fault.c @@ -53,7 +53,6 @@ struct exception_frame { struct trap_frame { struct exception_frame *ef; - uint32_t sp; uint32_t r4; uint32_t r5; uint32_t r6; @@ -62,6 +61,7 @@ struct trap_frame { uint32_t r9; uint32_t r10; uint32_t r11; + uint32_t lr; /* this LR holds EXC_RETURN */ }; void
