Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 12/14: [NTOS] Fix unwinding through KiThreadStartup

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e923912f946b729bfa015… commit e923912f946b729bfa01515ab40bce01d9b54431 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 09:30:49 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [NTOS] Fix unwinding through KiThreadStartup --- ntoskrnl/ke/amd64/ctxswitch.S | 57 +++++++++++++++++++++++++++++++------------ ntoskrnl/ke/amd64/thrdini.c | 15 +++++++++--- ntoskrnl/ke/amd64/trap.S | 19 +++++++++++---- 3 files changed, 67 insertions(+), 24 deletions(-) diff --git a/ntoskrnl/ke/amd64/ctxswitch.S b/ntoskrnl/ke/amd64/ctxswitch.S index 17a87e7c023..829026ce49c 100644 --- a/ntoskrnl/ke/amd64/ctxswitch.S +++ b/ntoskrnl/ke/amd64/ctxswitch.S @@ -10,6 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ksamd64.inc> +#include <trapamd64.inc> /* * BOOLEAN @@ -70,10 +71,7 @@ PUBLIC KiThreadStartup * mov [rsp + SfP3Home], r8 * mov [rsp + SfP4Home], r9 */ - - /* Terminate the unwind chain, by setting rbp as frame pointer, - which contains 0 */ - .setframe rbp, 0 + .allocstack (5 * 8) .endprolog /* Clear all the non-volatile registers, so the thread won't be tempted to @@ -101,21 +99,50 @@ PUBLIC KiThreadStartup mov r8, [rsp + SfP3Home] /* ? */ call qword ptr [rsp + SfP4Home] /* SystemRoutine */ - /* The thread returned. If it was a user-thread, we have a return address - and all is well, otherwise this is very bad. */ - mov rcx, [rsp + SfReturn] - or rcx, rcx - jnz .leave + /* Return to the exit code */ + add rsp, 5 * 8 + ret +.ENDP + +PUBLIC KiInvalidSystemThreadStartupExit +.PROC KiInvalidSystemThreadStartupExit + .endprolog + + /* This is invalid! */ + int HEX(2C) + nop +.ENDP + +PUBLIC KiUserThreadStartupExit +.PROC KiUserThreadStartupExit + .allocstack (KEXCEPTION_FRAME_LENGTH - 8) + .savereg rbp, ExRbp + .savereg rbx, ExRbx + .savereg rdi, ExRdi + .savereg rsi, ExRsi + .savereg r12, ExR12 + .savereg r13, ExR13 + .savereg r14, ExR14 + .savereg r15, ExR15 + .savexmm128 xmm6, ExXmm6 + .savexmm128 xmm7, ExXmm7 + .savexmm128 xmm8, ExXmm8 + .savexmm128 xmm9, ExXmm9 + .savexmm128 xmm10, ExXmm10 + .savexmm128 xmm11, ExXmm11 + .savexmm128 xmm12, ExXmm12 + .savexmm128 xmm13, ExXmm13 + .savexmm128 xmm14, ExXmm14 + .savexmm128 xmm15, ExXmm15 + .endprolog - /* A system thread returned...this is very bad! */ - int 3 + /* Restore the exception frame */ + RESTORE_EXCEPTION_STATE -.leave: - /* It was a user thread, set our trapframe for the System Call Exit Dispatcher */ - lea rcx, [rsp + 6 * 8 + KEXCEPTION_FRAME_LENGTH] + /* Point rcx to the trap frame */ + lea rcx, [rsp + 8] /* Return to the trap exit code */ - add rsp, 5 * 8 ret .ENDP diff --git a/ntoskrnl/ke/amd64/thrdini.c b/ntoskrnl/ke/amd64/thrdini.c index 044ac7c6396..b2119c6e8a3 100644 --- a/ntoskrnl/ke/amd64/thrdini.c +++ b/ntoskrnl/ke/amd64/thrdini.c @@ -13,6 +13,10 @@ #define NDEBUG #include <debug.h> +extern void KiInvalidSystemThreadStartupExit(void); +extern void KiUserThreadStartupExit(void); +extern void KiServiceExit3(void); + typedef struct _KUINIT_FRAME { KSWITCH_FRAME CtxSwitchFrame; @@ -98,8 +102,11 @@ KiInitializeContextThread(IN PKTHREAD Thread, /* Terminate the Exception Handler List */ TrapFrame->ExceptionFrame = 0; - /* We return to ... */ - StartFrame->Return = (ULONG64)KiServiceExit2; + /* KiThreadStartup returns to KiUserThreadStartupExit */ + StartFrame->Return = (ULONG64)KiUserThreadStartupExit; + + /* KiUserThreadStartupExit returns to KiServiceExit3 */ + InitFrame->ExceptionFrame.Return = (ULONG64)KiServiceExit3; } else { @@ -121,8 +128,8 @@ KiInitializeContextThread(IN PKTHREAD Thread, /* No NPX State */ Thread->NpxState = 0xA; - /* We have no return address! */ - StartFrame->Return = 0; + /* This must never return! */ + StartFrame->Return = (ULONG64)KiInvalidSystemThreadStartupExit; } /* Set up the Context Switch Frame */ diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 63dacf8166b..3e13d2b5eb4 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -930,16 +930,27 @@ PUBLIC KiServiceExit2 .PROC KiServiceExit2 .ENDPROLOG + // FIXME: this should probably also restore an exception frame + + mov rsp, rcx +.ENDP + +PUBLIC KiServiceExit3 +.PROC KiServiceExit3 + .PUSHFRAME + .ALLOCSTACK (KTRAP_FRAME_LENGTH - MachineFrameLength) + .ENDPROLOG + #if DBG /* Get the current IRQL and compare it to the trap frame */ mov rax, cr8 - cmp byte ptr [rcx + KTRAP_FRAME_PreviousIrql], al + cmp byte ptr [rsp + KTRAP_FRAME_PreviousIrql], al je KiServiceExit2_ok1 int HEX(2C) KiServiceExit2_ok1: /* Check if this is a user mode exit */ - mov ah, byte ptr [rcx + KTRAP_FRAME_SegCs] + mov ah, byte ptr [rsp + KTRAP_FRAME_SegCs] test ah, 1 jz KiServiceExit2_kernel @@ -951,10 +962,8 @@ KiServiceExit2_ok1: KiServiceExit2_kernel: #endif - mov rbp, rcx - mov rsp, rcx - /* Return */ + mov rbp, rsp ExitTrap TF_SAVE_ALL .ENDP

2 years, 1 month

[reactos] 11/14: [RTL] Implement RtlUnwind

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66aa25b1cdaf6d1d82fb3… commit 66aa25b1cdaf6d1d82fb31c3845134ab3e6e87e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 22 08:43:47 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Implement RtlUnwind --- sdk/lib/rtl/amd64/unwind.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index f4c811defee..dec55f7d3a5 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -911,13 +911,19 @@ RtlUnwindEx( VOID NTAPI RtlUnwind( - IN PVOID TargetFrame, - IN PVOID TargetIp, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PVOID ReturnValue) + _In_opt_ PVOID TargetFrame, + _In_opt_ PVOID TargetIp, + _In_opt_ PEXCEPTION_RECORD ExceptionRecord, + _In_ PVOID ReturnValue) { - UNIMPLEMENTED; - return; + CONTEXT Context; + + RtlUnwindEx(TargetFrame, + TargetIp, + ExceptionRecord, + ReturnValue, + &Context, + NULL); } ULONG

2 years, 1 month

[reactos] 10/14: [RTL] Set unwind flags in RtlUnwindEx

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d3bc7c5720ded130ea77… commit 8d3bc7c5720ded130ea77a1f2947bf672bdcaf46 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 21 17:23:51 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Set unwind flags in RtlUnwindEx --- sdk/lib/rtl/amd64/unwind.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 6618d9fba12..f4c811defee 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -891,6 +891,13 @@ RtlUnwindEx( ExceptionRecord = &LocalExceptionRecord; } + /* Set unwind flags */ + ExceptionRecord->ExceptionFlags = EXCEPTION_UNWINDING; + if (TargetFrame == NULL) + { + ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND; + } + /* Call the internal function */ RtlpUnwindInternal(TargetFrame, TargetIp,

2 years, 1 month

[reactos] 09/14: [RTL] Fixes for RtlpUnwindInternal

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c211b975f9532875bfa7… commit 0c211b975f9532875bfa79c8f8949832c6aee4b9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 20 21:41:10 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Fixes for RtlpUnwindInternal --- sdk/lib/rtl/amd64/unwind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 2b596341eb0..6618d9fba12 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -693,7 +693,7 @@ RtlpUnwindInternal( UnwindContext = *ContextRecord; /* Set up the constant fields of the dispatcher context */ - DispatcherContext.ContextRecord = ContextRecord; + DispatcherContext.ContextRecord = &UnwindContext; DispatcherContext.HistoryTable = HistoryTable; DispatcherContext.TargetIp = (ULONG64)TargetIp; @@ -778,7 +778,7 @@ RtlpUnwindInternal( /* Call the language specific handler */ Disposition = ExceptionRoutine(ExceptionRecord, (PVOID)EstablisherFrame, - &UnwindContext, + ContextRecord, &DispatcherContext); /* Clear exception flags for the next iteration */ @@ -991,7 +991,7 @@ RtlWalkFrameChain(OUT PVOID *Callers, } /* Check, if we have left our stack */ - if ((Context.Rsp < StackLow) || (Context.Rsp > StackHigh)) + if ((Context.Rsp <= StackLow) || (Context.Rsp >= StackHigh)) { break; }

2 years, 1 month

[reactos] 08/14: [RTL] Fix RtlVirtualUnwind

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aade1ab01beedac84af67… commit aade1ab01beedac84af6712e8cf02128b34021b3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Aug 19 13:03:22 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Fix RtlVirtualUnwind --- sdk/lib/rtl/amd64/unwind.c | 53 ++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 33a7e71c857..2b596341eb0 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -303,6 +303,7 @@ __inline BOOLEAN RtlpTryToUnwindEpilog( _Inout_ PCONTEXT Context, + _In_ ULONG64 ControlPc, _Inout_opt_ PKNONVOLATILE_CONTEXT_POINTERS ContextPointers, _In_ ULONG64 ImageBase, _In_ PRUNTIME_FUNCTION FunctionEntry) @@ -316,7 +317,7 @@ RtlpTryToUnwindEpilog( /* Make a local copy of the context */ LocalContext = *Context; - InstrPtr = (BYTE*)LocalContext.Rip; + InstrPtr = (BYTE*)ControlPc; /* Check if first instruction of epilog is "add rsp, x" */ Instr = *(DWORD*)InstrPtr; @@ -339,7 +340,10 @@ RtlpTryToUnwindEpilog( else if ( (Instr & 0x38fffe) == 0x208d48 ) { /* Get the register */ - Reg = ((Instr << 8) | (Instr >> 16)) & 0x7; + Reg = (Instr >> 16) & 0x7; + + /* REX.R */ + Reg += (Instr & 1) * 8; LocalContext.Rsp = GetReg(&LocalContext, Reg); @@ -353,13 +357,13 @@ RtlpTryToUnwindEpilog( else if (Mod == 1) { /* 1 byte displacement */ - LocalContext.Rsp += Instr >> 24; + LocalContext.Rsp += (LONG)(CHAR)(Instr >> 24); InstrPtr += 4; } else if (Mod == 2) { /* 4 bytes displacement */ - LocalContext.Rsp += *(DWORD*)(InstrPtr + 3); + LocalContext.Rsp += *(LONG*)(InstrPtr + 3); InstrPtr += 7; } } @@ -453,11 +457,17 @@ GetEstablisherFrame( i < UnwindInfo->CountOfCodes; i += UnwindOpSlots(UnwindInfo->UnwindCode[i])) { + /* Skip codes past our code offset */ + if (UnwindInfo->UnwindCode[i].CodeOffset > CodeOffset) + { + continue; + } + /* Check for SET_FPREG */ if (UnwindInfo->UnwindCode[i].UnwindOp == UWOP_SET_FPREG) { return GetReg(Context, UnwindInfo->FrameRegister) - - UnwindInfo->FrameOffset * 16; + UnwindInfo->FrameOffset * 16; } } @@ -477,18 +487,18 @@ RtlVirtualUnwind( _Inout_opt_ PKNONVOLATILE_CONTEXT_POINTERS ContextPointers) { PUNWIND_INFO UnwindInfo; - ULONG_PTR CodeOffset; + ULONG_PTR ControlRva, CodeOffset; ULONG i, Offset; UNWIND_CODE UnwindCode; BYTE Reg; PULONG LanguageHandler; - /* Use relative virtual address */ - ControlPc -= ImageBase; + /* Get relative virtual address */ + ControlRva = ControlPc - ImageBase; /* Sanity checks */ - if ( (ControlPc < FunctionEntry->BeginAddress) || - (ControlPc >= FunctionEntry->EndAddress) ) + if ( (ControlRva < FunctionEntry->BeginAddress) || + (ControlRva >= FunctionEntry->EndAddress) ) { return NULL; } @@ -498,17 +508,16 @@ RtlVirtualUnwind( /* The language specific handler data follows the unwind info */ LanguageHandler = ALIGN_UP_POINTER_BY(&UnwindInfo->UnwindCode[UnwindInfo->CountOfCodes], sizeof(ULONG)); - *HandlerData = (LanguageHandler + 1); /* Calculate relative offset to function start */ - CodeOffset = ControlPc - FunctionEntry->BeginAddress; + CodeOffset = ControlRva - FunctionEntry->BeginAddress; *EstablisherFrame = GetEstablisherFrame(Context, UnwindInfo, CodeOffset); /* Check if we are in the function epilog and try to finish it */ - if (CodeOffset > UnwindInfo->SizeOfProlog) + if ((CodeOffset > UnwindInfo->SizeOfProlog) && (UnwindInfo->CountOfCodes > 0)) { - if (RtlpTryToUnwindEpilog(Context, ContextPointers, ImageBase, FunctionEntry)) + if (RtlpTryToUnwindEpilog(Context, ControlPc, ContextPointers, ImageBase, FunctionEntry)) { /* There's no exception routine */ return NULL; @@ -565,7 +574,7 @@ RepeatChainedInfo: case UWOP_SAVE_NONVOL: Reg = UnwindCode.OpInfo; - Offset = *(USHORT*)(&UnwindInfo->UnwindCode[i + 1]); + Offset = UnwindInfo->UnwindCode[i + 1].FrameOffset; SetRegFromStackValue(Context, ContextPointers, Reg, (DWORD64*)Context->Rsp + Offset); i += 2; break; @@ -588,15 +597,15 @@ RepeatChainedInfo: case UWOP_SAVE_XMM128: Reg = UnwindCode.OpInfo; - Offset = *(USHORT*)(&UnwindInfo->UnwindCode[i + 1]); - SetXmmRegFromStackValue(Context, ContextPointers, Reg, (M128A*)(Context->Rsp + Offset)); + Offset = UnwindInfo->UnwindCode[i + 1].FrameOffset; + SetXmmRegFromStackValue(Context, ContextPointers, Reg, (M128A*)Context->Rsp + Offset); i += 2; break; case UWOP_SAVE_XMM128_FAR: Reg = UnwindCode.OpInfo; Offset = *(ULONG*)(&UnwindInfo->UnwindCode[i + 1]); - SetXmmRegFromStackValue(Context, ContextPointers, Reg, (M128A*)(Context->Rsp + Offset)); + SetXmmRegFromStackValue(Context, ContextPointers, Reg, (M128A*)Context->Rsp + Offset); i += 3; break; @@ -604,11 +613,8 @@ RepeatChainedInfo: /* OpInfo is 1, when an error code was pushed, otherwise 0. */ Context->Rsp += UnwindCode.OpInfo * sizeof(DWORD64); - /* Now pop the MACHINE_FRAME (Yes, "magic numbers", deal with it) */ + /* Now pop the MACHINE_FRAME (RIP/RSP only. And yes, "magic numbers", deal with it) */ Context->Rip = *(PDWORD64)(Context->Rsp + 0x00); - Context->SegCs = *(PDWORD64)(Context->Rsp + 0x08); - Context->EFlags = *(PDWORD64)(Context->Rsp + 0x10); - Context->SegSs = *(PDWORD64)(Context->Rsp + 0x20); Context->Rsp = *(PDWORD64)(Context->Rsp + 0x18); ASSERT((i + 1) == UnwindInfo->CountOfCodes); goto Exit; @@ -635,8 +641,9 @@ RepeatChainedInfo: Exit: /* Check if we have a handler and return it */ - if (UnwindInfo->Flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) + if (UnwindInfo->Flags & (HandlerType & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER))) { + *HandlerData = (LanguageHandler + 1); return RVA(ImageBase, *LanguageHandler); }

2 years, 1 month

[reactos] 07/14: [RTL] Fix RtlpCaptureNonVolatileContextPointers

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90d2e12dfab8f6aa8473d… commit 90d2e12dfab8f6aa8473d2d88a404ba1bb6c1ecd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 09:31:08 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Fix RtlpCaptureNonVolatileContextPointers --- sdk/lib/rtl/amd64/unwind.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 619d31b6bb9..33a7e71c857 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -1053,29 +1053,37 @@ RtlpCaptureNonVolatileContextPointers( do { - /* Look up the function entry */ - FunctionEntry = RtlLookupFunctionEntry(Context.Rip, &ImageBase, NULL); - ASSERT(FunctionEntry != NULL); - - /* Do a virtual unwind to the caller and capture saved non-volatiles */ - RtlVirtualUnwind(UNW_FLAG_EHANDLER, - ImageBase, - Context.Rip, - FunctionEntry, - &Context, - &HandlerData, - &EstablisherFrame, - NonvolatileContextPointers); - /* Make sure nothing fishy is going on. Currently this is for kernel mode only. */ - ASSERT(EstablisherFrame != 0); ASSERT((LONG64)Context.Rip < 0); + ASSERT((LONG64)Context.Rsp < 0); + + /* Look up the function entry */ + FunctionEntry = RtlLookupFunctionEntry(Context.Rip, &ImageBase, NULL); + if (FunctionEntry != NULL) + { + /* Do a virtual unwind to the caller and capture saved non-volatiles */ + RtlVirtualUnwind(UNW_FLAG_EHANDLER, + ImageBase, + Context.Rip, + FunctionEntry, + &Context, + &HandlerData, + &EstablisherFrame, + NonvolatileContextPointers); + + ASSERT(EstablisherFrame != 0); + } + else + { + Context.Rip = *(PULONG64)Context.Rsp; + Context.Rsp += 8; + } - /* Continue until we reached the target frame or user mode */ - } while (EstablisherFrame < TargetFrame); + /* Continue until we reach user mode */ + } while ((LONG64)Context.Rip < 0); - /* If the caller did the right thing, we should get exactly the target frame */ - ASSERT(EstablisherFrame == TargetFrame); + /* If the caller did the right thing, we should get past the target frame */ + ASSERT(EstablisherFrame >= TargetFrame); } VOID

2 years, 1 month

[reactos] 06/14: [RTL] Implement x64 version of RtlInterlockedPushListSList

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4d4b31c61eadcb5916a9… commit f4d4b31c61eadcb5916a929626aacc229c249083 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 09:26:39 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [RTL] Implement x64 version of RtlInterlockedPushListSList --- sdk/lib/rtl/slist.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/sdk/lib/rtl/slist.c b/sdk/lib/rtl/slist.c index 88ea519ef0a..b4625f15838 100644 --- a/sdk/lib/rtl/slist.c +++ b/sdk/lib/rtl/slist.c @@ -104,9 +104,78 @@ RtlInterlockedPushListSList( _In_ ULONG Count) { #ifdef _WIN64 - UNIMPLEMENTED; - DbgBreakPoint(); - return NULL; + SLIST_HEADER OldSListHead, NewSListHead; + PSLIST_ENTRY FirstEntry; + + ASSERT(((ULONG_PTR)SListHead & 0xF) == 0); + ASSERT(((ULONG_PTR)List & 0xF) == 0); + + if (RtlpUse16ByteSLists) + { + BOOLEAN exchanged; + + do + { + /* Capture the current SListHead */ + OldSListHead = *SListHead; + + /* Link the last list entry */ + FirstEntry = (PSLIST_ENTRY)(SListHead->Region & ~0xFLL); + ListEnd->Next = FirstEntry; + + /* Set up new SListHead */ + NewSListHead = OldSListHead; + NewSListHead.Header16.Depth += Count; + NewSListHead.Header16.Sequence++; + NewSListHead.Region = (ULONG64)List; + NewSListHead.Header16.HeaderType = 1; + NewSListHead.Header16.Init = 1; + + /* Atomically exchange the SlistHead with the new one */ + exchanged = _InterlockedCompareExchange128((PULONG64)SListHead, + NewSListHead.Region, + NewSListHead.Alignment, + (PULONG64)&OldSListHead); + } while (!exchanged); + + return FirstEntry; + } + else + { + ULONG64 Compare; + + /* ListHead and List must be in the same region */ + ASSERT(((ULONG64)SListHead & 0xFFFFF80000000000ull) == + ((ULONG64)List & 0xFFFFF80000000000ull)); + + /* Read the header */ + OldSListHead = *SListHead; + + do + { + /* Construct the address from the header bits and the list head pointer */ + FirstEntry = (PSLIST_ENTRY)((OldSListHead.Header8.NextEntry << 4) | + ((ULONG64)SListHead & 0xFFFFF80000000000ull)); + + /* Link the last list entry */ + ListEnd->Next = FirstEntry; + + /* Create a new header */ + NewSListHead = OldSListHead; + NewSListHead.Header8.NextEntry = (ULONG64)List >> 4; + NewSListHead.Header8.Depth += Count; + NewSListHead.Header8.Sequence++; + + /* Try to exchange atomically */ + Compare = OldSListHead.Alignment; + OldSListHead.Alignment = InterlockedCompareExchange64((PLONG64)&SListHead->Alignment, + NewSListHead.Alignment, + Compare); + } while (OldSListHead.Alignment != Compare); + + /* Return the old first entry */ + return FirstEntry; + } #else SLIST_HEADER OldHeader, NewHeader; ULONGLONG Compare;

2 years, 1 month

[reactos] 05/14: [CRT] Implement _InterlockedCompareExchange128 intrinsic for GCC

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20a6cff4dd20545de2e0a… commit 20a6cff4dd20545de2e0a777271a8aec3fdad1db Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 31 20:52:09 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [CRT] Implement _InterlockedCompareExchange128 intrinsic for GCC --- sdk/cmake/gcc.cmake | 1 + sdk/cmake/msvc.cmake | 3 +++ sdk/include/crt/mingw32/intrin_x86.h | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 5a37db32dea..bc72c977773 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -160,6 +160,7 @@ endif() # Other if(ARCH STREQUAL "amd64") + add_compile_options(-mcx16) # Generate CMPXCHG16 add_definitions(-U_X86_ -UWIN32) elseif(ARCH STREQUAL "arm") add_definitions(-U_UNICODE -UUNICODE) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index ede1597a454..e19e8e8b6ff 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -41,6 +41,9 @@ endif() add_compile_options(/GS-) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + if(ARCH STREQUAL "amd64") + add_compile_options(-mcx16) # Generate CMPXCHG16B + endif() set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: ") endif() diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index 1bfae865d77..fa6a74f6407 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -699,6 +699,14 @@ __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Des #endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) */ #endif /* !HAS_BUILTIN(_InterlockedCompareExchange64) */ +#if defined(__x86_64__) && !HAS_BUILTIN(_InterlockedCompareExchange128) +__INTRIN_INLINE unsigned char _InterlockedCompareExchange128(_Interlocked_operand_ __int64 volatile* Destination, __int64 ExchangeHigh, __int64 ExchangeLow, __int64* ComparandResult) +{ + __int64 xchg[2] = { ExchangeLow, ExchangeHigh }; + return __sync_bool_compare_and_swap((__uint128_t*)Destination, *((__uint128_t*)ComparandResult), *((__uint128_t*)xchg)); +} +#endif + #ifdef __i386__ __INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * Addend, long Value) {

2 years, 1 month

[reactos] 04/14: [HAL/x64] Fix x86BiosCall

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3381bf39db36a2b763c83… commit 3381bf39db36a2b763c83a9411f69acf7329acfe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 14 14:41:53 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [HAL/x64] Fix x86BiosCall Use an INT call stub and exit on the address after the stub instead or using iret (some BIOS code uses int / iret internally). This fixes the messed up display when trying to switch modes. --- hal/halx86/amd64/x86bios.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/amd64/x86bios.c index 6d7ce9ae083..80cefebc322 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/amd64/x86bios.c @@ -412,12 +412,8 @@ x86BiosCall( _In_ ULONG InterruptNumber, _Inout_ PX86_BIOS_REGISTERS Registers) { + const ULONG StackBase = 0x2000; FAST486_STATE EmulatorContext; - struct - { - USHORT Ip; - USHORT SegCs; - } *Ivt; ULONG FlatIp; PUCHAR InstructionPointer; @@ -432,8 +428,6 @@ x86BiosCall( NULL, // FpuCallback, NULL); // Tlb -//RegisterBop(BOP_UNSIMULATE, CpuUnsimulateBop); - /* Copy the registers */ EmulatorContext.GeneralRegs[FAST486_REG_EAX].Long = Registers->Eax; EmulatorContext.GeneralRegs[FAST486_REG_EBX].Long = Registers->Ebx; @@ -449,36 +443,41 @@ x86BiosCall( EmulatorContext.Flags.AlwaysSet = 1; EmulatorContext.Flags.If = 1; + /* Set up the INT stub */ + FlatIp = StackBase - 4; + InstructionPointer = x86BiosMemoryMapping + FlatIp; + InstructionPointer[0] = 0xCD; // INT instruction + InstructionPointer[1] = (UCHAR)InterruptNumber; + InstructionPointer[2] = 0x90; // NOP. We will stop at this address. + /* Set the stack pointer */ - Fast486SetStack(&EmulatorContext, 0, 0x2000 - 2); // FIXME + Fast486SetStack(&EmulatorContext, 0, StackBase - 8); - /* Set CS:EIP from the IVT entry */ - Ivt = (PVOID)x86BiosMemoryMapping; - Fast486ExecuteAt(&EmulatorContext, - Ivt[InterruptNumber].SegCs, - Ivt[InterruptNumber].Ip); + /* Start execution at the INT stub */ + Fast486ExecuteAt(&EmulatorContext, 0x00, FlatIp); while (TRUE) { - /* Step one instruction */ - Fast486StepInto(&EmulatorContext); - - /* Check for iret */ + /* Get the current flat IP */ FlatIp = (EmulatorContext.SegmentRegs[FAST486_REG_CS].Selector << 4) + EmulatorContext.InstPtr.Long; + + /* Make sure we haven't left the allowed memory range */ if (FlatIp >= 0x100000) { DPRINT1("x86BiosCall: invalid IP (0x%lx) during BIOS execution", FlatIp); return FALSE; } - /* Read the next instruction and check if it's IRET */ - InstructionPointer = x86BiosMemoryMapping + FlatIp; - if (*InstructionPointer == 0xCF) + /* Check if we returned from our int stub */ + if (FlatIp == (StackBase - 2)) { /* We are done! */ break; } + + /* Emulate one instruction */ + Fast486StepInto(&EmulatorContext); } /* Copy the registers back */

2 years, 1 month

[reactos] 03/14: [OLEAUT32] Implement x64 call_method in asm

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38fc6e1274c979de54089… commit 38fc6e1274c979de54089ce825a1f2d0c3b50cfe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 27 08:55:25 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 24 21:17:58 2022 +0200 [OLEAUT32] Implement x64 call_method in asm This is based on the inline implementation for GCC. --- dll/win32/oleaut32/msvc.S | 56 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/dll/win32/oleaut32/msvc.S b/dll/win32/oleaut32/msvc.S index 7503cd1231f..3c2633f7141 100644 --- a/dll/win32/oleaut32/msvc.S +++ b/dll/win32/oleaut32/msvc.S @@ -12,10 +12,62 @@ #include <asm.inc> .code64 +EXTERN __chkstk:PROC + +// DWORD_PTR +// call_method( +// void *func, // rcx +// int nb_args, // edx +// const DWORD_PTR *args ); PUBLIC call_method -call_method: - int 2ch +FUNC call_method + push rbp + .PUSHREG rbp + push rsi + .PUSHREG rsi + push rdi + .PUSHREG rdi + mov rbp, rsp + .SETFRAME rbp, 0 + .ENDPROLOG + + // We need at least space for 4 parameters (home space) + mov rax, 4 + cmp rdx, rax + cmovg rax, rdx + + // Allocate dynamic stack space (aligned to 16 bytes) + lea rax, [rax * 8 + 15] + and rax, HEX(0FFFFFFFFFFFFFFF0) + call __chkstk + sub rsp, rax + + // Save function pointer in rax + mov rax, rcx + + // Copy parameters to the stack + mov rcx, rdx + mov rdi, rsp + mov rsi, r8 + rep movsq + + // Set up parameter registers for the call + mov rcx, qword ptr [rsp + 0] + mov rdx, qword ptr [rsp + 8] + mov r8, qword ptr [rsp + 16] + mov r9, qword ptr [rsp + 24] + movq xmm0, qword ptr [rsp + 0] + movq xmm1, qword ptr [rsp + 8] + movq xmm2, qword ptr [rsp + 16] + movq xmm3, qword ptr [rsp + 24] + call rax + + lea rsp, [rbp] + pop rdi + pop rsi + pop rbp ret +ENDFUNC PUBLIC call_double_method call_double_method:

2 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022