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

lx_kit: update 'arch_execute()' functions based on libc

Browse Source 
This ensures proper stack alignment for FPU instructions on x86_64.

Fixes #3356
This commit is contained in:
Christian Prochaska 2019-04-15 14:15:52 +02:00 committed by Christian Helmuth
parent c2c33d6808
commit c7d9df6350
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/dde_linux/src/include/spec/arm/lx_kit/internal/arch_execute.h
View File

@ -34,6 +34,7 @@ void arch_execute(void *sp, void *func, void *arg)
{ {
asm volatile ("mov r0, %2;" /* set arg */ asm volatile ("mov r0, %2;" /* set arg */
"mov sp, %0;" /* set stack */ "mov sp, %0;" /* set stack */
"mov fp, #0;" /* clear frame pointer */
"mov pc, %1;" /* call func */ "mov pc, %1;" /* call func */
"" ""
: : "r"(sp), "r"(func), "r"(arg) : "r0"); : : "r"(sp), "r"(func), "r"(arg) : "r0");

1
repos/dde_linux/src/include/spec/x86_32/lx_kit/internal/arch_execute.h
View File

@ -35,6 +35,7 @@ void arch_execute(void *sp, void *func, void *arg)
asm volatile ("movl %2, 0(%0);" asm volatile ("movl %2, 0(%0);"
"movl %1, -0x4(%0);" "movl %1, -0x4(%0);"
"movl %0, %%esp;" "movl %0, %%esp;"
"xorl %%ebp, %%ebp;" /* clear frame pointer */
"call *-4(%%esp);" "call *-4(%%esp);"
: : "r" (sp), "r" (func), "r" (arg)); : : "r" (sp), "r" (func), "r" (arg));
} }

14
repos/dde_linux/src/include/spec/x86_64/lx_kit/internal/arch_execute.h
View File

@ -33,11 +33,15 @@ extern "C" {
static inline static inline
void arch_execute(void *sp, void *func, void *arg) void arch_execute(void *sp, void *func, void *arg)
{ {
asm volatile ("movq %2, %%rdi;" asm volatile ("movq %0, %%rsp;" /* load stack pointer */
"movq %1, 0(%0);" "movq %%rsp, %%rbp;" /* caller stack frame (for GDB debugging) */
"movq %0, %%rsp;" "movq %0, -8(%%rbp);"
"call *0(%%rsp);" "movq %1, -16(%%rbp);"
: "+r" (sp), "+r" (func), "+r" (arg) : : "memory"); "movq %2, -24(%%rbp);"
"sub $24, %%rsp;" /* adjust to next stack frame */
"movq %2, %%rdi;" /* 1st argument */
"call *-16(%%rbp);" /* call func */
: : "r" (sp), "r" (func), "r" (arg));
} }
#endif /* _ARCH_EXECUTE_H_ */ #endif /* _ARCH_EXECUTE_H_ */