November 2021 - Wine-Commits

Martin Storsjö : ntdll: Implement stack unwinding on arm.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: bdb3608811808e41c505c46d8397ee0101779eb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb3608811808e41c505c46d… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:52 2021 +0200 ntdll: Implement stack unwinding on arm. This is a very close copy of the arm64 implementation. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 4 +- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 4 +- dlls/kernel32/kernel32.spec | 4 +- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_arm.c | 599 ++++++++++++++++++--- dlls/ntdll/unix/signal_arm.c | 107 +++- 6 files changed, 641 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bdb3608811808e41c505…

1 0

Martin Storsjö : ntdll: Save context->Lr in the arm version of RtlRaiseException.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 611911ca05e5f29f7f2bf45f8144bcd89e77136f URL: https://source.winehq.org/git/wine.git/?a=commit;h=611911ca05e5f29f7f2bf45f… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:49 2021 +0200 ntdll: Save context->Lr in the arm version of RtlRaiseException. RtlCaptureContext doesn't set context->Lr, which is needed for being able to unwind from the context. This matches what is done in the arm64 version. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 27e27deabfe..3bf8e19e126 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -811,6 +811,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "bl " __ASM_NAME("RtlCaptureContext") "\n\t" "ldr r0, [sp, #0x1a0]\n\t" /* rec */ "ldr r1, [sp, #0x1a4]\n\t" + "str r1, [sp, #0x3c]\n\t" /* context->Lr */ "str r1, [sp, #0x40]\n\t" /* context->Pc */ "mrs r2, CPSR\n\t" "bfi r2, r1, #5, #1\n\t" /* Thumb bit */

1 0

Martin Storsjö : winedump: Distinguish between 16 and 32 bit nop opcodes in ARM unwind data.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 22d2b61a646eda01945b9c282a1cb9b1ea13e968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d2b61a646eda01945b9c28… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:45 2021 +0200 winedump: Distinguish between 16 and 32 bit nop opcodes in ARM unwind data. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4629c3082f9..5d325fba3da 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1171,13 +1171,20 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) excode = (code << 24) | (excodes[0] << 16) | (excodes[1] << 8) | excodes[2]; printf( "%s sp, sp, #%u\n", inepilogue ? "add" : "sub", (excode & 0xffffff) * 4 ); } - else if (code <= 0xfc) + else if (code <= 0xfb) printf( "nop\n" ); - else if (code <= 0xfe) + else if (code <= 0xfc) + printf( "nop.w\n" ); + else if (code <= 0xfd) { printf( "(end) nop\n" ); inepilogue = TRUE; } + else if (code <= 0xfe) + { + printf( "(end) nop.w\n" ); + inepilogue = TRUE; + } else { printf( "end\n" );

1 0

Martin Storsjö : ntdll: Fix arm call_user_exception_dispatcher with kernel stack for syscalls.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 324150c0ae0247a2a2ea72025dfff79bec5725cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=324150c0ae0247a2a2ea7202… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:48 2021 +0200 ntdll: Fix arm call_user_exception_dispatcher with kernel stack for syscalls. This does the same as 23b44e8df62847872d036cd88d72e36b5424ee35, but for arm: Don't call KiUserExceptionDispatcher directly on the stack pointer stored in the CONTEXT, but use the one stored in syscall_frame (which includes the stack allocation in e.g. RtlRaiseException). Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 798d7b9cc87..88718e938a8 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -563,12 +563,16 @@ void call_raise_user_exception_dispatcher(void) NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context ) { struct syscall_frame *frame = arm_thread_data()->syscall_frame; + DWORD lr = frame->lr; + DWORD sp = frame->sp; NTSTATUS status = NtSetContextThread( GetCurrentThread(), context ); if (status) return status; frame->r0 = (DWORD)rec; frame->r1 = (DWORD)context; frame->pc = (DWORD)pKiUserExceptionDispatcher; + frame->lr = lr; + frame->sp = sp; frame->restore_flags |= CONTEXT_INTEGER | CONTEXT_CONTROL; return status; }

1 0

Martin Storsjö : ntdll: Remove stack gap in syscalls on arm.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 77e90954357301cbb3242940556fa8b37677ae1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e90954357301cbb3242940… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:51 2021 +0200 ntdll: Remove stack gap in syscalls on arm. Store the original stack pointer (on entry to the syscall dispatcher) in syscall_frame; the stack pointer itself is incremented by "pop {r0-r3}" right before calling the syscall itself. This fixes unwinding from functions set up by syscalls, like KiUserExceptionDispatcher. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 4 +++- tools/winebuild/import.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 88718e938a8..1cc34a9218e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1041,7 +1041,8 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldr r1, [r1, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ "add r0, r1, #0x10\n\t" "stm r0, {r4-r12,lr}\n\t" - "str sp, [r1, #0x38]\n\t" + "add r2, sp, #0x10\n\t" + "str r2, [r1, #0x38]\n\t" "str r3, [r1, #0x3c]\n\t" "mrs r0, CPSR\n\t" "bfi r0, lr, #5, #1\n\t" /* set thumb bit */ @@ -1099,6 +1100,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "ldm r8, {r4-r12,pc}\n" "5:\tmovw r0, #0x000d\n\t" /* STATUS_INVALID_PARAMETER */ "movt r0, #0xc000\n\t" + "add sp, sp, #0x10\n\t" "b 4b\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" "mov r8, r0\n\t" diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 104397716f1..7972fc7b1d9 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1492,7 +1492,6 @@ void output_syscalls( DLLSPEC *spec ) output( "\tmovw ip, #%u\n", id ); output( "\tmov r3, lr\n" ); output( "\tbl %s\n", asm_name("__wine_syscall") ); - output( "\tadd sp, #16\n" ); output( "\tbx lr\n" ); break; case CPU_ARM64:

1 0

Martin Storsjö : ucrtbase: Hook up __intrinsic_setjmpex for arm.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 6e07635ef88835c7a43dad54f29db199d9614a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e07635ef88835c7a43dad54… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:54 2021 +0200 ucrtbase: Hook up __intrinsic_setjmpex for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 3366a435966..4fa47035afe 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -40,7 +40,7 @@ @ stub __dcrt_initial_narrow_environment @ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=x86_64,arm,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stdcall -arch=arm __jump_unwind(ptr ptr) ucrtbase.__jump_unwind @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 831bff9eee1..1838f31d515 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=x86_64,arm,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 7bbb37afcec..074578efe99 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ cdecl __current_exception() ucrtbase.__current_exception @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=x86_64,arm,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ stdcall -arch=arm __jump_unwind(ptr ptr) ucrtbase.__jump_unwind @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure

1 0

Martin Storsjö : ntdll: Implement __C_specific_handler and __jump_unwind for arm.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: 3ef9a04f9181fb7d28832c60b5439337460005b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ef9a04f9181fb7d28832c60… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:53 2021 +0200 ntdll: Implement __C_specific_handler and __jump_unwind for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 3 +- dlls/ntdll/ntdll.spec | 3 +- dlls/ntdll/signal_arm.c | 145 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 3 +- dlls/vcruntime140/vcruntime140.spec | 3 +- 5 files changed, 153 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ef9a04f9181fb7d2883…

1 0

Martin Storsjö : ntdll: Include d0-d15 in RtlCaptureContext.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: b2934dd98fb46fcbcb57f4bb6508d962ba3331e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2934dd98fb46fcbcb57f4bb… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:50 2021 +0200 ntdll: Include d0-d15 in RtlCaptureContext. We ideally should back up all of d0-d31, but when building in ELF form, only d0-d15 are normally available (with common distributions' default compilers), unless object files are built with flags to enable support for d16-d31 (with e.g. -mfpu=neon). Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 3bf8e19e126..a1a732201cf 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -75,6 +75,10 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, "str r1, [r0, #0x3c]\n\t" /* context->Lr */ "add r0, #0x0c\n\t" "stm r0, {r2-r12}\n\t" /* context->R2..R12 */ +#ifndef __SOFTFP__ + "add r0, #0x44\n\t" /* 0x50 - 0x0c */ + "vstm r0, {d0-d15}\n\t" /* context->D0-D15 */ +#endif "bx lr" )

1 0

Martin Storsjö : winedump: Rewrite dumping of packed ARM unwind info.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: aa256deedd02662d72ad563e9d29d16714543bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa256deedd02662d72ad563e… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:47 2021 +0200 winedump: Rewrite dumping of packed ARM unwind info. This differs slightly from the official docs (which is clear in some places, vague in others, and contradictory in some places), based on actual observed behaviour. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 146 +++++++++++++++++++++------------------------------- 1 file changed, 58 insertions(+), 88 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 43ba0618615..6ff14f95791 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -787,7 +787,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.Flag) { char intregs[32] = {0}, intregspop[32] = {0}, vfpregs[32] = {0}; - WORD pf = 0, ef = 0, sc = 0; + WORD pf = 0, ef = 0, fpoffset = 0, stack = fnc->u.s.StackAdjust; printf( "\nFunction %08x-%08x:\n", fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + fnc->u.s.FunctionLength * 2 ); @@ -805,86 +805,60 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { pf = fnc->u.s.StackAdjust & 0x04; ef = fnc->u.s.StackAdjust & 0x08; + stack = (fnc->u.s.StackAdjust & 3) + 1; } - if (!fnc->u.s.R && !pf) + if (!fnc->u.s.R || pf) { - if (fnc->u.s.Reg) + int first = 4, last = fnc->u.s.Reg + 4; + if (pf) { - sprintf(intregs, "r4-r%u", fnc->u.s.Reg + 4); - sprintf(intregspop, "r4-r%u", fnc->u.s.Reg + 4); + first = (~fnc->u.s.StackAdjust) & 3; + if (fnc->u.s.R) + last = 3; } + if (first == last) + sprintf(intregs, "r%u", first); else - { - strcpy(intregs, "r4"); - strcpy(intregspop, "r4"); - } - sc = fnc->u.s.Reg + 1; - if (fnc->u.s.C || fnc->u.s.L) - { - strcat(intregs, ", "); - if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) - strcat(intregspop, ", "); - } + sprintf(intregs, "r%u-r%u", first, last); + fpoffset = last + 1 - first; } - else if (fnc->u.s.R && pf) + + if (!fnc->u.s.R || ef) { - if (((~fnc->u.s.StackAdjust) & 3) != 3) + int first = 4, last = fnc->u.s.Reg + 4; + if (ef) { - sprintf(intregs, "r%u-r3", (~fnc->u.s.StackAdjust) & 3); - sprintf(intregspop, "r%u-r3", (~fnc->u.s.StackAdjust) & 3); + first = (~fnc->u.s.StackAdjust) & 3; + if (fnc->u.s.R) + last = 3; } + if (first == last) + sprintf(intregspop, "r%u", first); else - { - sprintf(intregs, "r3"); - sprintf(intregspop, "r3"); - } - sc = 4 - ((~fnc->u.s.StackAdjust) & 3); - if (fnc->u.s.C || fnc->u.s.L) - { - strcat(intregs, ", "); - if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) - strcat(intregspop, ", "); - } - } - else if (!fnc->u.s.R && pf) - { - sprintf(intregs, "r%u-r%u", (~fnc->u.s.StackAdjust) & 3, fnc->u.s.Reg + 4); - sprintf(intregspop, "r%u-r%u", (~fnc->u.s.StackAdjust) & 3, fnc->u.s.Reg + 4); - sc = fnc->u.s.Reg + 5 - ((~fnc->u.s.StackAdjust) & 3); - if (fnc->u.s.C || fnc->u.s.L) - { - strcat(intregs, ", "); - if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) - strcat(intregspop, ", "); - } - } - else if (fnc->u.s.R && !pf) - { - if (!fnc->u.s.C && !fnc->u.s.L) - { - strcpy(intregs, "none"); - strcpy(intregspop, "none"); - } + sprintf(intregspop, "r%u-r%u", first, last); } - if (fnc->u.s.C && !fnc->u.s.L) + if (fnc->u.s.C) { + if (intregs[0]) + strcat(intregs, ", "); + if (intregspop[0]) + strcat(intregspop, ", "); strcat(intregs, "r11"); strcat(intregspop, "r11"); } - else if (fnc->u.s.C && fnc->u.s.L) - { - strcat(intregs, "r11, lr"); - if (fnc->u.s.H) - strcat(intregspop, "r11"); - else - strcat(intregspop, "r11, pc"); - } - else if (!fnc->u.s.C && fnc->u.s.L) + if (fnc->u.s.L) { + if (intregs[0]) + strcat(intregs, ", "); strcat(intregs, "lr"); - if (!fnc->u.s.H) + + if (intregspop[0] && (fnc->u.s.Ret != 0 || !fnc->u.s.H)) + strcat(intregspop, ", "); + if (fnc->u.s.Ret != 0) + strcat(intregspop, "lr"); + else if (!fnc->u.s.H) strcat(intregspop, "pc"); } @@ -895,46 +869,42 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) else strcpy(vfpregs, "d8"); } - else - strcpy(vfpregs, "none"); - if (fnc->u.s.H) - printf( " Unwind Code\tpush {r0-r3}\n" ); + if (fnc->u.s.Flag == 1) { + if (fnc->u.s.H) + printf( " Unwind Code\tpush {r0-r3}\n" ); - if (fnc->u.s.R || fnc->u.s.L || fnc->u.s.C || pf) - printf( " Unwind Code\tpush {%s}\n", intregs ); + if (intregs[0]) + printf( " Unwind Code\tpush {%s}\n", intregs ); - if (fnc->u.s.C && fnc->u.s.R && !fnc->u.s.L && !pf) - printf( " Unwind Code\tmov r11, sp\n" ); - else if (fnc->u.s.C && (!fnc->u.s.R || fnc->u.s.L || pf)) - { - if (fnc->u.s.StackAdjust >= 0x03f4 && !sc) - printf( " Unwind Code\tadd r11, sp, #<unknown>\n"); - else if (fnc->u.s.StackAdjust >= 0x03f4) - printf( " Unwind Code\tadd r11, sp, #%d\n", sc * 4 ); - else - printf( " Unwind Code\tadd r11, sp, #%d\n", fnc->u.s.StackAdjust * 4 ); - } + if (fnc->u.s.C && fpoffset == 0) + printf( " Unwind Code\tmov r11, sp\n" ); + else if (fnc->u.s.C) + printf( " Unwind Code\tadd r11, sp, #%d\n", fpoffset * 4 ); - if (fnc->u.s.R && fnc->u.s.Reg != 0x07) - printf( " Unwind Code\tvpush {%s}\n", vfpregs ); + if (fnc->u.s.R && fnc->u.s.Reg != 0x07) + printf( " Unwind Code\tvpush {%s}\n", vfpregs ); - if (fnc->u.s.StackAdjust < 0x03f4 && !pf) - printf( " Unwind Code\tsub sp, sp, #%d\n", fnc->u.s.StackAdjust * 4 ); + if (stack && !pf) + printf( " Unwind Code\tsub sp, sp, #%d\n", stack * 4 ); + } + if (fnc->u.s.Ret == 3) + return; + printf( "Epilogue:\n" ); - if (fnc->u.s.StackAdjust < 0x03f4 && !ef) - printf( " Unwind Code\tadd sp, sp, #%d\n", fnc->u.s.StackAdjust * 4 ); + if (stack && !ef) + printf( " Unwind Code\tadd sp, sp, #%d\n", stack * 4 ); if (fnc->u.s.R && fnc->u.s.Reg != 0x07) printf( " Unwind Code\tvpop {%s}\n", vfpregs ); - if (fnc->u.s.C || !fnc->u.s.R || ef || (fnc->u.s.L && !fnc->u.s.H)) + if (intregspop[0]) printf( " Unwind Code\tpop {%s}\n", intregspop ); - if (fnc->u.s.H && !fnc->u.s.L) + if (fnc->u.s.H && !(fnc->u.s.L && fnc->u.s.Ret == 0)) printf( " Unwind Code\tadd sp, sp, #16\n" ); - else if (fnc->u.s.H && fnc->u.s.L) + else if (fnc->u.s.H && (fnc->u.s.L && fnc->u.s.Ret == 0)) printf( " Unwind Code\tldr pc, [sp], #20\n" ); if (fnc->u.s.Ret == 1)

1 0

Martin Storsjö : winedump: Fix printing of the prologue version of the "ldr lr, [sp], #offset" opcode.
by Alexandre Julliard Nov. 9, 2021

Nov. 9, 2021

Module: wine Branch: master Commit: ae7979a42d418908f1f37d689a2274a71d82b215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae7979a42d418908f1f37d68… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Nov 9 16:05:46 2021 +0200 winedump: Fix printing of the prologue version of the "ldr lr, [sp], #offset" opcode. This isn't mentioned in the documentation (which only writes out the instruction that is executed while unwinding, i.e. the mirror form of it), but a prologue version of this instruction would look like this. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 5d325fba3da..43ba0618615 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1113,7 +1113,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (inepilogue) printf( "ldr lr, [sp], #%u\n", (excode & 0x0f) * 4 ); else - printf( "unknown 32\n" ); + printf( "str lr, [sp, #-%u]!\n", (excode & 0x0f) * 4 ); } else printf( "unknown 32\n" );

1 0