Cleanup interworking code.
git-svn-id: https://svn.code.sf.net/p/chibios/svn2/trunk@11576 110e8d01-0319-4d1e-a829-52ad28d1bb01
This commit is contained in:
parent
d7cd428306
commit
fd8f628711
|
@ -87,17 +87,7 @@ Reset_Handler:
|
||||||
/*
|
/*
|
||||||
* Early initialization.
|
* Early initialization.
|
||||||
*/
|
*/
|
||||||
#if !defined(THUMB_NO_INTERWORKING)
|
|
||||||
bl __early_init
|
bl __early_init
|
||||||
#else /* defined(THUMB_NO_INTERWORKING) */
|
|
||||||
add r0, pc, #1
|
|
||||||
bx r0
|
|
||||||
.code 16
|
|
||||||
bl __early_init
|
|
||||||
mov r0, pc
|
|
||||||
bx r0
|
|
||||||
.code 32
|
|
||||||
#endif /* defined(THUMB_NO_INTERWORKING) */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Data initialization.
|
* Data initialization.
|
||||||
|
@ -125,34 +115,13 @@ bssloop:
|
||||||
/*
|
/*
|
||||||
* Late initialization.
|
* Late initialization.
|
||||||
*/
|
*/
|
||||||
#if !defined(THUMB_NO_INTERWORKING)
|
|
||||||
bl __core_init
|
bl __core_init
|
||||||
bl __late_init
|
bl __late_init
|
||||||
#else /* defined(THUMB_NO_INTERWORKING) */
|
|
||||||
add r0, pc, #1
|
|
||||||
bx r0
|
|
||||||
.code 16
|
|
||||||
bl __late_init
|
|
||||||
mov r0, pc
|
|
||||||
bx r0
|
|
||||||
.code 32
|
|
||||||
#endif /* defined(THUMB_NO_INTERWORKING) */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Main program invocation.
|
* Main program invocation.
|
||||||
*/
|
*/
|
||||||
#if defined(THUMB_NO_INTERWORKING)
|
|
||||||
add r0, pc, #1
|
|
||||||
bx r0
|
|
||||||
.code 16
|
|
||||||
bl main
|
|
||||||
ldr r1, =__default_exit
|
|
||||||
bx r1
|
|
||||||
.code 32
|
|
||||||
#else /* !defined(THUMB_NO_INTERWORKING) */
|
|
||||||
bl main
|
bl main
|
||||||
b __default_exit
|
b __default_exit
|
||||||
#endif /* !defined(THUMB_NO_INTERWORKING) */
|
|
||||||
|
|
||||||
#endif /* !defined(__DOXYGEN__) */
|
#endif /* !defined(__DOXYGEN__) */
|
||||||
|
|
||||||
|
|
|
@ -41,3 +41,6 @@ REGION_ALIAS("DATA_RAM", ram0);
|
||||||
REGION_ALIAS("BSS_RAM", ram0);
|
REGION_ALIAS("BSS_RAM", ram0);
|
||||||
|
|
||||||
INCLUDE rules.ld
|
INCLUDE rules.ld
|
||||||
|
|
||||||
|
ENTRY(Boot_Handler);
|
||||||
|
|
||||||
|
|
|
@ -41,3 +41,6 @@ REGION_ALIAS("DATA_RAM", ram0);
|
||||||
REGION_ALIAS("BSS_RAM", ram0);
|
REGION_ALIAS("BSS_RAM", ram0);
|
||||||
|
|
||||||
INCLUDE rules.ld
|
INCLUDE rules.ld
|
||||||
|
|
||||||
|
ENTRY(Boot_Handler);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue