Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 04/09: [NTOS:EX] Initialize ExpTimeRefreshLock
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b89a4eed72e96f337c360… commit b89a4eed72e96f337c36042a020cb6af6ebfbc9a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 9 15:48:48 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [NTOS:EX] Initialize ExpTimeRefreshLock --- ntoskrnl/ex/init.c | 1 + ntoskrnl/include/internal/ex.h | 1 + 2 files changed, 2 insertions(+) diff --git a/ntoskrnl/ex/init.c b/ntoskrnl/ex/init.c index 4dadddaa0c7..2953a442e35 100644 --- a/ntoskrnl/ex/init.c +++ b/ntoskrnl/ex/init.c @@ -649,6 +649,7 @@ ExpInitSystemPhase0(VOID) /* Initialize the Firmware Table resource and listhead */ InitializeListHead(&ExpFirmwareTableProviderListHead); ExInitializeResourceLite(&ExpFirmwareTableResource); + ExInitializeResourceLite(&ExpTimeRefreshLock); /* Set the suite mask to maximum and return */ ExSuiteMask = 0xFFFFFFFF; diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index a8273001523..66728280125 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -16,6 +16,7 @@ extern POBJECT_TYPE ExEventPairObjectType; extern POBJECT_TYPE _ExEventObjectType, _ExSemaphoreObjectType; extern FAST_MUTEX ExpEnvironmentLock; extern ERESOURCE ExpFirmwareTableResource; +extern ERESOURCE ExpTimeRefreshLock; extern LIST_ENTRY ExpFirmwareTableProviderListHead; extern BOOLEAN ExpIsWinPEMode; extern LIST_ENTRY ExpSystemResourcesList;

1 0

[reactos] 03/09: [KERNEL32] Fix a bug in GetVolumeNameForRoot
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb502bbc103f239b3d122… commit eb502bbc103f239b3d12230d7819f9a886a5ff71 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 15:44:03 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [KERNEL32] Fix a bug in GetVolumeNameForRoot --- dll/win32/kernel32/client/file/mntpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/file/mntpoint.c b/dll/win32/kernel32/client/file/mntpoint.c index badb519112f..362ed15be82 100644 --- a/dll/win32/kernel32/client/file/mntpoint.c +++ b/dll/win32/kernel32/client/file/mntpoint.c @@ -206,7 +206,7 @@ GetVolumeNameForRoot(IN LPCWSTR lpszRootPath, /* Make a string of it, to easy the checks */ SymbolicLink.Length = MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameLength; SymbolicLink.MaximumLength = SymbolicLink.Length; - SymbolicLink.Buffer = (PVOID)((ULONG_PTR)&MountPoints->MountPoints[CurrentMntPt] + MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameOffset); + SymbolicLink.Buffer = (PVOID)((ULONG_PTR)MountPoints + MountPoints->MountPoints[CurrentMntPt].SymbolicLinkNameOffset); /* If that's a NT volume name (GUID form), keep it! */ if (MOUNTMGR_IS_NT_VOLUME_NAME(&SymbolicLink)) {

1 0

[reactos] 02/09: [WS2_32_APITEST] Fix uninitialized variable
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=866918c7851aa21886f95… commit 866918c7851aa21886f951ebe2d5e80b9b20c1df Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 14 22:40:39 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [WS2_32_APITEST] Fix uninitialized variable --- modules/rostests/apitests/ws2_32/bind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ws2_32/bind.c b/modules/rostests/apitests/ws2_32/bind.c index 2ff5524db1e..83538c5ec5f 100644 --- a/modules/rostests/apitests/ws2_32/bind.c +++ b/modules/rostests/apitests/ws2_32/bind.c @@ -133,7 +133,7 @@ START_TEST(bind) int Error; CHAR LocalHostName[128]; struct hostent *Hostent; - IN_ADDR Address; + IN_ADDR Address = { 0 }; SOCKET Socket; struct sockaddr_in Addr = { AF_INET };

1 0

[reactos] 01/09: [CRT_APITEST] Restore direction flag to avoid false RTC break
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f71940efb17014a4cb7e5… commit f71940efb17014a4cb7e5c112cf7e7ae5a5f7011 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Aug 8 10:33:02 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 20:17:40 2022 +0200 [CRT_APITEST] Restore direction flag to avoid false RTC break With set direction flag the variables will not be initialized properly. --- modules/rostests/apitests/crt/strlen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/strlen.c b/modules/rostests/apitests/crt/strlen.c index 182dcf68ccf..7f0c9d7e6fe 100644 --- a/modules/rostests/apitests/crt/strlen.c +++ b/modules/rostests/apitests/crt/strlen.c @@ -48,8 +48,8 @@ Test_strlen(PFN_STRLEN pstrlen) eflags = __readeflags(); __writeeflags(eflags | EFLAGS_DF); len = pstrlen(teststr + 4); - eflags = __readeflags(); - ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); + ok((__readeflags() & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); + __writeeflags(eflags); /* Only test this for the exported versions, intrinsics might do it differently. It's up to us to not do fishy stuff! Also crtdll does

1 0

[reactos] 15/15: [CRT] Add simplistic fallback implementation of sincos to make GCC 11 happy
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dacbc603b691edf3c5b97… commit dacbc603b691edf3c5b97726e300b79f1ba87859 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 25 12:27:39 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Add simplistic fallback implementation of sincos to make GCC 11 happy --- sdk/lib/crt/math/math.cmake | 1 + sdk/lib/crt/math/sincos.c | 15 +++++++++++++++ sdk/lib/crt/msvcrtex.cmake | 1 + 3 files changed, 17 insertions(+) diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index b54c21b0a42..a888242644e 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -6,6 +6,7 @@ list(APPEND LIBCNTPR_MATH_SOURCE math/abs.c math/div.c math/labs.c + math/sincos.c ) if(ARCH STREQUAL "i386") diff --git a/sdk/lib/crt/math/sincos.c b/sdk/lib/crt/math/sincos.c new file mode 100644 index 00000000000..6c22e452906 --- /dev/null +++ b/sdk/lib/crt/math/sincos.c @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Fallback implementation of sincos + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <math.h> + +// This is a very simplistic implementation to make GCC 11 happy +void sincos(double x, double *s, double *c) +{ + *s = sin(x); + *c = cos(x); +} diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 272d844252e..d7a513012b4 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -3,6 +3,7 @@ include_directories(include/internal/mingw-w64) list(APPEND MSVCRTEX_SOURCE ${CRT_STARTUP_SOURCE} + math/sincos.c misc/dbgrpt.cpp misc/fltused.c misc/isblank.c

1 0

[reactos] 14/15: [CRT] Replace amd64 math functions/stubs with libm
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28c41b7d22130aeac1202… commit 28c41b7d22130aeac1202026e68365a85674587d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 23 17:37:14 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Replace amd64 math functions/stubs with libm --- sdk/lib/crt/float/amd64/logb.S | 17 ---- sdk/lib/crt/float/float.cmake | 1 - sdk/lib/crt/math/amd64/acos.S | 21 ----- sdk/lib/crt/math/amd64/acosf.S | 21 ----- sdk/lib/crt/math/amd64/atan.S | 22 ----- sdk/lib/crt/math/amd64/atan2.S | 22 ----- sdk/lib/crt/math/amd64/exp.S | 22 ----- sdk/lib/crt/math/amd64/ldexp.S | 21 ----- sdk/lib/crt/math/amd64/log.S | 21 ----- sdk/lib/crt/math/amd64/log10.S | 21 ----- sdk/lib/crt/math/amd64/pow.S | 22 ----- sdk/lib/crt/math/amd64/tan.S | 22 ----- sdk/lib/crt/math/libm_sse2/fmod.asm | 1 + sdk/lib/crt/math/libm_sse2/fmodf.asm | 1 + sdk/lib/crt/math/math.cmake | 156 +++++++++++++++++++++++++---------- 15 files changed, 115 insertions(+), 276 deletions(-) diff --git a/sdk/lib/crt/float/amd64/logb.S b/sdk/lib/crt/float/amd64/logb.S deleted file mode 100644 index 2cb4bb886ec..00000000000 --- a/sdk/lib/crt/float/amd64/logb.S +++ /dev/null @@ -1,17 +0,0 @@ - - -#include <asm.inc> - -.code64 - -PUBLIC _logb -FUNC _logb - .endprolog - - fld dword ptr [rsp + 8] - fxtract - fstp st - ret -ENDFUNC - -END diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index e4189362f64..24fe327fbd5 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -32,7 +32,6 @@ elseif(ARCH STREQUAL "amd64") ) list(APPEND CRT_FLOAT_ASM_SOURCE float/amd64/getsetfpcw.S - float/amd64/logb.S ) elseif(ARCH STREQUAL "arm") list(APPEND CRT_FLOAT_SOURCE diff --git a/sdk/lib/crt/math/amd64/acos.S b/sdk/lib/crt/math/amd64/acos.S deleted file mode 100644 index 23a90493d6d..00000000000 --- a/sdk/lib/crt/math/amd64/acos.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of acos - * FILE: lib/sdk/crt/math/amd64/acos.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC acos -acos: - UNIMPLEMENTED acos - ret - -END diff --git a/sdk/lib/crt/math/amd64/acosf.S b/sdk/lib/crt/math/amd64/acosf.S deleted file mode 100644 index fab952692bf..00000000000 --- a/sdk/lib/crt/math/amd64/acosf.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of acosf - * FILE: lib/sdk/crt/math/amd64/acosf.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC acosf -acosf: - UNIMPLEMENTED acos - ret - -END diff --git a/sdk/lib/crt/math/amd64/atan.S b/sdk/lib/crt/math/amd64/atan.S deleted file mode 100644 index b649ec0398a..00000000000 --- a/sdk/lib/crt/math/amd64/atan.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of atan - * FILE: lib/sdk/crt/math/amd64/atan.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC atan -atan: - UNIMPLEMENTED atan - ret - -END diff --git a/sdk/lib/crt/math/amd64/atan2.S b/sdk/lib/crt/math/amd64/atan2.S deleted file mode 100644 index bccaeaf9a3d..00000000000 --- a/sdk/lib/crt/math/amd64/atan2.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of atan2 - * FILE: lib/sdk/crt/math/amd64/atan2.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC atan2 -atan2: - UNIMPLEMENTED atan2 - ret - -END diff --git a/sdk/lib/crt/math/amd64/exp.S b/sdk/lib/crt/math/amd64/exp.S deleted file mode 100644 index 8fda82ba07b..00000000000 --- a/sdk/lib/crt/math/amd64/exp.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of exp - * FILE: lib/sdk/crt/math/amd64/exp.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC exp -exp: - UNIMPLEMENTED exp - ret - -END diff --git a/sdk/lib/crt/math/amd64/ldexp.S b/sdk/lib/crt/math/amd64/ldexp.S deleted file mode 100644 index 4635d754e27..00000000000 --- a/sdk/lib/crt/math/amd64/ldexp.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of ldexp - * FILE: lib/sdk/crt/math/amd64/ldexp.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC ldexp -ldexp: - UNIMPLEMENTED ldexp - ret - -END diff --git a/sdk/lib/crt/math/amd64/log.S b/sdk/lib/crt/math/amd64/log.S deleted file mode 100644 index f7ffc57f612..00000000000 --- a/sdk/lib/crt/math/amd64/log.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of log - * FILE: lib/sdk/crt/math/amd64/log.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC log -log: - UNIMPLEMENTED log - ret - -END diff --git a/sdk/lib/crt/math/amd64/log10.S b/sdk/lib/crt/math/amd64/log10.S deleted file mode 100644 index 5038d178530..00000000000 --- a/sdk/lib/crt/math/amd64/log10.S +++ /dev/null @@ -1,21 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of log10 - * FILE: lib/sdk/crt/math/amd64/log10.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC log10 -log10: - UNIMPLEMENTED log10 - ret - -END diff --git a/sdk/lib/crt/math/amd64/pow.S b/sdk/lib/crt/math/amd64/pow.S deleted file mode 100644 index fd8d104ee4e..00000000000 --- a/sdk/lib/crt/math/amd64/pow.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of pow - * FILE: lib/sdk/crt/math/amd64/pow.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC pow -pow: - UNIMPLEMENTED pow - ret - -END diff --git a/sdk/lib/crt/math/amd64/tan.S b/sdk/lib/crt/math/amd64/tan.S deleted file mode 100644 index 53d82877e86..00000000000 --- a/sdk/lib/crt/math/amd64/tan.S +++ /dev/null @@ -1,22 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of tan - * FILE: lib/sdk/crt/math/amd64/tan.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> -#include <ksamd64.inc> - -/* CODE **********************************************************************/ -.code64 - -PUBLIC tan -tan: - UNIMPLEMENTED tan - ret - -END diff --git a/sdk/lib/crt/math/libm_sse2/fmod.asm b/sdk/lib/crt/math/libm_sse2/fmod.asm index 7ba554671f8..cc1fb710997 100644 --- a/sdk/lib/crt/math/libm_sse2/fmod.asm +++ b/sdk/lib/crt/math/libm_sse2/fmod.asm @@ -68,6 +68,7 @@ X87XAM_BAD EQU MASK X87SW_E AND NOT 2 ; double fmod [double, double] ---------------------------------- +PUBLIC fmod fmod PROC FRAME sub rsp, 40 + 32 diff --git a/sdk/lib/crt/math/libm_sse2/fmodf.asm b/sdk/lib/crt/math/libm_sse2/fmodf.asm index b5685d7ba0d..5e7aa2578fd 100644 --- a/sdk/lib/crt/math/libm_sse2/fmodf.asm +++ b/sdk/lib/crt/math/libm_sse2/fmodf.asm @@ -68,6 +68,7 @@ X87XAM_BAD EQU MASK X87SW_E AND NOT 2 ; float fmodf [float, float] ------------------------------------ +PUBLIC fmodf fmodf PROC FRAME sub rsp, 40 + 32 diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 42fbc012bbe..b54c21b0a42 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -1,4 +1,6 @@ +include_directories(libm_sse2) + list(APPEND LIBCNTPR_MATH_SOURCE math/_invoke_matherr.c math/abs.c @@ -54,32 +56,97 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_MATH_SOURCE math/amd64/_set_statfp.c - math/ceil.c - math/cos.c - math/sin.c - math/floor.c + # math/libm_sse2/_chgsign.c + # math/libm_sse2/_chgsignf.c + # math/libm_sse2/_copysign.c + # math/libm_sse2/_copysignf.c + # math/libm_sse2/_finite.c + # math/libm_sse2/_finitef.c + math/libm_sse2/_handle_error.c + math/libm_sse2/acos.c + math/libm_sse2/acosf.c + math/libm_sse2/asin.c + math/libm_sse2/asinf.c + math/libm_sse2/atan.c + math/libm_sse2/atan2.c + math/libm_sse2/atan2f.c + math/libm_sse2/atanf.c + # math/libm_sse2/cabs.c + # math/libm_sse2/cabsf.c + math/libm_sse2/ceil.c + math/libm_sse2/ceilf.c + math/libm_sse2/cosh.c + math/libm_sse2/coshf.c + math/libm_sse2/exp_special.c + math/libm_sse2/exp2.c + math/libm_sse2/floor.c + math/libm_sse2/floorf.c + math/libm_sse2/fma3_available.c + math/libm_sse2/hypot.c + math/libm_sse2/hypotf.c + math/libm_sse2/L2_by_pi_bits.c + math/libm_sse2/ldexp.c + # math/libm_sse2/ldexpf.c + math/libm_sse2/log_128_lead_tail_table.c + math/libm_sse2/log_256_lead_tail_table.c + math/libm_sse2/log_F_inv_dword_table.c + math/libm_sse2/log_F_inv_qword_table.c + math/libm_sse2/log_special.c + math/libm_sse2/log10_128_lead_tail_table.c + math/libm_sse2/log10_256_lead_tail_table.c + math/libm_sse2/logb.c + math/libm_sse2/logbf.c + math/libm_sse2/Lsincos_array.c + math/libm_sse2/Lsincosf_array.c + math/libm_sse2/modf.c + math/libm_sse2/modff.c + math/libm_sse2/pow_special.c + # math/libm_sse2/remainder.c + math/libm_sse2/remainder_piby2.c + # math/libm_sse2/remainder_piby2f.c + # math/libm_sse2/remainderf.c + math/libm_sse2/sincos_special.c + math/libm_sse2/sinh.c + math/libm_sse2/sinhf.c + math/libm_sse2/sqrt.c + math/libm_sse2/sqrtf.c + math/libm_sse2/tan.c + math/libm_sse2/tanf.c + math/libm_sse2/tanh.c + math/libm_sse2/tanhf.c + math/libm_sse2/two_to_jby64_head_tail_table.c + math/libm_sse2/two_to_jby64_table.c ) list(APPEND LIBCNTPR_MATH_ASM_SOURCE - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/exp.S + math/libm_sse2/fm.inc + math/libm_sse2/cos.asm + math/libm_sse2/cosf.asm + math/libm_sse2/exp.asm + math/libm_sse2/expf.asm math/amd64/fabs.S math/amd64/fabsf.S - math/amd64/fmod.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/tan.S + math/libm_sse2/fmod.asm + math/libm_sse2/fmodf.asm + math/libm_sse2/log.asm + math/libm_sse2/log10.asm + math/libm_sse2/pow.asm + math/libm_sse2/remainder_piby2_forAsm.asm + math/libm_sse2/remainder_piby2_forFMA3.asm + math/libm_sse2/remainder_piby2f_forAsm.asm + math/libm_sse2/remainder_piby2f_forC.asm + math/libm_sse2/sin.asm + math/libm_sse2/sinf.asm ) elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_MATH_SOURCE math/cos.c + math/ceilf.c math/fabs.c math/fabsf.c + math/floorf.c math/sin.c math/sqrt.c + math/sqrtf.c math/arm/__rt_sdiv.c math/arm/__rt_sdiv64_worker.c math/arm/__rt_udiv.c @@ -96,6 +163,22 @@ elseif(ARCH STREQUAL "arm") math/arm/__u64tos.c math/arm/__64tof.h ) + list(APPEND CRT_MATH_SOURCE + math/_hypotf.c + math/acosf.c + math/asinf.c + math/atan2f.c + math/atanf.c + math/coshf.c + math/expf.c + math/fabsf.c + math/fmodf.c + math/modff.c + math/sinf.c + math/sinhf.c + math/tanf.c + math/tanhf.c + ) list(APPEND LIBCNTPR_MATH_ASM_SOURCE math/arm/atan.s math/arm/atan2.s @@ -121,40 +204,32 @@ if(NOT ARCH STREQUAL "i386") list(APPEND CRT_MATH_SOURCE math/_chgsignf.c math/_copysignf.c - math/_hypotf.c - math/acosf.c - math/asinf.c - math/atan2f.c - math/atanf.c - math/ceilf.c - math/cos.c - math/coshf.c - math/expf.c - math/floorf.c - math/fmodf.c math/log10f.c - math/modff.c - math/sin.c - math/sinhf.c - math/sqrtf.c - math/tanf.c - math/tanhf.c math/stubs.c ) endif() +if(NOT ARCH STREQUAL "amd64") + list(APPEND CRT_MATH_SOURCE + math/acos.c + math/asin.c + math/cosh.c + math/cosf.c + math/hypot.c + math/modf.c + math/s_modf.c + math/sinh.c + math/tanh.c + ) +endif() + list(APPEND CRT_MATH_SOURCE ${LIBCNTPR_MATH_SOURCE} - math/acos.c math/adjust.c - math/asin.c math/cabs.c - math/cosf.c - math/cosh.c math/fdivbug.c math/frexp.c math/huge_val.c - math/hypot.c math/ieee754/j0_y0.c math/ieee754/j1_y1.c math/ieee754/jn_yn.c @@ -163,13 +238,8 @@ list(APPEND CRT_MATH_SOURCE math/jn_yn.c math/ldiv.c math/logf.c - math/modf.c math/powf.c math/rand.c - math/s_modf.c - math/sinf.c - math/sinh.c - math/tanh.c ) list(APPEND CRT_MATH_ASM_SOURCE @@ -183,7 +253,7 @@ list(APPEND LIBCNTPR_MATH_SOURCE if(ARCH STREQUAL "i386") list(APPEND ATAN2_ASM_SOURCE math/i386/atan2_asm.s) elseif(ARCH STREQUAL "amd64") - list(APPEND ATAN2_ASM_SOURCE math/amd64/atan2.S) + list(APPEND ATAN2_SOURCE math/_invoke_matherr.c math/amd64/_set_statfp.c math/libm_sse2/_handle_error.c math/libm_sse2/atan2.c) elseif(ARCH STREQUAL "arm") list(APPEND ATAN2_ASM_SOURCE math/arm/atan2.s) elseif(ARCH STREQUAL "arm64") @@ -191,6 +261,6 @@ elseif(ARCH STREQUAL "arm64") endif() add_asm_files(atan2_asm ${ATAN2_ASM_SOURCE}) -add_library(atan2 ${atan2_asm}) +add_library(atan2 ${ATAN2_SOURCE} ${atan2_asm}) set_target_properties(atan2 PROPERTIES LINKER_LANGUAGE "C") add_dependencies(atan2 asm)

1 0

[reactos] 13/15: [FREELDR] Add stubs for pow and log to avoid pulling in the data from CRT (maybe fix printf functions instead?)
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20e6e17070aee00a80568… commit 20e6e17070aee00a80568345959431cd887063ab Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jul 10 16:46:04 2022 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [FREELDR] Add stubs for pow and log to avoid pulling in the data from CRT (maybe fix printf functions instead?) --- boot/freeldr/freeldr/freeldr.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index c31f5eab3a2..16af2375097 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -98,3 +98,29 @@ int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags) { return _isctype((char)wc, wctypeFlags); } + +#ifdef _MSC_VER +#pragma warning(disable:4164) +#pragma function(pow) +#pragma function(log) +#pragma function(log10) +#endif + +// Stubs to avoid pulling in data from CRT +double pow(double x, double y) +{ + __debugbreak(); + return 0.0; +} + +double log(double x) +{ + __debugbreak(); + return 0.0; +} + +double log10(double x) +{ + __debugbreak(); + return 0.0; +}

1 0

[reactos] 12/15: [CRT] Add basic version of handle_error
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1ad4106b84adb448bd95e… commit 1ad4106b84adb448bd95eeb651d8c3dad486e5c4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jun 18 10:19:18 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Add basic version of handle_error --- sdk/lib/crt/math/libm_sse2/_handle_error.c | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/sdk/lib/crt/math/libm_sse2/_handle_error.c b/sdk/lib/crt/math/libm_sse2/_handle_error.c new file mode 100644 index 00000000000..4d679a292ea --- /dev/null +++ b/sdk/lib/crt/math/libm_sse2/_handle_error.c @@ -0,0 +1,72 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Implementation of _handle_error / _handle_errorf for libm + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <math.h> + +int +__cdecl +_invoke_matherr( + int type, + char* name, + double arg1, + double arg2, + double retval); + +/*! + * @brief Handles an error condition. + * @param fname - The name of the function that caused the error. + * @param opcode - Opcode of the function that cause the error (see OP_* consants in fpieee.h). + * @param value - The value to be returned, encoded as uint64_t. + * @param type - The type of error (see _DOMAIN, ... in math.h) + * @param flags - Exception flags (see AMD_F_* constants). + * @param error - Specifies the CRT error code (EDOM, ...). + * @param arg1 - First parameter to the function that cause the error. + * @param arg2 - Second parameter to the function that cause the error. + * @param nargs - Number of parameters to the function that cause the error. + * @return The value to be returned. + */ +double +__cdecl +_handle_error( + char *fname, + int opcode, + unsigned long long value, + int type, + int flags, + int error, + double arg1, + double arg2, + int nargs) +{ + float retval = *(double*)&value; + + _invoke_matherr(type, fname, arg1, arg2, retval); + + return retval; +} + + + +float +__cdecl +_handle_errorf( + char *fname, + int opcode, + unsigned long long value, + int type, + int flags, + int error, + float arg1, + float arg2, + int nargs) +{ + float retval = *(float*)&value; + + _invoke_matherr(type, fname, arg1, arg2, retval); + + return retval; +}

1 0

[reactos] 11/15: [CRT] Improve _matherr handling
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d497ca883370811e83f9… commit 3d497ca883370811e83f99d5e6f23782788cc635 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Aug 23 23:36:33 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Improve _matherr handling --- sdk/lib/crt/math/{usermatherr.c => _invoke_matherr.c} | 19 ++++++++++++++----- sdk/lib/crt/math/math.cmake | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sdk/lib/crt/math/usermatherr.c b/sdk/lib/crt/math/_invoke_matherr.c similarity index 59% rename from sdk/lib/crt/math/usermatherr.c rename to sdk/lib/crt/math/_invoke_matherr.c index 283a42cd5d0..e36b349bcdc 100644 --- a/sdk/lib/crt/math/usermatherr.c +++ b/sdk/lib/crt/math/_invoke_matherr.c @@ -1,12 +1,10 @@ /* * PROJECT: ReactOS CRT library * LICENSE: MIT (https://spdx.org/licenses/MIT) - * PURPOSE: Implementation of __setusermatherr and _invoke_user_matherr + * PURPOSE: Implementation of _invoke_matherr and __setusermatherr * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ -// DO NOT SYNC WITH WINE OR MINGW32 - #include <math.h> /* MS headers have this in corecrt_startup.h */ @@ -23,11 +21,22 @@ __setusermatherr(_UserMathErrorFunctionPointer func) int __cdecl -_invoke_user_matherr(struct _exception *e) +_invoke_matherr( + int type, + char* name, + double arg1, + double arg2, + double retval) { if (user_matherr != NULL) { - return user_matherr(e); + struct _exception excpt; + excpt.type = type; + excpt.name = name; + excpt.arg1 = arg1; + excpt.arg2 = arg2; + excpt.retval = retval; + return user_matherr(&excpt); } else { diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index e50d2bfa680..42fbc012bbe 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -1,9 +1,9 @@ list(APPEND LIBCNTPR_MATH_SOURCE + math/_invoke_matherr.c math/abs.c math/div.c math/labs.c - math/usermatherr.c ) if(ARCH STREQUAL "i386")

1 0

[reactos] 10/15: [CRT] Implement _set_statfp
by Timo Kreuzer 01 Dec '22

01 Dec '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d50f8141925c1fb3cb1c… commit 4d50f8141925c1fb3cb1c37b94fe7c8ddc464dcc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 12 20:01:53 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Dec 1 15:21:59 2022 +0200 [CRT] Implement _set_statfp --- sdk/lib/crt/math/amd64/_set_statfp.c | 15 +++++++++++++++ sdk/lib/crt/math/math.cmake | 1 + 2 files changed, 16 insertions(+) diff --git a/sdk/lib/crt/math/amd64/_set_statfp.c b/sdk/lib/crt/math/amd64/_set_statfp.c new file mode 100644 index 00000000000..0bf0f62973e --- /dev/null +++ b/sdk/lib/crt/math/amd64/_set_statfp.c @@ -0,0 +1,15 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 implementation of _set_statfp + * COPYRIGHT: Copyright 2022 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <xmmintrin.h> + +__ATTRIBUTE_SSE__ +void _set_statfp(uintptr_t mask) +{ + unsigned int csr = _mm_getcsr(); + _mm_setcsr((mask & _MM_EXCEPT_MASK) | csr); +} diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index 7cc7a795447..e50d2bfa680 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -53,6 +53,7 @@ if(ARCH STREQUAL "i386") ) elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_MATH_SOURCE + math/amd64/_set_statfp.c math/ceil.c math/cos.c math/sin.c

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