cpu: centralized startup code for cortexm CPUs by haukepetersen · Pull Request #3155 · RIOT-OS/RIOT

haukepetersen · 2015-06-03T10:58:07Z

The startup code and exception handlers for cortexm based CPUs were pretty much identical, so centralizing them makes much sense.

@gebart, @jfischer-phytec-iot: I was not blunt enough to touch the kinetis code (as it still differs quite a bit from how we implemented all other platforms). Would you care to have a look at this as a follow-up?

Note: github does a shitty job on showing the actual diffs here. The changes are not as bad as it seems...

jnohlgard · 2015-06-03T11:41:44Z

cpu/cortexm_common/include/vectors_cortexm.h

s/over writable/overridable/

jnohlgard · 2015-06-03T13:06:31Z

@haukepetersen I will try to port this to k60, and possibly kw2x during next week, if time permits.

haukepetersen · 2015-06-04T09:40:23Z

fixed spelling

jfischer-no · 2015-06-04T12:32:38Z

@haukepetersen @gebart I was so free and have adapted it to kinetis. @haukepetersen Can I open a PR against your Branch?

jfischer-no · 2015-06-04T13:03:15Z

@haukepetersen I was impatient and did it haukepetersen#11. @gebart Can you review and test it on mulle it please?

haukepetersen · 2015-06-04T16:32:44Z

@jfischer-phytec-iot: looking great, merged!

jnohlgard · 2015-06-04T16:39:02Z

I get a hard fault at the end of pre_startup on k60. The return pointer gets overwritten by the canary value and popped. ~~The original implementation inlined the call so that there was no pop $pc~~

Edit: The old implementation was a noreturn and jumped to the reset handler after pre_reset

jnohlgard · 2015-06-04T16:47:04Z

You could delete the stack canary filling, or move it to Cortex M common.

The purpose of it is to fill the ISR stack with a known value so that we can measure ISR stack usage by looking through the memory.

jfischer-no · 2015-06-04T19:26:20Z

Damn, I miss it, of course it raises hardfault.

jfischer-no · 2015-06-04T22:43:51Z

@gebart @haukepetersen corrected: haukepetersen#12

jnohlgard · 2015-06-04T22:55:18Z

I'm on mobile so I can't comment inline. Looks good, I don't think you need to keep the estack extern in the k60 file though.

haukepetersen · 2015-06-05T09:16:09Z

@jfischer-phytec-iot: I merged your fix without really looking into it too much. I will look over this complete PR in detail once more on Monday.

haukepetersen · 2015-06-12T15:34:30Z

Ok, as far as I see it, the changes look good and this PR should be ready for merge. Should I squash and start Travis?

jfischer-no · 2015-06-12T16:30:37Z

@haukepetersen do it :-)

haukepetersen · 2015-06-12T16:49:05Z

did, ready for Travis :-)

jnohlgard · 2015-06-13T13:56:31Z

cpu/cortexm_common/vectors_cortexm.c:74: trailing whitespace.
ERROR: This change introduces new whitespace errors

haukepetersen · 2015-06-14T11:04:06Z

fixed whitespace issue and rebased.

jfischer-no · 2015-06-15T11:25:44Z

I guess we can merge it ...

haukepetersen · 2015-06-15T12:03:26Z

just needs a little rebase as #3095 was finally merged. Doing this now.

haukepetersen · 2015-06-15T12:17:44Z

rebased, hopefully I didn't break anything... So lets wait for Travis again and merge once he is happy?

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

- make use of common cortexm isr vectors - use common cortexm startup code - renamed startup.c to vectors.c

jfischer-no · 2015-06-16T21:24:19Z

Travis happy, go

haukepetersen · 2015-06-16T22:01:52Z

yeah!

cpu: centralized startup code for cortexm CPUs

haukepetersen assigned kaspar030 Jun 3, 2015

haukepetersen added this to the Release 2015.06 milestone Jun 3, 2015

haukepetersen mentioned this pull request Jun 3, 2015

cpu/samd21: fixed and cleaned up startup.c #3082

Closed

jnohlgard reviewed Jun 3, 2015
View reviewed changes

cpu/cortexm_common/include/vectors_cortexm.h Outdated

Copy link
Copy Markdown

Member

jnohlgard Jun 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/over writable/overridable/

haukepetersen mentioned this pull request Jun 5, 2015

Support for Freescale K64F MCU and FRDM-K64F Board #3126

Merged

haukepetersen force-pushed the opt_cortex_startup branch from 9d74407 to 07dcc4d Compare June 12, 2015 16:48

haukepetersen added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jun 12, 2015

haukepetersen force-pushed the opt_cortex_startup branch from 07dcc4d to 1ea00d1 Compare June 14, 2015 11:03

haukepetersen force-pushed the opt_cortex_startup branch from 1ea00d1 to a723951 Compare June 15, 2015 12:17

haukepetersen force-pushed the opt_cortex_startup branch from a723951 to 88130fc Compare June 15, 2015 13:59

haukepetersen added 16 commits June 15, 2015 16:00

cpu/cortexm: unified startup code and isr handlers

c286da8

cpu/make.cortexm: s/startup.o/vectors.o/

4b65a07

cpu/cc2538: optimization of startup code

3707885

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/nrf51822: optimization of startup code

db1ee85

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/sam3x8e: optimization of startup code

4ccbeeb

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/samd21: optimization of startup code

e8dd6af

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/saml21: optimization of startup code

aa583f2

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/stm32f0: optimization of startup code

f30b7bf

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/stm32l1: optimization of startup code

38d38f6

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/stm32f1: optimization of startup code

5eb9b73

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/stm32f3: optimization of startup code

bdb708a

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/stm32f4: optimization of startup code

d7e27c6

- make use of common startup code - make use of common exception handlers - renamed startup.c to vectors.c

cpu/lpc1768: optimized startup code

983e8ab

- make use of common cortexm isr vectors - use common cortexm startup code - renamed startup.c to vectors.c

cpu/k60: optimization of startup code

8db0a57

cpu/kinetis_common: optimization of startup code

253e7ce

cpu/kw2x: optimization of startup code

88130fc

haukepetersen added a commit that referenced this pull request Jun 16, 2015

Merge pull request #3155 from haukepetersen/opt_cortex_startup

765c013

cpu: centralized startup code for cortexm CPUs

haukepetersen merged commit 765c013 into RIOT-OS:master Jun 16, 2015

haukepetersen deleted the opt_cortex_startup branch June 16, 2015 22:01

Conversation

haukepetersen commented Jun 3, 2015

Uh oh!

jnohlgard Jun 3, 2015

Choose a reason for hiding this comment

Uh oh!

jnohlgard commented Jun 3, 2015

Uh oh!

haukepetersen commented Jun 4, 2015

Uh oh!

jfischer-no commented Jun 4, 2015

Uh oh!

jfischer-no commented Jun 4, 2015

Uh oh!

haukepetersen commented Jun 4, 2015

Uh oh!

jnohlgard commented Jun 4, 2015

Uh oh!

jnohlgard commented Jun 4, 2015

Uh oh!

jfischer-no commented Jun 4, 2015

Uh oh!

jfischer-no commented Jun 4, 2015

Uh oh!

jnohlgard commented Jun 4, 2015 via email

Uh oh!

haukepetersen commented Jun 5, 2015

Uh oh!

haukepetersen commented Jun 12, 2015

Uh oh!

jfischer-no commented Jun 12, 2015

Uh oh!

haukepetersen commented Jun 12, 2015

Uh oh!

jnohlgard commented Jun 13, 2015

Uh oh!

haukepetersen commented Jun 14, 2015

Uh oh!

jfischer-no commented Jun 15, 2015

Uh oh!

haukepetersen commented Jun 15, 2015

Uh oh!

haukepetersen commented Jun 15, 2015

Uh oh!

jfischer-no commented Jun 16, 2015

Uh oh!

haukepetersen commented Jun 16, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants