Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 10/13: [NTDLL][ARM] Export pow

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=419d7e96ad85749f03d97… commit 419d7e96ad85749f03d97b8ece44d7ad07742d47 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 21:47:14 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:31:55 2019 +0200 [NTDLL][ARM] Export pow --- dll/ntdll/def/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 8ac2146030e..6a60709a952 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -1365,7 +1365,7 @@ 1351 cdecl memcpy(ptr ptr long) memmove 1352 cdecl memmove(ptr ptr long) 1353 cdecl memset(ptr long long) -1354 cdecl -arch=i386,x86_64 pow(double double) +1354 cdecl -arch=i386,x86_64,arm pow(double double) 1355 cdecl qsort(ptr long long ptr) 1356 cdecl sin(double) 1357 varargs sprintf(ptr str)

5 years

[reactos] 09/13: [TIMEOUT] Use Int32x32To64 instead of __emul

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69cd1ebbbd3ea4a248e92… commit 69cd1ebbbd3ea4a248e923a9ece01c6001293d9f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:13:04 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:31:55 2019 +0200 [TIMEOUT] Use Int32x32To64 instead of __emul --- base/applications/cmdutils/timeout/timeout.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/base/applications/cmdutils/timeout/timeout.c b/base/applications/cmdutils/timeout/timeout.c index 129a0f1ac9f..7aaddfbf5ad 100644 --- a/base/applications/cmdutils/timeout/timeout.c +++ b/base/applications/cmdutils/timeout/timeout.c @@ -155,16 +155,7 @@ INT InputWait(BOOL bNoBreak, INT timerValue) timeElapsed = GetTickCount() - dwStartTime; if (timeElapsed < 1000) { - /* - * For whatever reason, x86 MSVC generates a ntdll!_allmul - * call when using Int32x32To64(), instead of an imul - * instruction. This leads the linker to error that _allmul - * is missing, since we do not link against ntdll. - * Everything is however OK with GCC... - * We therefore use the __emul() intrinsic which does - * the correct job. - */ - DueTime.QuadPart = __emul(1000 - timeElapsed, -10000); + DueTime.QuadPart = Int32x32To64(1000 - timeElapsed, -10000); SetWaitableTimer(hTimer, &DueTime, 0, NULL, NULL, FALSE); dwWaitState = WaitForSingleObject(hTimer, INFINITE);

5 years

[reactos] 08/13: [SDK] Update Int32x32To64 macro for arm

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b445fef9043448d4b6d2d… commit b445fef9043448d4b6d2de5fcb26e32706a66e60 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 20 13:02:35 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:11 2019 +0200 [SDK] Update Int32x32To64 macro for arm --- sdk/include/xdk/ntbasedef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index a40ee83e573..a7d0935a8fd 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -761,7 +761,7 @@ $endif(_WINNT_) #define MAXLONGLONG (0x7fffffffffffffffLL) /* 32 to 64 bit multiplication. GCC is really bad at optimizing the native math */ -#if defined(_M_IX86) && defined(__GNUC__) && \ +#if defined(_M_IX86) && !defined(_M_ARM) && !defined(_M_ARM64) && \ !defined(MIDL_PASS)&& !defined(RC_INVOKED) && !defined(_M_CEE_PURE) #define Int32x32To64(a,b) __emul(a,b) #define UInt32x32To64(a,b) __emulu(a,b)

5 years

[reactos] 07/13: [RUNTMCHK] Provide fallback memset for arm builds

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35aeaa239760f1b489b29… commit 35aeaa239760f1b489b29c6a3d0342275f713d6b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:12:30 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:11 2019 +0200 [RUNTMCHK] Provide fallback memset for arm builds --- sdk/lib/runtmchk/rtcapi.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sdk/lib/runtmchk/rtcapi.c b/sdk/lib/runtmchk/rtcapi.c index 96631ca53c4..82d4cd45da0 100644 --- a/sdk/lib/runtmchk/rtcapi.c +++ b/sdk/lib/runtmchk/rtcapi.c @@ -15,6 +15,22 @@ #error Unsupported platform #endif +// Provide a fallback memset for libraries like kbdrost.dll +#if defined(_M_ARM) +void* __cdecl memset_fallback(void* src, int val, size_t count) +{ + char *char_src = (char *)src; + while(count > 0) + { + *char_src = val; + char_src++; + count--; + } + return src; +} +#pragma comment(linker, "/alternatename:memset=memset_fallback") +#endif + int __cdecl _RTC_DefaultErrorFuncW(

5 years

[reactos] 06/13: [FREELDR][ARM] Suppress error about unused var

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93b2d5597eea153da9c43… commit 93b2d5597eea153da9c43db73d2e7bfb2dfd9848 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:11:50 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:11 2019 +0200 [FREELDR][ARM] Suppress error about unused var --- boot/freeldr/freeldr/ntldr/setupldr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index c1836fff223..0fe5c1fcfd4 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -65,6 +65,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, PCSTR S #if DBG { BOOLEAN Success = WinLdrLoadNLSData(LoaderBlock, SearchPath, AnsiName, OemName, LangName); + (VOID)Success; TRACE("NLS data loading %s\n", Success ? "successful" : "failed"); } #else

5 years

[reactos] 05/13: [NDK][ARM] Stub a few required types for bootlib

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a86264f14609c19c6e18… commit 8a86264f14609c19c6e18f0ee0dff84900239e77 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:06:54 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:11 2019 +0200 [NDK][ARM] Stub a few required types for bootlib --- sdk/include/ndk/arm/ketypes.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sdk/include/ndk/arm/ketypes.h b/sdk/include/ndk/arm/ketypes.h index d2e2d91db26..26c40706a31 100644 --- a/sdk/include/ndk/arm/ketypes.h +++ b/sdk/include/ndk/arm/ketypes.h @@ -31,6 +31,15 @@ extern "C" { #define SYNCH_LEVEL DISPATCH_LEVEL + +// +// CPU Vendors +// +typedef enum +{ + CPU_UNKNOWN = 0, +} CPU_VENDORS; + // // Co-Processor register definitions // @@ -298,6 +307,15 @@ extern "C" { // #define NUMBER_POOL_LOOKASIDE_LISTS 32 +// +// Structure for CPUID info +// +typedef union _CPU_INFO +{ + ULONG Dummy; +} CPU_INFO, *PCPU_INFO; + + // // ARM VFP State // Based on Windows RT 8.1 symbols and ksarm.h @@ -578,6 +596,14 @@ typedef enum _ARM_DOMAINS /// "Custom" definition end /// +typedef struct _DESCRIPTOR +{ + USHORT Pad; + USHORT Dummy1; + ULONG Dummy2; +} KDESCRIPTOR, *PKDESCRIPTOR; + + // // Special Registers Structure (outside of CONTEXT) // Based on Windows RT 8.1 symbols and ksarm.h

5 years

[reactos] 04/13: [BOOTLIB] Disable some x86 / x64 specific code for other architectures

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a380a61605e799c1d2c63… commit a380a61605e799c1d2c63b47de59bdb5aef33fa8 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:03:35 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:11 2019 +0200 [BOOTLIB] Disable some x86 / x64 specific code for other architectures --- boot/environ/lib/misc/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/environ/lib/misc/util.c b/boot/environ/lib/misc/util.c index 20a01881dc2..bd0a4b3da57 100644 --- a/boot/environ/lib/misc/util.c +++ b/boot/environ/lib/misc/util.c @@ -943,6 +943,7 @@ BlArchGetCpuVendor ( /* Get the CPU Vendor */ BlArchCpuId(0, 0, &CpuInfo); +#if defined(_M_IX86) || defined(_M_X64) Temp = CpuInfo.Ecx; CpuInfo.Ecx = CpuInfo.Edx; CpuInfo.Edx = Temp; @@ -974,6 +975,9 @@ BlArchGetCpuVendor ( return CPU_RISE; } #endif // _M_IX86 +#else // defined(_M_IX86) || defined(_M_X64) + EfiPrintf(L"BlArchGetCpuVendor not implemented for this platform.\r\n"); +#endif /* Other */ return CPU_UNKNOWN; }

5 years

[reactos] 03/13: [ROSLOAD] Disable some arch-specific code for arm

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9592728f55f69215b7041… commit 9592728f55f69215b7041752819b9932792dc133 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 19:02:46 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:10 2019 +0200 [ROSLOAD] Disable some arch-specific code for arm --- boot/environ/app/rosload/rosload.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/boot/environ/app/rosload/rosload.c b/boot/environ/app/rosload/rosload.c index 65fa445c773..ccbdae9e816 100644 --- a/boot/environ/app/rosload/rosload.c +++ b/boot/environ/app/rosload/rosload.c @@ -882,7 +882,7 @@ ArchRestoreProcessorFeatures ( if (ArchXCr0BitsToClear) { /* Clear them */ -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) && !defined(__clang__) && !defined(_M_ARM) __xsetbv(0, __xgetbv(0) & ~ArchXCr0BitsToClear); #endif ArchXCr0BitsToClear = 0; @@ -892,7 +892,9 @@ ArchRestoreProcessorFeatures ( if (ArchCr4BitsToClear) { /* Clear them */ +#if !defined(_M_ARM) __writecr4(__readcr4() & ~ArchCr4BitsToClear); +#endif ArchCr4BitsToClear = 0; } } @@ -979,10 +981,11 @@ OslpMain ( _Out_ PULONG ReturnFlags ) { - CPU_INFO CpuInfo; - BOOLEAN NxEnabled; NTSTATUS Status; BOOLEAN ExecuteJump; +#if !defined(_M_ARM) + CPU_INFO CpuInfo; + BOOLEAN NxEnabled; LARGE_INTEGER MiscMsr; /* Check if the CPU supports NX */ @@ -1006,6 +1009,8 @@ OslpMain ( /* Turn on NX support with the CPU-generic MSR */ __writemsr(MSR_EFER, __readmsr(MSR_EFER) | MSR_NXE); +#endif + /* Load the kernel */ Status = OslPrepareTarget(ReturnFlags, &ExecuteJump); if (NT_SUCCESS(Status) && (ExecuteJump)) @@ -1014,6 +1019,7 @@ OslpMain ( Status = OslExecuteTransition(); } +#if !defined(_M_ARM) /* Retore NX support */ __writemsr(MSR_EFER, __readmsr(MSR_EFER) ^ MSR_NXE); @@ -1026,6 +1032,7 @@ OslpMain ( __writemsr(MSR_IA32_MISC_ENABLE, MiscMsr.QuadPart); } +#endif /* Go back */ return Status; } @@ -1073,6 +1080,7 @@ OslMain ( goto Quickie; } +#if !defined(_M_ARM) /* Check if CPUID 01h is supported */ if (BlArchIsCpuIdFunctionSupported(1)) { @@ -1085,6 +1093,7 @@ OslMain ( EfiPrintf(L"PAE Supported, but won't be used\r\n"); } } +#endif /* Setup the boot library parameters for this application */ BlSetupDefaultParameters(&LibraryParameters);

5 years

[reactos] 02/13: [CMAKE] Add explicit failure message Previously this would show up as dependency cycle

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28b866cc9c267554b49c2… commit 28b866cc9c267554b49c2f5542d1c5c7a1102c0d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 16:39:45 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:28:10 2019 +0200 [CMAKE] Add explicit failure message Previously this would show up as dependency cycle --- boot/freeldr/bootsect/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index ddcbf968018..411750ac7a0 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -30,5 +30,11 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR bootcd regtest) add_cd_file(TARGET isoboot DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all hybridcd) add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR bootcd regtest) - +elseif(ARCH STREQUAL "arm") + add_custom_target(fat + COMMAND exit 1 + COMMENT "arm fat target not implemented yet") + add_custom_target(fat32 + COMMAND exit 1 + COMMENT "arm fat32 target not implemented yet") endif()

5 years

[reactos] 01/13: [CMAKE] Some arm cmake fixes

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5dc79c963ec7e071f159… commit b5dc79c963ec7e071f1596247300a316d0cb9f76 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 18 16:14:16 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Aug 20 22:27:59 2019 +0200 [CMAKE] Some arm cmake fixes --- modules/rostests/apitests/crt/CMakeLists.txt | 2 +- sdk/include/ndk/tests/CMakeLists.txt | 32 +++++++++++++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/modules/rostests/apitests/crt/CMakeLists.txt b/modules/rostests/apitests/crt/CMakeLists.txt index 9525d2c02dd..8b253d21f66 100644 --- a/modules/rostests/apitests/crt/CMakeLists.txt +++ b/modules/rostests/apitests/crt/CMakeLists.txt @@ -6,6 +6,6 @@ endif() include(ntdll_crt_apitest.cmake) include(msvcrt_crt_apitest.cmake) -if(NOT ARCH STREQUAL "amd64") +if(NOT ARCH STREQUAL "amd64" AND NOT ARCH STREQUAL "arm") include(crtdll_crt_apitest.cmake) endif() diff --git a/sdk/include/ndk/tests/CMakeLists.txt b/sdk/include/ndk/tests/CMakeLists.txt index bd9028a677e..324c657ceeb 100644 --- a/sdk/include/ndk/tests/CMakeLists.txt +++ b/sdk/include/ndk/tests/CMakeLists.txt @@ -1,20 +1,22 @@ if(ARCH STREQUAL "amd64") -add_library(ndk_tests - win2003_x64.c - winvista_x64.c - win7_x64.c - win8_x64.c - win81_x64.c - win10_x64.c) + add_library(ndk_tests + win2003_x64.c + winvista_x64.c + win7_x64.c + win8_x64.c + win81_x64.c + win10_x64.c) elseif(ARCH STREQUAL "i386") -add_library(ndk_tests - win2003_x86.c - winvista_x86.c - win7_x86.c - win8_x86.c - win81_x86.c - win10_x86.c) + add_library(ndk_tests + win2003_x86.c + winvista_x86.c + win7_x86.c + win8_x86.c + win81_x86.c + win10_x86.c) endif() -add_dependencies(ndk_tests xdk psdk bugcodes) +if(TARGET ndk_tests) + add_dependencies(ndk_tests xdk psdk bugcodes) +endif()

5 years

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

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 August 2019