system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-28 23:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

winecrt0: Remove some unnecessary asm macros on ARM plaforms.

Browse source
This commit is contained in:
Alexandre Julliard 2024-06-11 10:31:12 +02:00
parent edce2ef692
commit a00b5abc30
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/winecrt0/arm64ec.c
View file

@ -59,17 +59,17 @@ asm( ".section .data,\"drw\"\n"
__ASM_GLOBAL_FUNC( __icall_helper_arm64ec,
"stp fp, lr, [sp, #-0x10]!\n\t"
__ASM_SEH( ".seh_save_fplr_x 16\n\t" )
".seh_save_fplr_x 16\n\t"
"mov fp, sp\n\t"
__ASM_SEH( ".seh_set_fp\n\t" )
__ASM_SEH( ".seh_endprologue\n\t" )
".seh_set_fp\n\t"
".seh_endprologue\n\t"
"adrp x16, __os_arm64x_dispatch_icall\n\t"
"ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t"
"blr x16\n\t"
__ASM_SEH( ".seh_startepilogue\n\t" )
".seh_startepilogue\n\t"
"ldp fp, lr, [sp], #0x10\n\t"
__ASM_SEH( ".seh_save_fplr_x 0x10\n\t" )
__ASM_SEH( ".seh_endepilogue\n\t" )
".seh_save_fplr_x 0x10\n\t"
".seh_endepilogue\n\t"
"br x11" )
asm( "\t.section .rdata,\"dr\"\n"

12
dlls/winecrt0/setjmp.c
View file

@ -67,8 +67,8 @@ int __cdecl __attribute__((naked)) __wine_setjmpex( __wine_jmp_buf *buf, EXCEPTI
"stp d10, d11, [x0, #0xa0]\n\t" /* jmp_buf->Xmm10,Xmm11 */
"stp d12, d13, [x0, #0xc0]\n\t" /* jmp_buf->Xmm12,Xmm13 */
"stp d14, d15, [x0, #0xe0]\n\t" /* jmp_buf->Xmm14,Xmm15 */
"adrp x8, " __ASM_NAME("__os_arm64x_get_x64_information") "\n\t"
"ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_get_x64_information") "]\n\t"
"adrp x8, __os_arm64x_get_x64_information\n\t"
"ldr x8, [x8, :lo12:__os_arm64x_get_x64_information]\n\t"
"add x1, x0, #0x58\n\t" /* jmp_buf->Mxcsr */
"mov x0, #0\n\t"
"blr x8\n\t"
@ -81,8 +81,8 @@ void __cdecl __attribute__((naked)) __wine_longjmp( __wine_jmp_buf *buf, int ret
{
asm( "mov x19, x0\n\t"
"mov x20, x1\n\t"
"adrp x8, " __ASM_NAME("__os_arm64x_set_x64_information") "\n\t"
"ldr x8, [x8, :lo12:" __ASM_NAME("__os_arm64x_set_x64_information") "]\n\t"
"adrp x8, __os_arm64x_set_x64_information\n\t"
"ldr x8, [x8, :lo12:__os_arm64x_set_x64_information]\n\t"
"ldr w1, [x0, #0x58]\n\t" /* jmp_buf->Mxcsr */
"mov x0, #0\n\t"
"blr x8\n\t"
@ -166,12 +166,10 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex,
"stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */
"str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */
"str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */
#ifndef __SOFTFP__
"vmrs r2, fpscr\n\t"
"str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */
"add r0, r0, #0x30\n\t"
"vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */
#endif
"mov r0, #0\n\t"
"bx lr" )
@ -179,12 +177,10 @@ __ASM_GLOBAL_FUNC( __wine_longjmp,
"ldm r0, {r3-r11}\n\t" /* jmp_buf->Frame,R4..R11 */
"ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */
"ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */
#ifndef __SOFTFP__
"ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */
"vmsr fpscr, r3\n\t"
"add r0, r0, #0x30\n\t"
"vldm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */
#endif
"mov r0, r1\n\t" /* retval */
"bx r2" )