niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

kernelbase: Implement RaiseException on ARM64EC.

Browse source
This commit is contained in:
Alexandre Julliard 2024-03-01 14:27:32 +01:00
parent f35e2d513d
commit 577c327a44
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
dlls/kernelbase/debug.c
View file

@ -313,7 +313,34 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str )
/*******************************************************************
* RaiseException (kernelbase.@)
*/
#if defined(__x86_64__)
#ifdef __x86_64__
#ifdef __arm64ec__
void __attribute__((naked)) RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args )
{
asm( ".seh_proc RaiseException\n\t"
"stp x29, x30, [sp, #-0xb0]!\n\t"
".seh_save_fplr_x 0xb0\n\t"
".seh_endprologue\n\t"
"and w1, w1, #0x01\n\t" /* EXCEPTION_NONCONTINUABLE */
"stp w0, w1, [sp, #0x10]\n\t" /* ExceptionCode, ExceptionFlags */
"adr x4, RaiseException\n\t"
"stp xzr, x4, [sp, #0x18]\n\t" /* ExceptionRecord, ExceptionAddress */
"mov w5, #0x0f\n\t" /* EXCEPTION_MAXIMUM_PARAMETERS */
"cmp w2, w5\n\t"
"csel w2, w2, w5, lo\n\t"
"str x2, [sp, #0x28]\n\t" /* NumberParameters */
"cbz x3, 1f\n\t"
"lsl w2, w2, #3\n\t"
"add x0, sp, #0x30\n\t" /* ExceptionInformation */
"mov x1, x3\n\t" /* args */
"bl \"#memcpy\"\n"
"1:\tadd x0, sp, #0x10\n\t" /* rec */
"bl \"#RtlRaiseException\"\n\t"
"ldp x29, x30, [sp], #0xb0\n\t"
"ret\n\t"
".seh_endproc" );
}
#else
/* Some DRMs depend on RaiseException not altering non-volatile registers. */
__ASM_GLOBAL_FUNC( RaiseException,
".byte 0x48,0x8d,0xa4,0x24,0x00,0x00,0x00,0x00\n\t" /* hotpatch prolog */
@ -350,14 +377,14 @@ __ASM_GLOBAL_FUNC( RaiseException,
"add $0xc8,%rsp\n\t"
__ASM_CFI(".cfi_adjust_cfa_offset -0xc8\n\t")
"ret" )
#endif /* __arm64ec__ */
C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionCode) == 0 );
C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionFlags) == 4 );
C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionRecord) == 8 );
C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionAddress) == 0x10 );
C_ASSERT( offsetof(EXCEPTION_RECORD, NumberParameters) == 0x18 );
C_ASSERT( offsetof(EXCEPTION_RECORD, ExceptionInformation) == 0x20 );
#else
#else /* __x86_64__ */
void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD count, const ULONG_PTR *args )
{
EXCEPTION_RECORD record;

3
dlls/ntdll/tests/exception.c
View file

@ -5183,7 +5183,8 @@ static void test_raiseexception_regs(void)
++expected;
ok(test_raiseexception_regs_context.Rdi == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rdi);
++expected;
ok(test_raiseexception_regs_context.Rbp == expected, "got %#I64x.\n", test_raiseexception_regs_context.Rbp);
ok(test_raiseexception_regs_context.Rbp == expected || is_arm64ec /* x29 modified by entry thunk */,
"got %#I64x.\n", test_raiseexception_regs_context.Rbp);
++expected;
ok(test_raiseexception_regs_context.R12 == expected, "got %#I64x.\n", test_raiseexception_regs_context.R12);
++expected;