Ros-diffs January 2021

ros-diffs@reactos.org

15 participants
146 discussions

[reactos] 04/04: [FREELDR/x64] Change syntax to be compatible with GAS x64
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2f73877b7695aa0a51c3… commit d2f73877b7695aa0a51c3b403dd659f458d5aa90 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jan 28 22:57:08 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 23:10:01 2021 +0100 [FREELDR/x64] Change syntax to be compatible with GAS x64 --- boot/freeldr/freeldr/arch/amd64/entry.S | 8 ++++---- boot/freeldr/freeldr/arch/realmode/amd64.S | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index 24ecc07291d..a0149ef9daf 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -34,7 +34,7 @@ RealEntryPoint: jmp qword ptr [ContinueAddress] ContinueAddress: - .quad offset FrldrStartup + .quad FrldrStartup FrldrStartup: @@ -184,7 +184,7 @@ SwitchToReal: jmp fword ptr [jumpvector] jumpvector: - .long offset SwitchToRealCompSegment + .long SwitchToRealCompSegment .word CMODE_CS SwitchToRealCompSegment: @@ -222,7 +222,7 @@ __fastfail: // void __lgdt(void *Source<rcx>); PUBLIC __lgdt __lgdt: - lgdt fword ptr [rcx] + lgdt cs:[rcx] ret // void __ltr(unsigned short Source<rcx>); @@ -234,7 +234,7 @@ __ltr: // void _sgdt(void *Destination<rcx>); PUBLIC __sgdt __sgdt: - sgdt fword ptr [rcx] + sgdt cs:[rcx] ret diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index ea1494f6b80..393b3f43016 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -67,7 +67,7 @@ Msg_LongModeSupported: call writestr /* Load the GDT */ - lgdt fword ptr [gdtptr] + lgdt cs:[gdtptr] /* Build the startup page tables */ call BuildPageTables @@ -265,7 +265,7 @@ RealModeEntryPoint: mov cr0, eax /* Clear prefetch queue & correct CS */ - ljmp16 0, offset InRealMode + ljmp16 0, InRealMode InRealMode:

1 0

[reactos] 03/04: [FREELDR/x64] Merge x64 and x86 versions, to fix compilation with GAS x64
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec7d874c183a9c5215e99… commit ec7d874c183a9c5215e9906ca2cb79fc5ae6981b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jan 28 22:03:08 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 23:10:01 2021 +0100 [FREELDR/x64] Merge x64 and x86 versions, to fix compilation with GAS x64 Upper bits of rcx are already checked to be 0. So, we can only take care of lower bits. This also generates smaller code. --- boot/freeldr/freeldr/arch/amd64/linux.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/linux.S b/boot/freeldr/freeldr/arch/amd64/linux.S index 383111ae66c..55d623bbb79 100644 --- a/boot/freeldr/freeldr/arch/amd64/linux.S +++ b/boot/freeldr/freeldr/arch/amd64/linux.S @@ -119,12 +119,12 @@ reloc_down: #if 0 rep movsb #else - mov rdx, rcx // Copy the total number of bytes in EDX - and rdx, HEX(0FFFFFFFC) // Number of bytes we copy using DWORDs - xor rdx, rcx // Number of remaining bytes to copy after the DWORDs - shr rcx, 2 // Count number of DWORDs + mov edx, ecx // Copy the total number of bytes in EDX + and edx, HEX(0FFFFFFFC) // Number of bytes we copy using DWORDs + xor edx, ecx // Number of remaining bytes to copy after the DWORDs + shr ecx, 2 // Count number of DWORDs rep movsd // Move DWORDs - mov rcx, rdx // Count number of remaining bytes + mov ecx, edx // Count number of remaining bytes rep movsb // Move bytes #endif jmp after_reloc

1 0

[reactos] 02/04: [KDVBOX] Fix compilation with GAS x64
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a6d8465d667afb46c21e… commit 2a6d8465d667afb46c21e749a739f7457b378795 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jan 28 22:38:39 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 23:10:01 2021 +0100 [KDVBOX] Fix compilation with GAS x64 --- drivers/base/kdvm/kdvbox_asm.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/kdvm/kdvbox_asm.S b/drivers/base/kdvm/kdvbox_asm.S index 78c7748edfb..7a247eecbeb 100644 --- a/drivers/base/kdvm/kdvbox_asm.S +++ b/drivers/base/kdvm/kdvbox_asm.S @@ -17,7 +17,7 @@ FUNC KdVmExchange .endprolog xchg rax, rcx mov edx, HEX(5659) - out dx, rax + out dx, eax ret ENDFUNC #endif

1 0

[reactos] 01/04: [NTOSKRNL] Fix link with GCC x64
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=794f15e45f05729fc68f1… commit 794f15e45f05729fc68f1c5288e17391fe14adb8 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Jan 28 22:48:16 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 23:10:01 2021 +0100 [NTOSKRNL] Fix link with GCC x64 KeLowerIrql/KeRaiseIrqlToDpcLevel/KfRaiseIrql are defined as FORCEINLINE in ntoskrnl/ke/amd64/irql.c Use KxLowerIrql/KxRaiseIrqlToDpcLevel/KxRaiseIrql instead, which call their respective Ke*/Kf* counterparts. --- ntoskrnl/ntoskrnl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 2965a67ffbf..96660a3fea1 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -630,7 +630,7 @@ @ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ extern KeLoaderBlock -@ cdecl -arch=x86_64 -private KeLowerIrql(long) +@ cdecl -arch=x86_64 -private KeLowerIrql(long) KxLowerIrql @ extern KeNumberProcessors @ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall KeProfileInterruptWithSource(ptr long) @@ -644,7 +644,7 @@ @ stdcall -arch=i386,arm KeQuerySystemTime(ptr) @ stdcall -arch=i386,arm KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() -@ cdecl -arch=x86_64 -private KeRaiseIrqlToDpcLevel() +@ cdecl -arch=x86_64 -private KeRaiseIrqlToDpcLevel() KxRaiseIrqlToDpcLevel @ stdcall KeRaiseUserException(long) @ stdcall KeReadStateEvent(ptr) @ stdcall KeReadStateMutant(ptr) @@ -720,7 +720,7 @@ @ fastcall -arch=i386,arm KefAcquireSpinLockAtDpcLevel(ptr) @ fastcall -arch=i386,arm KefReleaseSpinLockFromDpcLevel(ptr) @ stdcall -arch=i386 Kei386EoiHelper() -@ cdecl -arch=x86_64 -private KfRaiseIrql(long) +@ cdecl -arch=x86_64 -private KfRaiseIrql(long) KxRaiseIrql @ fastcall -arch=i386 KiEoiHelper(ptr) #ReactOS-Specific @ fastcall -arch=i386,arm KiAcquireSpinLock(ptr) @ extern KiBugCheckData

1 0

[reactos] 01/01: [FREELDR] In PE loader, use cache to not load twice the start of the file
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5904361a54d5594a902d8… commit 5904361a54d5594a902d81eb6f78469818d79435 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jan 27 23:41:49 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:45:44 2021 +0100 [FREELDR] In PE loader, use cache to not load twice the start of the file This is especially important in PXE boot, where a seek backwards requires reloading the file from start. --- boot/freeldr/freeldr/lib/peloader.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 2c981cefe91..340eba1d2c0 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -781,24 +781,19 @@ PeLdrLoadImage( TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); - /* Set to 0 position and fully load the file image */ - Position.QuadPart = 0; - Status = ArcSeek(FileId, &Position, SeekAbsolute); - if (Status != ESUCCESS) - { - ERR("ArcSeek(File: '%s') failed. Status: 0x%lx\n", FileName, Status); - UiMessageBox("Error seeking the start of a file."); - ArcClose(FileId); - return FALSE; - } - - Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); - if (Status != ESUCCESS) + /* Copy headers from already read data */ + RtlCopyMemory(PhysicalBase, HeadersBuffer, min(NtHeaders->OptionalHeader.SizeOfHeaders, sizeof(HeadersBuffer))); + /* If headers are quite big, request next bytes from file */ + if (NtHeaders->OptionalHeader.SizeOfHeaders > sizeof(HeadersBuffer)) { - ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); - UiMessageBox("Error reading headers."); - ArcClose(FileId); - return FALSE; + Status = ArcRead(FileId, (PUCHAR)PhysicalBase + sizeof(HeadersBuffer), NtHeaders->OptionalHeader.SizeOfHeaders - sizeof(HeadersBuffer), &BytesRead); + if (Status != ESUCCESS) + { + ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); + UiMessageBox("Error reading headers."); + ArcClose(FileId); + return FALSE; + } } /* @@ -843,7 +838,7 @@ PeLdrLoadImage( if (SizeOfRawData != 0) { /* Seek to the correct position */ - Position.LowPart = SectionHeader->PointerToRawData; + Position.QuadPart = SectionHeader->PointerToRawData; Status = ArcSeek(FileId, &Position, SeekAbsolute); TRACE("SH->VA: 0x%X\n", SectionHeader->VirtualAddress);

1 0

[reactos] 05/05: [NTOS:KDBG] Support KDBG on x64
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d110db433c4133a15935… commit 9d110db433c4133a159359042809ea1ddd922041 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Jan 9 20:32:54 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:44:21 2021 +0100 [NTOS:KDBG] Support KDBG on x64 --- ntoskrnl/ntos.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index b815c62565a..79317e880db 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -390,6 +390,9 @@ if(NOT _WINKD_) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/kdb_help.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) endif() + elseif(ARCH STREQUAL "amd64") + list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) elseif(ARCH STREQUAL "arm") list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c) endif()

1 0

[reactos] 04/05: [PSEH] When using GCC x64, use native SEH support instead of PSEH
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=457b83f76aa224f6b85cb… commit 457b83f76aa224f6b85cb12d2867d394fe7a1088 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Jan 9 20:32:14 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:44:21 2021 +0100 [PSEH] When using GCC x64, use native SEH support instead of PSEH --- sdk/lib/pseh/CMakeLists.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sdk/lib/pseh/CMakeLists.txt b/sdk/lib/pseh/CMakeLists.txt index f7405848014..0f64bf0cf95 100644 --- a/sdk/lib/pseh/CMakeLists.txt +++ b/sdk/lib/pseh/CMakeLists.txt @@ -3,9 +3,23 @@ if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE i386/seh.s i386/seh_prolog.s) +elseif(ARCH STREQUAL "amd64") + list(APPEND ASM_SOURCE + amd64/seh.s + amd64/seh_prolog.s) +elseif(ARCH STREQUAL "arm") + list(APPEND ASM_SOURCE + arm/seh_prolog.s) endif() -if(NOT MSVC) +if(MSVC OR (GCC AND ARCH STREQUAL "amd64")) + + list(APPEND SOURCE dummy.c) + add_asm_files(pseh_asm ${ASM_SOURCE}) + add_library(pseh ${SOURCE} ${pseh_asm}) + add_dependencies(pseh asm) + +else() if(USE_PSEH3) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/pseh) @@ -29,20 +43,4 @@ if(NOT MSVC) target_link_libraries(pseh chkstk) add_dependencies(pseh psdk) -else() - - if(ARCH STREQUAL "amd64") - list(APPEND ASM_SOURCE - amd64/seh.s - amd64/seh_prolog.s) - elseif(ARCH STREQUAL "arm") - list(APPEND ASM_SOURCE - arm/seh_prolog.s) - endif() - - list(APPEND SOURCE dummy.c) - add_asm_files(pseh_asm ${ASM_SOURCE}) - add_library(pseh ${SOURCE} ${pseh_asm}) - add_dependencies(pseh asm) - endif()

1 0

[reactos] 03/05: [ASM x64] Prevent having same label multiple times in ntoskrnl/ke/amd64/trap.S
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d7dd4a3b5cd7927f1109… commit 5d7dd4a3b5cd7927f110925f30ced6171249762f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 10 07:35:19 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:31:17 2021 +0100 [ASM x64] Prevent having same label multiple times in ntoskrnl/ke/amd64/trap.S --- sdk/include/asm/trapamd64.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/asm/trapamd64.inc b/sdk/include/asm/trapamd64.inc index 4774fc09076..6cf846907ab 100644 --- a/sdk/include/asm/trapamd64.inc +++ b/sdk/include/asm/trapamd64.inc @@ -156,9 +156,9 @@ MACRO(ExitTrap, Flags) /* Check previous irql */ mov rax, cr8 cmp [rbp + KTRAP_FRAME_PreviousIrql], al - je .irql_ok + je 1f int 3 - .irql_ok: + 1: #endif if (Flags AND TF_SEGMENTS)

1 0

[reactos] 02/05: [ASM x64] Make UNIMPLEMENTED macro self-suffisant
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c345f7f137a3340168fd3… commit c345f7f137a3340168fd3e9a484981cc2f3ee6c9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 10 07:46:25 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:31:16 2021 +0100 [ASM x64] Make UNIMPLEMENTED macro self-suffisant This fixes link errors with MsgUnimplemented not defined on binaries not linking to CRT. --- sdk/include/asm/asm.inc | 23 ++++++++++++----------- sdk/lib/crt/except/amd64/chkstk_asm.s | 3 --- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index afbfdf24cd8..b3b265ef4f3 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -246,6 +246,10 @@ ENDM /* Macro values need to be marked */ #define VAL(x) \x +#define CR "\r" +#define LF "\n" +#define NUL "\0" + /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(...) .macro __VA_ARGS__ #define ENDM .endm @@ -383,14 +387,15 @@ code = 1 .endm .macro UNIMPLEMENTED2 file, line, func - jmp 3f -1: .asciz "\func" -2: .asciz \file -3: + jmp 4f +1: .ascii "Unimplemented", CR, LF, NUL +2: .asciz "\func" +3: .asciz \file +4: sub rsp, 0x20 - lea rcx, MsgUnimplemented[rip] - lea rdx, 1b[rip] - lea r8, 2b[rip] + lea rcx, 1b[rip] + lea rdx, 2b[rip] + lea r8, 3b[rip] mov r9, \line call DbgPrint add rsp, 0x20 @@ -404,10 +409,6 @@ code = 1 #define else .else #define elseif .elseif -#define CR "\r" -#define LF "\n" -#define NUL "\0" - /* CFI annotations */ #define CFI_STARTPROC .cfi_startproc #define CFI_ENDPROC .cfi_endproc diff --git a/sdk/lib/crt/except/amd64/chkstk_asm.s b/sdk/lib/crt/except/amd64/chkstk_asm.s index eb06952b0db..255c66e6df5 100644 --- a/sdk/lib/crt/except/amd64/chkstk_asm.s +++ b/sdk/lib/crt/except/amd64/chkstk_asm.s @@ -13,9 +13,6 @@ /* CODE **********************************************************************/ .code64 -MsgUnimplemented: - .ascii "Unimplemented", CR, LF, NUL - FUNC __chkstk .endprolog UNIMPLEMENTED chkstk

1 0

[reactos] 01/05: [ASM x64] Fix usage of macro .allocstack
by Hervé Poussineau 28 Jan '21

28 Jan '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae4ce99e00bdd3b247592… commit ae4ce99e00bdd3b2475926d69b52d68c357e5a3d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Jan 9 19:33:20 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 28 20:31:16 2021 +0100 [ASM x64] Fix usage of macro .allocstack .allocstack only accepts one 'size' parameter." --- dll/ntdll/dispatch/amd64/dispatch.S | 2 +- ntoskrnl/ke/amd64/ctxswitch.S | 2 +- sdk/include/asm/kxamd64.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/ntdll/dispatch/amd64/dispatch.S b/dll/ntdll/dispatch/amd64/dispatch.S index c78ff86e78d..a78ca687c23 100644 --- a/dll/ntdll/dispatch/amd64/dispatch.S +++ b/dll/ntdll/dispatch/amd64/dispatch.S @@ -67,7 +67,7 @@ PUBLIC KiUserCallbackDispatcher .PUSHFRAME /* This is for the Home space, Buffer, Length and ApiNumber */ - .ALLOCSTACK 6 * 8 + .ALLOCSTACK (6 * 8) .ENDPROLOG #if DBG diff --git a/ntoskrnl/ke/amd64/ctxswitch.S b/ntoskrnl/ke/amd64/ctxswitch.S index ddd9a734499..94c726aa486 100644 --- a/ntoskrnl/ke/amd64/ctxswitch.S +++ b/ntoskrnl/ke/amd64/ctxswitch.S @@ -146,7 +146,7 @@ PUBLIC KiThreadStartup push rbp .pushreg rbp sub rsp, 6 * 8 - .allocstack 6 * 8 + .allocstack (6 * 8) .endprolog /* Save WaitIrql as KSWITCH_FRAME::ApcBypass */ diff --git a/sdk/include/asm/kxamd64.inc b/sdk/include/asm/kxamd64.inc index dccf8a2c409..61751f69529 100644 --- a/sdk/include/asm/kxamd64.inc +++ b/sdk/include/asm/kxamd64.inc @@ -12,7 +12,7 @@ MACRO(GENERATE_EXCEPTION_FRAME) /* Allocate a KEXCEPTION_FRAME on the stack */ /* -8 because the last field is the return address */ sub rsp, KEXCEPTION_FRAME_LENGTH - 8 - .allocstack KEXCEPTION_FRAME_LENGTH - 8 + .allocstack (KEXCEPTION_FRAME_LENGTH - 8) /* Save non-volatiles in KEXCEPTION_FRAME */ mov [rsp + ExRbp], rbp

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2021