ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base_hw: Enable ldso test 

Fix #527, fix #350
This commit is contained in:
Martin Stein 2012-11-28 10:23:35 +01:00 committed by Norman Feske
parent 0dbb5e1696
commit 1258126986
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
base-hw/src/platform/crt0.s
View File

@ -1,3 +1,4 @@
/** /**
* \brief Startup code for Genode programs on Cortex A9 * \brief Startup code for Genode programs on Cortex A9
* \author Martin Stein * \author Martin Stein
@ -22,26 +23,28 @@
str r0, [r1] str r0, [r1]
/* call _main routine */ /* call _main routine */
ldr sp, =_main_stack_high ldr sp, =_stack_high
.extern _main .extern _main
bl _main bl _main
1: b 1b 1: b 1b
/* dynamic symbol object handle */ /* dynamic symbol object handle */
.align 3 .p2align 2
.global __dso_handle .global __dso_handle
__dso_handle: .long 0 __dso_handle: .long 0
.section .bss .section .bss
/* main-thread stack */ /* main-thread stack */
.align 3 .p2align 2
.global _stack_low
_stack_low:
.space 64*1024 .space 64*1024
.global _main_stack_high .global _stack_high
_main_stack_high: _stack_high:
/* main-thread UTCB-pointer for the Genode thread-API */ /* main-thread UTCB-pointer for the Genode thread-API */
.align 3 .p2align 2
.global _main_utcb .global _main_utcb
_main_utcb: .long 0 _main_utcb: .long 0

6
os/src/lib/ldso/arm/crt0.s
View File

@ -17,9 +17,13 @@
.globl _start_ldso .globl _start_ldso
_start_ldso: _start_ldso:
ldr r2, .initial_utcb
str r0, [r2]
ldr sp, .initial_sp ldr sp, .initial_sp
bl init_rtld bl init_rtld
b _main b _main
.initial_sp: .word _stack_high .initial_sp: .word _stack_high
.initial_utcb: .word _main_utcb