Ros-diffs June 2022

ros-diffs@reactos.org

17 participants
236 discussions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b7c6170a5fa1071f73741… commit b7c6170a5fa1071f73741c8f862da2578b57abe6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 12 20:01:16 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 26 19:59:41 2022 +0200 [CRT] Add emmintrin.h Implementations are taken from clang. --- sdk/include/crt/emmintrin.h | 1914 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1907 insertions(+), 7 deletions(-) diff --git a/sdk/include/crt/emmintrin.h b/sdk/include/crt/emmintrin.h index 87ae2058d86..21e6ece0c6a 100644 --- a/sdk/include/crt/emmintrin.h +++ b/sdk/include/crt/emmintrin.h @@ -1,7 +1,10 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. +/*===---- emmintrin.h - SSE2 intrinsics ------------------------------------=== + * + * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. + * See https://llvm.org/LICENSE.txt for license information. + * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + * + *===-----------------------------------------------------------------------=== */ #pragma once @@ -11,6 +14,8 @@ #include <crtdefs.h> #include <xmmintrin.h> +#if defined(_MSC_VER) && !defined(__clang__) + typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128i { __int8 m128i_i8[16]; @@ -29,13 +34,1908 @@ typedef struct _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128d double m128d_f64[2]; } __m128d; -extern __m128d _mm_load_sd(double const*); +typedef __declspec(align(1)) __m128i __m128i_u; + +#define __ATTRIBUTE_SSE2__ + +#else /* _MSC_VER */ + +typedef double __m128d __attribute__((__vector_size__(16), __aligned__(16))); +typedef long long __m128i __attribute__((__vector_size__(16), __aligned__(16))); + +typedef double __m128d_u __attribute__((__vector_size__(16), __aligned__(1))); +typedef long long __m128i_u __attribute__((__vector_size__(16), __aligned__(1))); + +/* Type defines. */ +typedef double __v2df __attribute__((__vector_size__(16))); +typedef long long __v2di __attribute__((__vector_size__(16))); +typedef short __v8hi __attribute__((__vector_size__(16))); +typedef char __v16qi __attribute__((__vector_size__(16))); + +/* Unsigned types */ +typedef unsigned long long __v2du __attribute__((__vector_size__(16))); +typedef unsigned short __v8hu __attribute__((__vector_size__(16))); +typedef unsigned char __v16qu __attribute__((__vector_size__(16))); + +/* We need an explicitly signed variant for char. Note that this shouldn't + * appear in the interface though. */ +typedef signed char __v16qs __attribute__((__vector_size__(16))); -extern int _mm_cvtsd_si32(__m128d); +#ifdef __clang__ +#define __ATTRIBUTE_SSE2__ __attribute__((__target__("sse2"),__min_vector_width__(128))) +#else +#define __ATTRIBUTE_SSE2__ __attribute__((__target__("sse2"))) +#endif +#define __INTRIN_INLINE_SSE2 __INTRIN_INLINE __ATTRIBUTE_SSE2__ +#endif /* _MSC_VER */ + +extern __m128d _mm_add_sd(__m128d a, __m128d b); +extern __m128d _mm_add_pd(__m128d a, __m128d b); +extern __m128d _mm_sub_sd(__m128d a, __m128d b); +extern __m128d _mm_sub_pd(__m128d a, __m128d b); +extern __m128d _mm_mul_sd(__m128d a, __m128d b); +extern __m128d _mm_mul_pd(__m128d a, __m128d b); +extern __m128d _mm_div_sd(__m128d a, __m128d b); +extern __m128d _mm_div_pd(__m128d a, __m128d b); +extern __m128d _mm_sqrt_sd(__m128d a, __m128d b); +extern __m128d _mm_sqrt_pd(__m128d a); +extern __m128d _mm_min_sd(__m128d a, __m128d b); +extern __m128d _mm_min_pd(__m128d a, __m128d b); +extern __m128d _mm_max_sd(__m128d a, __m128d b); +extern __m128d _mm_max_pd(__m128d a, __m128d b); +extern __m128d _mm_and_pd(__m128d a, __m128d b); +extern __m128d _mm_andnot_pd(__m128d a, __m128d b); +extern __m128d _mm_or_pd(__m128d a, __m128d b); +extern __m128d _mm_xor_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpeq_pd(__m128d a, __m128d b); +extern __m128d _mm_cmplt_pd(__m128d a, __m128d b); +extern __m128d _mm_cmple_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpgt_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpge_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpord_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpunord_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpneq_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpnlt_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpnle_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpngt_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpnge_pd(__m128d a, __m128d b); +extern __m128d _mm_cmpeq_sd(__m128d a, __m128d b); +extern __m128d _mm_cmplt_sd(__m128d a, __m128d b); +extern __m128d _mm_cmple_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpgt_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpge_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpord_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpunord_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpneq_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpnlt_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpnle_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpngt_sd(__m128d a, __m128d b); +extern __m128d _mm_cmpnge_sd(__m128d a, __m128d b); +extern int _mm_comieq_sd(__m128d a, __m128d b); +extern int _mm_comilt_sd(__m128d a, __m128d b); +extern int _mm_comile_sd(__m128d a, __m128d b); +extern int _mm_comigt_sd(__m128d a, __m128d b); +extern int _mm_comige_sd(__m128d a, __m128d b); +extern int _mm_comineq_sd(__m128d a, __m128d b); +extern int _mm_ucomieq_sd(__m128d a, __m128d b); +extern int _mm_ucomilt_sd(__m128d a, __m128d b); +extern int _mm_ucomile_sd(__m128d a, __m128d b); +extern int _mm_ucomigt_sd(__m128d a, __m128d b); +extern int _mm_ucomige_sd(__m128d a, __m128d b); +extern int _mm_ucomineq_sd(__m128d a, __m128d b); +extern __m128 _mm_cvtpd_ps(__m128d a); +extern __m128d _mm_cvtps_pd(__m128 a); +extern __m128d _mm_cvtepi32_pd(__m128i a); +extern __m128i _mm_cvtpd_epi32(__m128d a); +extern int _mm_cvtsd_si32(__m128d a); +extern __m128 _mm_cvtsd_ss(__m128 a, __m128d b); +extern __m128d _mm_cvtsi32_sd(__m128d a, int b); +extern __m128d _mm_cvtss_sd(__m128d a, __m128 b); +extern __m128i _mm_cvttpd_epi32(__m128d a); +extern int _mm_cvttsd_si32(__m128d a); +extern __m64 _mm_cvtpd_pi32(__m128d a); +extern __m64 _mm_cvttpd_pi32(__m128d a); +extern __m128d _mm_cvtpi32_pd(__m64 a); +extern double _mm_cvtsd_f64(__m128d a); +extern __m128d _mm_load_pd(double const *dp); +extern __m128d _mm_load1_pd(double const *dp); +extern __m128d _mm_loadr_pd(double const *dp); +extern __m128d _mm_loadu_pd(double const *dp); +//extern __m128i _mm_loadu_si64(void const *a); +//extern __m128i _mm_loadu_si32(void const *a); +//extern __m128i _mm_loadu_si16(void const *a); +extern __m128d _mm_load_sd(double const *dp); +extern __m128d _mm_loadh_pd(__m128d a, double const *dp); +extern __m128d _mm_loadl_pd(__m128d a, double const *dp); +//extern __m128d _mm_undefined_pd(void); +extern __m128d _mm_set_sd(double w); +extern __m128d _mm_set1_pd(double w); +extern __m128d _mm_set_pd(double w, double x); +extern __m128d _mm_setr_pd(double w, double x); +extern __m128d _mm_setzero_pd(void); +extern __m128d _mm_move_sd(__m128d a, __m128d b); +extern void _mm_store_sd(double *dp, __m128d a); +extern void _mm_store_pd(double *dp, __m128d a); +extern void _mm_store1_pd(double *dp, __m128d a); +extern void _mm_storeu_pd(double *dp, __m128d a); +extern void _mm_storer_pd(double *dp, __m128d a); +extern void _mm_storeh_pd(double *dp, __m128d a); +extern void _mm_storel_pd(double *dp, __m128d a); +extern __m128i _mm_add_epi8(__m128i a, __m128i b); +extern __m128i _mm_add_epi16(__m128i a, __m128i b); +extern __m128i _mm_add_epi32(__m128i a, __m128i b); +extern __m64 _mm_add_si64(__m64 a, __m64 b); +extern __m128i _mm_add_epi64(__m128i a, __m128i b); +extern __m128i _mm_adds_epi8(__m128i a, __m128i b); +extern __m128i _mm_adds_epi16(__m128i a, __m128i b); +extern __m128i _mm_adds_epu8(__m128i a, __m128i b); +extern __m128i _mm_adds_epu16(__m128i a, __m128i b); +extern __m128i _mm_avg_epu8(__m128i a, __m128i b); +extern __m128i _mm_avg_epu16(__m128i a, __m128i b); +extern __m128i _mm_madd_epi16(__m128i a, __m128i b); +extern __m128i _mm_max_epi16(__m128i a, __m128i b); +extern __m128i _mm_max_epu8(__m128i a, __m128i b); +extern __m128i _mm_min_epi16(__m128i a, __m128i b); +extern __m128i _mm_min_epu8(__m128i a, __m128i b); +extern __m128i _mm_mulhi_epi16(__m128i a, __m128i b); +extern __m128i _mm_mulhi_epu16(__m128i a, __m128i b); +extern __m128i _mm_mullo_epi16(__m128i a, __m128i b); +extern __m64 _mm_mul_su32(__m64 a, __m64 b); +extern __m128i _mm_mul_epu32(__m128i a, __m128i b); +extern __m128i _mm_sad_epu8(__m128i a, __m128i b); +extern __m128i _mm_sub_epi8(__m128i a, __m128i b); +extern __m128i _mm_sub_epi16(__m128i a, __m128i b); +extern __m128i _mm_sub_epi32(__m128i a, __m128i b); +extern __m64 _mm_sub_si64(__m64 a, __m64 b); +extern __m128i _mm_sub_epi64(__m128i a, __m128i b); +extern __m128i _mm_subs_epi8(__m128i a, __m128i b); +extern __m128i _mm_subs_epi16(__m128i a, __m128i b); +extern __m128i _mm_subs_epu8(__m128i a, __m128i b); +extern __m128i _mm_subs_epu16(__m128i a, __m128i b); +extern __m128i _mm_and_si128(__m128i a, __m128i b); +extern __m128i _mm_andnot_si128(__m128i a, __m128i b); +extern __m128i _mm_or_si128(__m128i a, __m128i b); +extern __m128i _mm_xor_si128(__m128i a, __m128i b); +extern __m128i _mm_slli_si128(__m128i a, int i); +extern __m128i _mm_slli_epi16(__m128i a, int count); +extern __m128i _mm_sll_epi16(__m128i a, __m128i count); +extern __m128i _mm_slli_epi32(__m128i a, int count); +extern __m128i _mm_sll_epi32(__m128i a, __m128i count); +extern __m128i _mm_slli_epi64(__m128i a, int count); +extern __m128i _mm_sll_epi64(__m128i a, __m128i count); +extern __m128i _mm_srai_epi16(__m128i a, int count); +extern __m128i _mm_sra_epi16(__m128i a, __m128i count); +extern __m128i _mm_srai_epi32(__m128i a, int count); +extern __m128i _mm_sra_epi32(__m128i a, __m128i count); +extern __m128i _mm_srli_si128(__m128i a, int imm); +extern __m128i _mm_srli_epi16(__m128i a, int count); +extern __m128i _mm_srl_epi16(__m128i a, __m128i count); +extern __m128i _mm_srli_epi32(__m128i a, int count); +extern __m128i _mm_srl_epi32(__m128i a, __m128i count); +extern __m128i _mm_srli_epi64(__m128i a, int count); +extern __m128i _mm_srl_epi64(__m128i a, __m128i count); +extern __m128i _mm_cmpeq_epi8(__m128i a, __m128i b); +extern __m128i _mm_cmpeq_epi16(__m128i a, __m128i b); +extern __m128i _mm_cmpeq_epi32(__m128i a, __m128i b); +extern __m128i _mm_cmpgt_epi8(__m128i a, __m128i b); +extern __m128i _mm_cmpgt_epi16(__m128i a, __m128i b); +extern __m128i _mm_cmpgt_epi32(__m128i a, __m128i b); +extern __m128i _mm_cmplt_epi8(__m128i a, __m128i b); +extern __m128i _mm_cmplt_epi16(__m128i a, __m128i b); +extern __m128i _mm_cmplt_epi32(__m128i a, __m128i b); +#ifdef _M_AMD64 +extern __m128d _mm_cvtsi64_sd(__m128d a, long long b); +extern long long _mm_cvtsd_si64(__m128d a); +extern long long _mm_cvttsd_si64(__m128d a); +#endif +extern __m128 _mm_cvtepi32_ps(__m128i a); +extern __m128i _mm_cvtps_epi32(__m128 a); +extern __m128i _mm_cvttps_epi32(__m128 a); +extern __m128i _mm_cvtsi32_si128(int a); +#ifdef _M_AMD64 +extern __m128i _mm_cvtsi64_si128(long long a); +#endif +extern int _mm_cvtsi128_si32(__m128i a); +#ifdef _M_AMD64 +extern long long _mm_cvtsi128_si64(__m128i a); +#endif +extern __m128i _mm_load_si128(__m128i const *p); +extern __m128i _mm_loadu_si128(__m128i_u const *p); +extern __m128i _mm_loadl_epi64(__m128i_u const *p); +//extern __m128i _mm_undefined_si128(void); +//extern __m128i _mm_set_epi64x(long long q1, long long q0); // FIXME +extern __m128i _mm_set_epi64(__m64 q1, __m64 q0); +//extern __m128i _mm_set_epi32(int i3, int i1, int i0); +extern __m128i _mm_set_epi32(int i3, int i2, int i1, int i0); +//extern __m128i _mm_set_epi16(short w7, short w2, short w1, short w0); +extern __m128i _mm_set_epi16(short w7, short w6, short w5, short w4, short w3, short w2, short w1, short w0); +//extern __m128i _mm_set_epi8(char b15, char b10, char b4, char b3, char b2, char b1, char b0); +extern __m128i _mm_set_epi8(char b15, char b14, char b13, char b12, char b11, char b10, char b9, char b8, char b7, char b6, char b5, char b4, char b3, char b2, char b1, char b0); +//extern __m128i _mm_set1_epi64x(long long q); // FIXME +extern __m128i _mm_set1_epi64(__m64 q); +extern __m128i _mm_set1_epi32(int i); +extern __m128i _mm_set1_epi16(short w); +extern __m128i _mm_set1_epi8(char b); +extern __m128i _mm_setl_epi64(__m128i q); // FIXME: clang? +extern __m128i _mm_setr_epi64(__m64 q0, __m64 q1); +//extern __m128i _mm_setr_epi32(int i0, int i2, int i3); +extern __m128i _mm_setr_epi32(int i0, int i1, int i2, int i3); +//extern __m128i _mm_setr_epi16(short w0, short w5, short w6, short w7); +extern __m128i _mm_setr_epi16(short w0, short w1, short w2, short w3, short w4, short w5, short w6, short w7); +//extern __m128i _mm_setr_epi8(char b0, char b6, char b11, char b12, char b13, char b14, char b15); +extern __m128i _mm_setr_epi8(char b15, char b14, char b13, char b12, char b11, char b10, char b9, char b8, char b7, char b6, char b5, char b4, char b3, char b2, char b1, char b0); extern __m128i _mm_setzero_si128(void); +extern void _mm_store_si128(__m128i *p, __m128i b); +extern void _mm_storeu_si128(__m128i_u *p, __m128i b); +//extern void _mm_storeu_si64(void *p, __m128i b); +//extern void _mm_storeu_si32(void *p, __m128i b); +//extern void _mm_storeu_si16(void *p, __m128i b); +extern void _mm_maskmoveu_si128(__m128i d, __m128i n, _Out_writes_bytes_(16) char *p); +extern void _mm_storel_epi64(__m128i_u *p, __m128i a); +extern void _mm_stream_pd(double *p, __m128d a); +extern void _mm_stream_si128(__m128i *p, __m128i a); +extern void _mm_stream_si32(int *p, int a); +extern void _mm_clflush(void const *p); +extern void _mm_lfence(void); +extern void _mm_mfence(void); +extern __m128i _mm_packs_epi16(__m128i a, __m128i b); +extern __m128i _mm_packs_epi32(__m128i a, __m128i b); +extern __m128i _mm_packus_epi16(__m128i a, __m128i b); +extern int _mm_extract_epi16(__m128i a, int imm); +extern __m128i _mm_insert_epi16(__m128i a, int b, int imm); +extern int _mm_movemask_epi8(__m128i a); +extern __m128i _mm_shuffle_epi32(__m128i a, int imm); +extern __m128i _mm_shufflelo_epi16(__m128i a, int imm); +extern __m128i _mm_shufflehi_epi16(__m128i a, int imm); +extern __m128i _mm_unpackhi_epi8(__m128i a, __m128i b); +extern __m128i _mm_unpackhi_epi16(__m128i a, __m128i b); +extern __m128i _mm_unpackhi_epi32(__m128i a, __m128i b); +extern __m128i _mm_unpackhi_epi64(__m128i a, __m128i b); +extern __m128i _mm_unpacklo_epi8(__m128i a, __m128i b); +extern __m128i _mm_unpacklo_epi16(__m128i a, __m128i b); +extern __m128i _mm_unpacklo_epi32(__m128i a, __m128i b); +extern __m128i _mm_unpacklo_epi64(__m128i a, __m128i b); +extern __m64 _mm_movepi64_pi64(__m128i a); +extern __m128i _mm_movpi64_epi64(__m64 a); +extern __m128i _mm_move_epi64(__m128i a); +extern __m128d _mm_unpackhi_pd(__m128d a, __m128d b); +extern __m128d _mm_unpacklo_pd(__m128d a, __m128d b); +extern int _mm_movemask_pd(__m128d a); +extern __m128d _mm_shuffle_pd(__m128d a, __m128d b, int imm); +extern __m128 _mm_castpd_ps(__m128d a); +extern __m128i _mm_castpd_si128(__m128d a); +extern __m128d _mm_castps_pd(__m128 a); +extern __m128i _mm_castps_si128(__m128 a); +extern __m128 _mm_castsi128_ps(__m128i a); +extern __m128d _mm_castsi128_pd(__m128i a); +void _mm_pause(void); + +/* Alternate names */ +#define _mm_set_pd1(a) _mm_set1_pd(a) +#define _mm_load_pd1(p) _mm_load1_pd(p) +#define _mm_store_pd1(p, a) _mm_store1_pd((p), (a)) +#define _mm_bslli_si128 _mm_slli_si128 +#define _mm_bsrli_si128 _mm_srli_si128 +#define _mm_stream_si64 _mm_stream_si64x + +#if defined(_MSC_VER) && !defined(__clang__) + +#pragma intrinsic(_mm_add_sd) +#pragma intrinsic(_mm_add_pd) +#pragma intrinsic(_mm_sub_sd) +#pragma intrinsic(_mm_sub_pd) +#pragma intrinsic(_mm_mul_sd) +#pragma intrinsic(_mm_mul_pd) +#pragma intrinsic(_mm_div_sd) +#pragma intrinsic(_mm_div_pd) +#pragma intrinsic(_mm_sqrt_sd) +#pragma intrinsic(_mm_sqrt_pd) +#pragma intrinsic(_mm_min_sd) +#pragma intrinsic(_mm_min_pd) +#pragma intrinsic(_mm_max_sd) +#pragma intrinsic(_mm_max_pd) +#pragma intrinsic(_mm_and_pd) +#pragma intrinsic(_mm_andnot_pd) +#pragma intrinsic(_mm_or_pd) +#pragma intrinsic(_mm_xor_pd) +#pragma intrinsic(_mm_cmpeq_pd) +#pragma intrinsic(_mm_cmplt_pd) +#pragma intrinsic(_mm_cmple_pd) +#pragma intrinsic(_mm_cmpgt_pd) +#pragma intrinsic(_mm_cmpge_pd) +#pragma intrinsic(_mm_cmpord_pd) +#pragma intrinsic(_mm_cmpunord_pd) +#pragma intrinsic(_mm_cmpneq_pd) +#pragma intrinsic(_mm_cmpnlt_pd) +#pragma intrinsic(_mm_cmpnle_pd) +#pragma intrinsic(_mm_cmpngt_pd) +#pragma intrinsic(_mm_cmpnge_pd) +#pragma intrinsic(_mm_cmpeq_sd) +#pragma intrinsic(_mm_cmplt_sd) +#pragma intrinsic(_mm_cmple_sd) +#pragma intrinsic(_mm_cmpgt_sd) +#pragma intrinsic(_mm_cmpge_sd) +#pragma intrinsic(_mm_cmpord_sd) +#pragma intrinsic(_mm_cmpunord_sd) +#pragma intrinsic(_mm_cmpneq_sd) +#pragma intrinsic(_mm_cmpnlt_sd) +#pragma intrinsic(_mm_cmpnle_sd) +#pragma intrinsic(_mm_cmpngt_sd) +#pragma intrinsic(_mm_cmpnge_sd) +#pragma intrinsic(_mm_comieq_sd) +#pragma intrinsic(_mm_comilt_sd) +#pragma intrinsic(_mm_comile_sd) +#pragma intrinsic(_mm_comigt_sd) +#pragma intrinsic(_mm_comige_sd) +#pragma intrinsic(_mm_comineq_sd) +#pragma intrinsic(_mm_ucomieq_sd) +#pragma intrinsic(_mm_ucomilt_sd) +#pragma intrinsic(_mm_ucomile_sd) +#pragma intrinsic(_mm_ucomigt_sd) +#pragma intrinsic(_mm_ucomige_sd) +#pragma intrinsic(_mm_ucomineq_sd) +#pragma intrinsic(_mm_cvtpd_ps) +#pragma intrinsic(_mm_cvtps_pd) +#pragma intrinsic(_mm_cvtepi32_pd) +#pragma intrinsic(_mm_cvtpd_epi32) +#pragma intrinsic(_mm_cvtsd_si32) +#pragma intrinsic(_mm_cvtsd_ss) +#pragma intrinsic(_mm_cvtsi32_sd) +#pragma intrinsic(_mm_cvtss_sd) +#pragma intrinsic(_mm_cvttpd_epi32) +#pragma intrinsic(_mm_cvttsd_si32) +//#pragma intrinsic(_mm_cvtpd_pi32) +//#pragma intrinsic(_mm_cvttpd_pi32) +//#pragma intrinsic(_mm_cvtpi32_pd) +#pragma intrinsic(_mm_cvtsd_f64) +#pragma intrinsic(_mm_load_pd) +#pragma intrinsic(_mm_load1_pd) +#pragma intrinsic(_mm_loadr_pd) +#pragma intrinsic(_mm_loadu_pd) +//#pragma intrinsic(_mm_loadu_si64) +//#pragma intrinsic(_mm_loadu_si32) +//#pragma intrinsic(_mm_loadu_si16) +#pragma intrinsic(_mm_load_sd) +#pragma intrinsic(_mm_loadh_pd) +#pragma intrinsic(_mm_loadl_pd) +//#pragma intrinsic(_mm_undefined_pd) +#pragma intrinsic(_mm_set_sd) +#pragma intrinsic(_mm_set1_pd) +#pragma intrinsic(_mm_set_pd) +#pragma intrinsic(_mm_setr_pd) +#pragma intrinsic(_mm_setzero_pd) +#pragma intrinsic(_mm_move_sd) +#pragma intrinsic(_mm_store_sd) +#pragma intrinsic(_mm_store_pd) +#pragma intrinsic(_mm_store1_pd) +#pragma intrinsic(_mm_storeu_pd) +#pragma intrinsic(_mm_storer_pd) +#pragma intrinsic(_mm_storeh_pd) +#pragma intrinsic(_mm_storel_pd) +#pragma intrinsic(_mm_add_epi8) +#pragma intrinsic(_mm_add_epi16) +#pragma intrinsic(_mm_add_epi32) +//#pragma intrinsic(_mm_add_si64) +#pragma intrinsic(_mm_add_epi64) +#pragma intrinsic(_mm_adds_epi8) +#pragma intrinsic(_mm_adds_epi16) +#pragma intrinsic(_mm_adds_epu8) +#pragma intrinsic(_mm_adds_epu16) +#pragma intrinsic(_mm_avg_epu8) +#pragma intrinsic(_mm_avg_epu16) +#pragma intrinsic(_mm_madd_epi16) +#pragma intrinsic(_mm_max_epi16) +#pragma intrinsic(_mm_max_epu8) +#pragma intrinsic(_mm_min_epi16) +#pragma intrinsic(_mm_min_epu8) +#pragma intrinsic(_mm_mulhi_epi16) +#pragma intrinsic(_mm_mulhi_epu16) +#pragma intrinsic(_mm_mullo_epi16) +//#pragma intrinsic(_mm_mul_su32) +#pragma intrinsic(_mm_mul_epu32) +#pragma intrinsic(_mm_sad_epu8) +#pragma intrinsic(_mm_sub_epi8) +#pragma intrinsic(_mm_sub_epi16) +#pragma intrinsic(_mm_sub_epi32) +//#pragma intrinsic(_mm_sub_si64) +#pragma intrinsic(_mm_sub_epi64) +#pragma intrinsic(_mm_subs_epi8) +#pragma intrinsic(_mm_subs_epi16) +#pragma intrinsic(_mm_subs_epu8) +#pragma intrinsic(_mm_subs_epu16) +#pragma intrinsic(_mm_and_si128) +#pragma intrinsic(_mm_andnot_si128) +#pragma intrinsic(_mm_or_si128) +#pragma intrinsic(_mm_xor_si128) +#pragma intrinsic(_mm_slli_si128) +#pragma intrinsic(_mm_slli_epi16) +#pragma intrinsic(_mm_sll_epi16) +#pragma intrinsic(_mm_slli_epi32) +#pragma intrinsic(_mm_sll_epi32) +#pragma intrinsic(_mm_slli_epi64) +#pragma intrinsic(_mm_sll_epi64) +#pragma intrinsic(_mm_srai_epi16) +#pragma intrinsic(_mm_sra_epi16) +#pragma intrinsic(_mm_srai_epi32) +#pragma intrinsic(_mm_sra_epi32) +#pragma intrinsic(_mm_srli_si128) +#pragma intrinsic(_mm_srli_epi16) +#pragma intrinsic(_mm_srl_epi16) +#pragma intrinsic(_mm_srli_epi32) +#pragma intrinsic(_mm_srl_epi32) +#pragma intrinsic(_mm_srli_epi64) +#pragma intrinsic(_mm_srl_epi64) +#pragma intrinsic(_mm_cmpeq_epi8) +#pragma intrinsic(_mm_cmpeq_epi16) +#pragma intrinsic(_mm_cmpeq_epi32) +#pragma intrinsic(_mm_cmpgt_epi8) +#pragma intrinsic(_mm_cmpgt_epi16) +#pragma intrinsic(_mm_cmpgt_epi32) +#pragma intrinsic(_mm_cmplt_epi8) +#pragma intrinsic(_mm_cmplt_epi16) +#pragma intrinsic(_mm_cmplt_epi32) +#ifdef _M_AMD64 +#pragma intrinsic(_mm_cvtsi64_sd) +#pragma intrinsic(_mm_cvtsd_si64) +#pragma intrinsic(_mm_cvttsd_si64) +#endif +#pragma intrinsic(_mm_cvtepi32_ps) +#pragma intrinsic(_mm_cvtps_epi32) +#pragma intrinsic(_mm_cvttps_epi32) +#pragma intrinsic(_mm_cvtsi32_si128) +#ifdef _M_AMD64 +#pragma intrinsic(_mm_cvtsi64_si128) +#endif +#pragma intrinsic(_mm_cvtsi128_si32) +#ifdef _M_AMD64 +#pragma intrinsic(_mm_cvtsi128_si64) +#endif +#pragma intrinsic(_mm_load_si128) +#pragma intrinsic(_mm_loadu_si128) +#pragma intrinsic(_mm_loadl_epi64) +//#pragma intrinsic(_mm_undefined_si128) +#pragma intrinsic(_mm_set_epi64x) +//#pragma intrinsic(_mm_set_epi64) +#pragma intrinsic(_mm_set_epi32) +#pragma intrinsic(_mm_set_epi16) +#pragma intrinsic(_mm_set_epi8) +#pragma intrinsic(_mm_set1_epi64x) +//#pragma intrinsic(_mm_set1_epi64) +#pragma intrinsic(_mm_set1_epi32) +#pragma intrinsic(_mm_set1_epi16) +#pragma intrinsic(_mm_set1_epi8) +#pragma intrinsic(_mm_setl_epi64) +//#pragma intrinsic(_mm_setr_epi64) +#pragma intrinsic(_mm_setr_epi32) +#pragma intrinsic(_mm_setr_epi16) +#pragma intrinsic(_mm_setr_epi8) +#pragma intrinsic(_mm_setzero_si128) +#pragma intrinsic(_mm_store_si128) +#pragma intrinsic(_mm_storeu_si128) +//#pragma intrinsic(_mm_storeu_si64) +//#pragma intrinsic(_mm_storeu_si32) +//#pragma intrinsic(_mm_storeu_si16) +#pragma intrinsic(_mm_maskmoveu_si128) +#pragma intrinsic(_mm_storel_epi64) +#pragma intrinsic(_mm_stream_pd) +#pragma intrinsic(_mm_stream_si128) +#pragma intrinsic(_mm_stream_si32) +#pragma intrinsic(_mm_clflush) +#pragma intrinsic(_mm_lfence) +#pragma intrinsic(_mm_mfence) +#pragma intrinsic(_mm_packs_epi16) +#pragma intrinsic(_mm_packs_epi32) +#pragma intrinsic(_mm_packus_epi16) +#pragma intrinsic(_mm_extract_epi16) +#pragma intrinsic(_mm_insert_epi16) +#pragma intrinsic(_mm_movemask_epi8) +#pragma intrinsic(_mm_shuffle_epi32) +#pragma intrinsic(_mm_shufflelo_epi16) +#pragma intrinsic(_mm_shufflehi_epi16) +#pragma intrinsic(_mm_unpackhi_epi8) +#pragma intrinsic(_mm_unpackhi_epi16) +#pragma intrinsic(_mm_unpackhi_epi32) +#pragma intrinsic(_mm_unpackhi_epi64) +#pragma intrinsic(_mm_unpacklo_epi8) +#pragma intrinsic(_mm_unpacklo_epi16) +#pragma intrinsic(_mm_unpacklo_epi32) +#pragma intrinsic(_mm_unpacklo_epi64) +//#pragma intrinsic(_mm_movepi64_pi64) +//#pragma intrinsic(_mm_movpi64_epi64) +#pragma intrinsic(_mm_move_epi64) +#pragma intrinsic(_mm_unpackhi_pd) +#pragma intrinsic(_mm_unpacklo_pd) +#pragma intrinsic(_mm_movemask_pd) +#pragma intrinsic(_mm_shuffle_pd) +#pragma intrinsic(_mm_castpd_ps) +#pragma intrinsic(_mm_castpd_si128) +#pragma intrinsic(_mm_castps_pd) +#pragma intrinsic(_mm_castps_si128) +#pragma intrinsic(_mm_castsi128_ps) +#pragma intrinsic(_mm_castsi128_pd) +#pragma intrinsic(_mm_pause) + +#else /* _MSC_VER */ + +/* + Clang: https://github.com/llvm/llvm-project/blob/main/clang/lib/Headers/emmintrin.h + Clang older version: https://github.com/llvm/llvm-project/blob/3ef88b31843e040c95f23ff2c3c206f1f… + unikraft: https://github.com/unikraft/lib-intel-intrinsics/blob/staging/include/emmin… +*/ + +__INTRIN_INLINE_SSE2 __m128d _mm_add_sd(__m128d a, __m128d b) +{ + a[0] += b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_add_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2df)a + (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_sub_sd(__m128d a, __m128d b) +{ + a[0] -= b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_sub_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2df)a - (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_mul_sd(__m128d a, __m128d b) +{ + a[0] *= b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_mul_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2df)a * (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_div_sd(__m128d a, __m128d b) +{ + a[0] /= b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_div_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2df)a / (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_sqrt_sd(__m128d a, __m128d b) +{ + __m128d __c = __builtin_ia32_sqrtsd((__v2df)b); + return __extension__(__m128d){__c[0], a[1]}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_sqrt_pd(__m128d a) +{ + return __builtin_ia32_sqrtpd((__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_min_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_minsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_min_pd(__m128d a, __m128d b) +{ + return __builtin_ia32_minpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_max_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_maxsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_max_pd(__m128d a, __m128d b) +{ + return __builtin_ia32_maxpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_and_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2du)a & (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_andnot_pd(__m128d a, __m128d b) +{ + return (__m128d)(~(__v2du)a & (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_or_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2du)a | (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_xor_pd(__m128d a, __m128d b) +{ + return (__m128d)((__v2du)a ^ (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpeq_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpeqpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmplt_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpltpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmple_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmplepd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpgt_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpltpd((__v2df)b, (__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpge_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmplepd((__v2df)b, (__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpord_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpordpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpunord_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpunordpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpneq_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpneqpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnlt_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnltpd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnle_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnlepd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpngt_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnltpd((__v2df)b, (__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnge_pd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnlepd((__v2df)b, (__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpeq_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpeqsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmplt_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpltsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmple_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmplesd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpgt_sd(__m128d a, __m128d b) +{ + __m128d __c = __builtin_ia32_cmpltsd((__v2df)b, (__v2df)a); + return __extension__(__m128d){__c[0], a[1]}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpge_sd(__m128d a, __m128d b) +{ + __m128d __c = __builtin_ia32_cmplesd((__v2df)b, (__v2df)a); + return __extension__(__m128d){__c[0], a[1]}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpord_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpordsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpunord_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpunordsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpneq_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpneqsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnlt_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnltsd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnle_sd(__m128d a, __m128d b) +{ + return (__m128d)__builtin_ia32_cmpnlesd((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpngt_sd(__m128d a, __m128d b) +{ + __m128d __c = __builtin_ia32_cmpnltsd((__v2df)b, (__v2df)a); + return __extension__(__m128d){__c[0], a[1]}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cmpnge_sd(__m128d a, __m128d b) +{ + __m128d __c = __builtin_ia32_cmpnlesd((__v2df)b, (__v2df)a); + return __extension__(__m128d){__c[0], a[1]}; +} + +__INTRIN_INLINE_SSE2 int _mm_comieq_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdeq((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_comilt_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdlt((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_comile_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdle((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_comigt_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdgt((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_comige_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdge((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_comineq_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_comisdneq((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomieq_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdeq((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomilt_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdlt((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomile_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdle((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomigt_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdgt((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomige_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdge((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 int _mm_ucomineq_sd(__m128d a, __m128d b) +{ + return __builtin_ia32_ucomisdneq((__v2df)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128 _mm_cvtpd_ps(__m128d a) +{ + return __builtin_ia32_cvtpd2ps((__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cvtps_pd(__m128 a) +{ +#if HAS_BUILTIN(__builtin_convertvector) + return (__m128d)__builtin_convertvector(__builtin_shufflevector((__v4sf)a, (__v4sf)a, 0, 1), __v2df); +#else + return __builtin_ia32_cvtps2pd(a); +#endif +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cvtepi32_pd(__m128i a) +{ +#if HAS_BUILTIN(__builtin_convertvector) + return (__m128d)__builtin_convertvector(__builtin_shufflevector((__v4si)a, (__v4si)a, 0, 1), __v2df); +#else + return __builtin_ia32_cvtdq2pd((__v4si)a); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvtpd_epi32(__m128d a) +{ + return (__m128i)__builtin_ia32_cvtpd2dq((__v2df)a); +} + +__INTRIN_INLINE_SSE2 int _mm_cvtsd_si32(__m128d a) +{ + return __builtin_ia32_cvtsd2si((__v2df)a); +} + +__INTRIN_INLINE_SSE2 __m128 _mm_cvtsd_ss(__m128 a, __m128d b) +{ + return (__m128)__builtin_ia32_cvtsd2ss((__v4sf)a, (__v2df)b); +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cvtsi32_sd(__m128d a, + int b) +{ + a[0] = b; + return a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_cvtss_sd(__m128d a, __m128 b) +{ + a[0] = b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvttpd_epi32(__m128d a) +{ + return (__m128i)__builtin_ia32_cvttpd2dq((__v2df)a); +} + +__INTRIN_INLINE_SSE2 int _mm_cvttsd_si32(__m128d a) +{ + return __builtin_ia32_cvttsd2si((__v2df)a); +} + +__INTRIN_INLINE_MMX __m64 _mm_cvtpd_pi32(__m128d a) +{ + return (__m64)__builtin_ia32_cvtpd2pi((__v2df)a); +} + +__INTRIN_INLINE_MMX __m64 _mm_cvttpd_pi32(__m128d a) +{ + return (__m64)__builtin_ia32_cvttpd2pi((__v2df)a); +} + +__INTRIN_INLINE_SSE __m128d _mm_cvtpi32_pd(__m64 a) +{ + return __builtin_ia32_cvtpi2pd((__v2si)a); +} + +__INTRIN_INLINE_SSE2 double _mm_cvtsd_f64(__m128d a) +{ + return a[0]; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_load_pd(double const *dp) +{ + return *(const __m128d *)dp; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_load1_pd(double const *dp) +{ + struct __mm_load1_pd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + double __u = ((const struct __mm_load1_pd_struct *)dp)->__u; + return __extension__(__m128d){__u, __u}; +} + +// GCC: +/* Create a selector for use with the SHUFPD instruction. */ +#define _MM_SHUFFLE2(fp1,fp0) \ + (((fp1) << 1) | (fp0)) + +__INTRIN_INLINE_SSE2 __m128d _mm_loadr_pd(double const *dp) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + __m128d u = *(const __m128d *)dp; + return __builtin_shufflevector((__v2df)u, (__v2df)u, 1, 0); +#else + return (__m128d){ dp[1], dp[0] }; +#endif +} + +__INTRIN_INLINE_SSE2 __m128d _mm_loadu_pd(double const *dp) +{ + struct __loadu_pd { + __m128d_u __v; + } __attribute__((__packed__, __may_alias__)); + return ((const struct __loadu_pd *)dp)->__v; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_loadu_si64(void const *a) +{ + struct __loadu_si64 { + long long __v; + } __attribute__((__packed__, __may_alias__)); + long long __u = ((const struct __loadu_si64 *)a)->__v; + return __extension__(__m128i)(__v2di){__u, 0LL}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_loadu_si32(void const *a) +{ + struct __loadu_si32 { + int __v; + } __attribute__((__packed__, __may_alias__)); + int __u = ((const struct __loadu_si32 *)a)->__v; + return __extension__(__m128i)(__v4si){__u, 0, 0, 0}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_loadu_si16(void const *a) +{ + struct __loadu_si16 { + short __v; + } __attribute__((__packed__, __may_alias__)); + short __u = ((const struct __loadu_si16 *)a)->__v; + return __extension__(__m128i)(__v8hi){__u, 0, 0, 0, 0, 0, 0, 0}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_load_sd(double const *dp) +{ + struct __mm_load_sd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + double __u = ((const struct __mm_load_sd_struct *)dp)->__u; + return __extension__(__m128d){__u, 0}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_loadh_pd(__m128d a, double const *dp) +{ + struct __mm_loadh_pd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + double __u = ((const struct __mm_loadh_pd_struct *)dp)->__u; + return __extension__(__m128d){a[0], __u}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_loadl_pd(__m128d a, double const *dp) +{ + struct __mm_loadl_pd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + double __u = ((const struct __mm_loadl_pd_struct *)dp)->__u; + return __extension__(__m128d){__u, a[1]}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_undefined_pd(void) +{ +#if HAS_BUILTIN(__builtin_ia32_undef128) + return (__m128d)__builtin_ia32_undef128(); +#else + __m128d undef = undef; + return undef; +#endif +} + +__INTRIN_INLINE_SSE2 __m128d _mm_set_sd(double w) +{ + return __extension__(__m128d){w, 0}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_set1_pd(double w) +{ + return __extension__(__m128d){w, w}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_set_pd(double w, double x) +{ + return __extension__(__m128d){x, w}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_setr_pd(double w, double x) +{ + return __extension__(__m128d){w, x}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_setzero_pd(void) +{ + return __extension__(__m128d){0, 0}; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_move_sd(__m128d a, __m128d b) +{ + a[0] = b[0]; + return a; +} + +__INTRIN_INLINE_SSE2 void _mm_store_sd(double *dp, __m128d a) +{ + struct __mm_store_sd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + ((struct __mm_store_sd_struct *)dp)->__u = a[0]; +} + +__INTRIN_INLINE_SSE2 void _mm_store_pd(double *dp, __m128d a) +{ + *(__m128d *)dp = a; +} + +__INTRIN_INLINE_SSE2 void _mm_store1_pd(double *dp, __m128d a) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + a = __builtin_shufflevector((__v2df)a, (__v2df)a, 0, 0); + _mm_store_pd(dp, a); +#else + dp[0] = a[0]; + dp[1] = a[0]; +#endif +} + +__INTRIN_INLINE_SSE2 void _mm_storeu_pd(double *dp, __m128d a) +{ + struct __storeu_pd { + __m128d_u __v; + } __attribute__((__packed__, __may_alias__)); + ((struct __storeu_pd *)dp)->__v = a; +} + +__INTRIN_INLINE_SSE2 void _mm_storer_pd(double *dp, __m128d a) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + a = __builtin_shufflevector((__v2df)a, (__v2df)a, 1, 0); + *(__m128d *)dp = a; +#else + dp[0] = a[1]; + dp[1] = a[0]; +#endif +} + +__INTRIN_INLINE_SSE2 void _mm_storeh_pd(double *dp, __m128d a) +{ + struct __mm_storeh_pd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + ((struct __mm_storeh_pd_struct *)dp)->__u = a[1]; +} + +__INTRIN_INLINE_SSE2 void _mm_storel_pd(double *dp, __m128d a) +{ + struct __mm_storeh_pd_struct { + double __u; + } __attribute__((__packed__, __may_alias__)); + ((struct __mm_storeh_pd_struct *)dp)->__u = a[0]; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_add_epi8(__m128i a, __m128i b) +{ + return (__m128i)((__v16qu)a + (__v16qu)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_add_epi16(__m128i a, __m128i b) +{ + return (__m128i)((__v8hu)a + (__v8hu)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_add_epi32(__m128i a, __m128i b) +{ + return (__m128i)((__v4su)a + (__v4su)b); +} + +__INTRIN_INLINE_MMX __m64 _mm_add_si64(__m64 a, __m64 b) +{ + return (__m64)__builtin_ia32_paddq((__v1di)a, (__v1di)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_add_epi64(__m128i a, __m128i b) +{ + return (__m128i)((__v2du)a + (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_adds_epi8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_add_sat) + return (__m128i)__builtin_elementwise_add_sat((__v16qs)a, (__v16qs)b); +#else + return (__m128i)__builtin_ia32_paddsb128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_adds_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_add_sat) + return (__m128i)__builtin_elementwise_add_sat((__v8hi)a, (__v8hi)b); +#else + return (__m128i)__builtin_ia32_paddsw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_adds_epu8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_add_sat) + return (__m128i)__builtin_elementwise_add_sat((__v16qu)a, (__v16qu)b); +#else + return (__m128i)__builtin_ia32_paddusb128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_adds_epu16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_add_sat) + return (__m128i)__builtin_elementwise_add_sat((__v8hu)a, (__v8hu)b); +#else + return (__m128i)__builtin_ia32_paddusw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_avg_epu8(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_pavgb128((__v16qi)a, (__v16qi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_avg_epu16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_pavgw128((__v8hi)a, (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_madd_epi16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_pmaddwd128((__v8hi)a, (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_max_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_max) + return (__m128i)__builtin_elementwise_max((__v8hi)a, (__v8hi)b); +#else + return (__m128i)__builtin_ia32_pmaxsw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_max_epu8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_max) + return (__m128i)__builtin_elementwise_max((__v16qu)a, (__v16qu)b); +#else + return (__m128i)__builtin_ia32_pmaxub128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_min_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_min) + return (__m128i)__builtin_elementwise_min((__v8hi)a, (__v8hi)b); +#else + return (__m128i)__builtin_ia32_pminsw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_min_epu8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_min) + return (__m128i)__builtin_elementwise_min((__v16qu)a, (__v16qu)b); +#else + return (__m128i)__builtin_ia32_pminub128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_mulhi_epi16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_pmulhw128((__v8hi)a, (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_mulhi_epu16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_pmulhuw128((__v8hi)a, (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_mullo_epi16(__m128i a, __m128i b) +{ + return (__m128i)((__v8hu)a * (__v8hu)b); +} + +__INTRIN_INLINE_MMX __m64 _mm_mul_su32(__m64 a, __m64 b) +{ + return (__m64)__builtin_ia32_pmuludq((__v2si)a, (__v2si)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_mul_epu32(__m128i a, __m128i b) +{ + return __builtin_ia32_pmuludq128((__v4si)a, (__v4si)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sad_epu8(__m128i a, __m128i b) +{ + return __builtin_ia32_psadbw128((__v16qi)a, (__v16qi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sub_epi8(__m128i a, __m128i b) +{ + return (__m128i)((__v16qu)a - (__v16qu)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sub_epi16(__m128i a, __m128i b) +{ + return (__m128i)((__v8hu)a - (__v8hu)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sub_epi32(__m128i a, __m128i b) +{ + return (__m128i)((__v4su)a - (__v4su)b); +} + +__INTRIN_INLINE_MMX __m64 _mm_sub_si64(__m64 a, __m64 b) +{ + return (__m64)__builtin_ia32_psubq((__v1di)a, (__v1di)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sub_epi64(__m128i a, __m128i b) +{ + return (__m128i)((__v2du)a - (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_subs_epi8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_sub_sat) + return (__m128i)__builtin_elementwise_sub_sat((__v16qs)a, (__v16qs)b); +#else + return (__m128i)__builtin_ia32_psubsb128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_subs_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_sub_sat) + return (__m128i)__builtin_elementwise_sub_sat((__v8hi)a, (__v8hi)b); +#else + return (__m128i)__builtin_ia32_psubsw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_subs_epu8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_sub_sat) + return (__m128i)__builtin_elementwise_sub_sat((__v16qu)a, (__v16qu)b); +#else + return (__m128i)__builtin_ia32_psubusb128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_subs_epu16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_elementwise_sub_sat) + return (__m128i)__builtin_elementwise_sub_sat((__v8hu)a, (__v8hu)b); +#else + return (__m128i)__builtin_ia32_psubusw128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_and_si128(__m128i a, __m128i b) +{ + return (__m128i)((__v2du)a & (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_andnot_si128(__m128i a, __m128i b) +{ + return (__m128i)(~(__v2du)a & (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_or_si128(__m128i a, __m128i b) +{ + return (__m128i)((__v2du)a | (__v2du)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_xor_si128(__m128i a, __m128i b) +{ + return (__m128i)((__v2du)a ^ (__v2du)b); +} + +#define _mm_slli_si128(a, imm) \ + ((__m128i)__builtin_ia32_pslldqi128_byteshift((__v2di)(__m128i)(a), (int)(imm))) + +__INTRIN_INLINE_SSE2 __m128i _mm_slli_epi16(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_psllwi128((__v8hi)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sll_epi16(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_psllw128((__v8hi)a, (__v8hi)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_slli_epi32(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_pslldi128((__v4si)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sll_epi32(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_pslld128((__v4si)a, (__v4si)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_slli_epi64(__m128i a, int count) +{ + return __builtin_ia32_psllqi128((__v2di)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sll_epi64(__m128i a, __m128i count) +{ + return __builtin_ia32_psllq128((__v2di)a, (__v2di)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srai_epi16(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_psrawi128((__v8hi)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sra_epi16(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_psraw128((__v8hi)a, (__v8hi)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srai_epi32(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_psradi128((__v4si)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_sra_epi32(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_psrad128((__v4si)a, (__v4si)count); +} + +#define _mm_srli_si128(a, imm) \ + ((__m128i)__builtin_ia32_psrldqi128_byteshift((__v2di)(__m128i)(a), (int)(imm))) + +__INTRIN_INLINE_SSE2 __m128i _mm_srli_epi16(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_psrlwi128((__v8hi)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srl_epi16(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_psrlw128((__v8hi)a, (__v8hi)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srli_epi32(__m128i a, int count) +{ + return (__m128i)__builtin_ia32_psrldi128((__v4si)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srl_epi32(__m128i a, __m128i count) +{ + return (__m128i)__builtin_ia32_psrld128((__v4si)a, (__v4si)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srli_epi64(__m128i a, int count) +{ + return __builtin_ia32_psrlqi128((__v2di)a, count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_srl_epi64(__m128i a, __m128i count) +{ + return __builtin_ia32_psrlq128((__v2di)a, (__v2di)count); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpeq_epi8(__m128i a, __m128i b) +{ + return (__m128i)((__v16qi)a == (__v16qi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpeq_epi16(__m128i a, __m128i b) +{ + return (__m128i)((__v8hi)a == (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpeq_epi32(__m128i a, __m128i b) +{ + return (__m128i)((__v4si)a == (__v4si)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpgt_epi8(__m128i a, __m128i b) +{ + /* This function always performs a signed comparison, but __v16qi is a char + which may be signed or unsigned, so use __v16qs. */ + return (__m128i)((__v16qs)a > (__v16qs)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpgt_epi16(__m128i a, __m128i b) +{ + return (__m128i)((__v8hi)a > (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmpgt_epi32(__m128i a, __m128i b) +{ + return (__m128i)((__v4si)a > (__v4si)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmplt_epi8(__m128i a, __m128i b) +{ + return _mm_cmpgt_epi8(b, a); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmplt_epi16(__m128i a, __m128i b) +{ + return _mm_cmpgt_epi16(b, a); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cmplt_epi32(__m128i a, __m128i b) +{ + return _mm_cmpgt_epi32(b, a); +} + +#ifdef _M_AMD64 + +__INTRIN_INLINE_SSE2 __m128d _mm_cvtsi64_sd(__m128d a, long long b) +{ + a[0] = b; + return a; +} + +__INTRIN_INLINE_SSE2 long long _mm_cvtsd_si64(__m128d a) +{ + return __builtin_ia32_cvtsd2si64((__v2df)a); +} + +__INTRIN_INLINE_SSE2 long long _mm_cvttsd_si64(__m128d a) +{ + return __builtin_ia32_cvttsd2si64((__v2df)a); +} +#endif + +__INTRIN_INLINE_SSE2 __m128 _mm_cvtepi32_ps(__m128i a) +{ +#if HAS_BUILTIN(__builtin_convertvector) + return (__m128)__builtin_convertvector((__v4si)a, __v4sf); +#else + return __builtin_ia32_cvtdq2ps((__v4si)a); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvtps_epi32(__m128 a) +{ + return (__m128i)__builtin_ia32_cvtps2dq((__v4sf)a); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvttps_epi32(__m128 a) +{ + return (__m128i)__builtin_ia32_cvttps2dq((__v4sf)a); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvtsi32_si128(int a) +{ + return __extension__(__m128i)(__v4si){a, 0, 0, 0}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_cvtsi64_si128(long long a) +{ + return __extension__(__m128i)(__v2di){a, 0}; +} + +__INTRIN_INLINE_SSE2 int _mm_cvtsi128_si32(__m128i a) +{ + __v4si b = (__v4si)a; + return b[0]; +} + +__INTRIN_INLINE_SSE2 long long _mm_cvtsi128_si64(__m128i a) +{ + return a[0]; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_load_si128(__m128i const *p) +{ + return *p; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_loadu_si128(__m128i_u const *p) +{ + struct __loadu_si128 { + __m128i_u __v; + } __attribute__((__packed__, __may_alias__)); + return ((const struct __loadu_si128 *)p)->__v; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_loadl_epi64(__m128i_u const *p) +{ + struct __mm_loadl_epi64_struct { + long long __u; + } __attribute__((__packed__, __may_alias__)); + return __extension__(__m128i){ + ((const struct __mm_loadl_epi64_struct *)p)->__u, 0}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_undefined_si128(void) +{ +#if HAS_BUILTIN(__builtin_ia32_undef128) + return (__m128i)__builtin_ia32_undef128(); +#else + __m128i undef = undef; + return undef; +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set_epi64x(long long q1, long long q0) +{ + return __extension__(__m128i)(__v2di){q0, q1}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set_epi64(__m64 q1, __m64 q0) +{ + return _mm_set_epi64x((long long)q1, (long long)q0); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set_epi32(int i3, int i2, int i1, int i0) +{ + return __extension__(__m128i)(__v4si){i0, i1, i2, i3}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set_epi16( + short w7, short w6, short w5, short w4, + short w3, short w2, short w1, short w0) +{ + return __extension__(__m128i)(__v8hi){w0, w1, w2, w3, w4, w5, w6, w7}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set_epi8( + char b15, char b14, char b13, char b12, + char b11, char b10, char b9, char b8, + char b7, char b6, char b5, char b4, + char b3, char b2, char b1, char b0) +{ + return __extension__(__m128i)(__v16qi){ + b0, b1, b2, b3, b4, b5, b6, b7, + b8, b9, b10, b11, b12, b13, b14, b15}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set1_epi64x(long long q) +{ + return _mm_set_epi64x(q, q); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set1_epi64(__m64 q) +{ + return _mm_set_epi64(q, q); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set1_epi32(int i) +{ + return _mm_set_epi32(i, i, i, i); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set1_epi16(short w) +{ + return _mm_set_epi16(w, w, w, w, w, w, w, w); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_set1_epi8(char b) +{ + return _mm_set_epi8(b, b, b, b, b, b, b, b, b, b, b, + b, b, b, b, b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_setr_epi64(__m64 q0, __m64 q1) +{ + return _mm_set_epi64(q1, q0); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_setr_epi32(int i0, int i1, int i2, int i3) +{ + return _mm_set_epi32(i3, i2, i1, i0); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_setr_epi16( + short w0, short w1, short w2, short w3, + short w4, short w5, short w6, short w7) +{ + return _mm_set_epi16(w7, w6, w5, w4, w3, w2, w1, w0); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_setr_epi8( + char b0, char b1, char b2, char b3, + char b4, char b5, char b6, char b7, + char b8, char b9, char b10, char b11, + char b12, char b13, char b14, char b15) +{ + return _mm_set_epi8(b15, b14, b13, b12, b11, b10, b9, b8, + b7, b6, b5, b4, b3, b2, b1, b0); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_setzero_si128(void) +{ + return __extension__(__m128i)(__v2di){0LL, 0LL}; +} + +__INTRIN_INLINE_SSE2 void _mm_store_si128(__m128i *p, __m128i b) +{ + *p = b; +} + +__INTRIN_INLINE_SSE2 void _mm_storeu_si128(__m128i_u *p, __m128i b) +{ + struct __storeu_si128 { + __m128i_u __v; + } __attribute__((__packed__, __may_alias__)); + ((struct __storeu_si128 *)p)->__v = b; +} + +__INTRIN_INLINE_SSE2 void _mm_storeu_si64(void *p, __m128i b) +{ + struct __storeu_si64 { + long long __v; + } __attribute__((__packed__, __may_alias__)); + ((struct __storeu_si64 *)p)->__v = ((__v2di)b)[0]; +} + +__INTRIN_INLINE_SSE2 void _mm_storeu_si32(void *p, __m128i b) +{ + struct __storeu_si32 { + int __v; + } __attribute__((__packed__, __may_alias__)); + ((struct __storeu_si32 *)p)->__v = ((__v4si)b)[0]; +} + +__INTRIN_INLINE_SSE2 void _mm_storeu_si16(void *p, __m128i b) +{ + struct __storeu_si16 { + short __v; + } __attribute__((__packed__, __may_alias__)); + ((struct __storeu_si16 *)p)->__v = ((__v8hi)b)[0]; +} + +__INTRIN_INLINE_SSE2 void _mm_maskmoveu_si128(__m128i d, __m128i n, char *p) +{ + __builtin_ia32_maskmovdqu((__v16qi)d, (__v16qi)n, p); +} + +__INTRIN_INLINE_SSE2 void _mm_storel_epi64(__m128i_u *p, __m128i a) +{ + struct __mm_storel_epi64_struct { + long long __u; + } __attribute__((__packed__, __may_alias__)); + ((struct __mm_storel_epi64_struct *)p)->__u = a[0]; +} + +__INTRIN_INLINE_SSE2 void _mm_stream_pd(double *p, __m128d a) +{ +#if HAS_BUILTIN(__builtin_nontemporal_store) + __builtin_nontemporal_store((__v2df)a, (__v2df *)p); +#else + __builtin_ia32_movntpd(p, a); +#endif +} + +__INTRIN_INLINE_SSE2 void _mm_stream_si128(__m128i *p, __m128i a) +{ +#if HAS_BUILTIN(__builtin_nontemporal_store) + __builtin_nontemporal_store((__v2di)a, (__v2di*)p); +#else + __builtin_ia32_movntdq(p, a); +#endif +} + +__INTRIN_INLINE_SSE2 void _mm_stream_si32(int *p, int a) +{ + __builtin_ia32_movnti(p, a); +} + +#ifdef _M_AMD64 +__INTRIN_INLINE_SSE2 void _mm_stream_si64(long long *p, long long a) +{ + __builtin_ia32_movnti64(p, a); +} +#endif + +void _mm_clflush(void const *p); + +void _mm_lfence(void); + +void _mm_mfence(void); + +__INTRIN_INLINE_SSE2 __m128i _mm_packs_epi16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_packsswb128((__v8hi)a, (__v8hi)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_packs_epi32(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_packssdw128((__v4si)a, (__v4si)b); +} + +__INTRIN_INLINE_SSE2 __m128i _mm_packus_epi16(__m128i a, __m128i b) +{ + return (__m128i)__builtin_ia32_packuswb128((__v8hi)a, (__v8hi)b); +} + +#define _mm_extract_epi16(a, imm) \ + ((int)(unsigned short)__builtin_ia32_vec_ext_v8hi((__v8hi)(__m128i)(a), \ + (int)(imm))) + +#define _mm_insert_epi16(a, b, imm) \ + ((__m128i)__builtin_ia32_vec_set_v8hi((__v8hi)(__m128i)(a), (int)(b), \ + (int)(imm))) + +__INTRIN_INLINE_SSE2 int _mm_movemask_epi8(__m128i a) +{ + return __builtin_ia32_pmovmskb128((__v16qi)a); +} + +#define _mm_shuffle_epi32(a, imm) \ + ((__m128i)__builtin_ia32_pshufd((__v4si)(__m128i)(a), (int)(imm))) + +#define _mm_shufflelo_epi16(a, imm) \ + ((__m128i)__builtin_ia32_pshuflw((__v8hi)(__m128i)(a), (int)(imm))) + +#define _mm_shufflehi_epi16(a, imm) \ + ((__m128i)__builtin_ia32_pshufhw((__v8hi)(__m128i)(a), (int)(imm))) + +__INTRIN_INLINE_SSE2 __m128i _mm_unpackhi_epi8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector( + (__v16qi)a, (__v16qi)b, 8, 16 + 8, 9, 16 + 9, 10, 16 + 10, 11, + 16 + 11, 12, 16 + 12, 13, 16 + 13, 14, 16 + 14, 15, 16 + 15); +#else + return (__m128i)__builtin_ia32_punpckhbw128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpackhi_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v8hi)a, (__v8hi)b, 4, 8 + 4, 5, + 8 + 5, 6, 8 + 6, 7, 8 + 7); +#else + return (__m128i)__builtin_ia32_punpckhwd128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpackhi_epi32(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v4si)a, (__v4si)b, 2, 4 + 2, 3, + 4 + 3); +#else + return (__m128i)__builtin_ia32_punpckhdq128((__v4si)a, (__v4si)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpackhi_epi64(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v2di)a, (__v2di)b, 1, 2 + 1); +#else + return (__m128i)__builtin_ia32_punpckhqdq128((__v2di)a, (__v2di)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpacklo_epi8(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector( + (__v16qi)a, (__v16qi)b, 0, 16 + 0, 1, 16 + 1, 2, 16 + 2, 3, 16 + 3, 4, + 16 + 4, 5, 16 + 5, 6, 16 + 6, 7, 16 + 7); +#else + return (__m128i)__builtin_ia32_punpcklbw128((__v16qi)a, (__v16qi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpacklo_epi16(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v8hi)a, (__v8hi)b, 0, 8 + 0, 1, + 8 + 1, 2, 8 + 2, 3, 8 + 3); +#else + return (__m128i)__builtin_ia32_punpcklwd128((__v8hi)a, (__v8hi)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpacklo_epi32(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v4si)a, (__v4si)b, 0, 4 + 0, 1, + 4 + 1); +#else + return (__m128i)__builtin_ia32_punpckldq128((__v4si)a, (__v4si)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128i _mm_unpacklo_epi64(__m128i a, __m128i b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return (__m128i)__builtin_shufflevector((__v2di)a, (__v2di)b, 0, 2 + 0); +#else + return (__m128i)__builtin_ia32_punpcklqdq128((__v2di)a, (__v2di)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m64 _mm_movepi64_pi64(__m128i a) +{ + return (__m64)a[0]; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_movpi64_epi64(__m64 a) +{ + return __extension__(__m128i)(__v2di){(long long)a, 0}; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_move_epi64(__m128i a) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return __builtin_shufflevector((__v2di)a, _mm_setzero_si128(), 0, 2); +#else + return (__m128i)__builtin_ia32_movq128((__v2di)a); +#endif +} + +__INTRIN_INLINE_SSE2 __m128d _mm_unpackhi_pd(__m128d a, __m128d b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return __builtin_shufflevector((__v2df)a, (__v2df)b, 1, 2 + 1); +#else + return (__m128d)__builtin_ia32_unpckhpd((__v2df)a, (__v2df)b); +#endif +} + +__INTRIN_INLINE_SSE2 __m128d _mm_unpacklo_pd(__m128d a, __m128d b) +{ +#if HAS_BUILTIN(__builtin_shufflevector) + return __builtin_shufflevector((__v2df)a, (__v2df)b, 0, 2 + 0); +#else + return (__m128d)__builtin_ia32_unpcklpd((__v2df)a, (__v2df)b); +#endif +} + +__INTRIN_INLINE_SSE2 int _mm_movemask_pd(__m128d a) +{ + return __builtin_ia32_movmskpd((__v2df)a); +} + +#define _mm_shuffle_pd(a, b, i) \ + ((__m128d)__builtin_ia32_shufpd((__v2df)(__m128d)(a), (__v2df)(__m128d)(b), \ + (int)(i))) + +__INTRIN_INLINE_SSE2 __m128 _mm_castpd_ps(__m128d a) +{ + return (__m128)a; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_castpd_si128(__m128d a) +{ + return (__m128i)a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_castps_pd(__m128 a) +{ + return (__m128d)a; +} + +__INTRIN_INLINE_SSE2 __m128i _mm_castps_si128(__m128 a) +{ + return (__m128i)a; +} + +__INTRIN_INLINE_SSE2 __m128 _mm_castsi128_ps(__m128i a) +{ + return (__m128)a; +} + +__INTRIN_INLINE_SSE2 __m128d _mm_castsi128_pd(__m128i a) +{ + return (__m128d)a; +} + +void _mm_pause(void); + +#endif /* _MSC_VER */ -extern void _mm_stream_si128(__m128i *, __m128i); #endif /* _INCLUDED_EMM */

2 years, 6 months

[reactos] 01/01: [NTOS:OB] Include the security descriptor charge when charging the paged pool quota of an object

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5da5e644bbd942b6404fe… commit 5da5e644bbd942b6404fef8742d995bb7cb81660 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jun 26 15:44:06 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Jun 26 19:47:02 2022 +0200 [NTOS:OB] Include the security descriptor charge when charging the paged pool quota of an object On ObpChargeQuotaForObject function, the kernel will either charge the default object type charges or the specified information charges obtained from ObCreateObject API call. What happens is that if a paged pool charge is specified on ObCreateObject call the kernel will charge that but when an object is about to be de-allocated, the amount of quota to return back to the system is the amounting of the paged pool charge specified previously by the ObCreateObject call plus the amounting of the security descriptor charge (see oblife.c / line 98). This will result in a fatal crash with a bugcheck of QUOTA_UNDERFLOW because we are returning quota with bits of it that was never charged and that's SecurityDescriptorCharge. A QUOTA_UNDERFLOW bugcheck occurs in two following scenarios: -- When installing Virtualbox Guest Additions and prompting the installer to reboot the system for you -- When logging off and on back to the system and then you restart the system normally This bug has been discovered whilst working on #4555 PR. --- ntoskrnl/ob/obhandle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/obhandle.c b/ntoskrnl/ob/obhandle.c index bf9f1f09cb5..28a2fc77e36 100644 --- a/ntoskrnl/ob/obhandle.c +++ b/ntoskrnl/ob/obhandle.c @@ -447,7 +447,8 @@ ObpChargeQuotaForObject(IN POBJECT_HEADER ObjectHeader, if (ObjectQuota) { /* We have a quota, get the charges */ - PagedPoolCharge = ObjectQuota->PagedPoolCharge; + PagedPoolCharge = ObjectQuota->PagedPoolCharge + + ObjectQuota->SecurityDescriptorCharge; NonPagedPoolCharge = ObjectQuota->NonPagedPoolCharge; } else

2 years, 6 months

[reactos] 02/02: [CRT] Implement portable + amd64 asm version of fabs/fabsf

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b85afdfd258cb959893d2… commit b85afdfd258cb959893d28ae194db9118d3e6f5c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat May 29 19:40:30 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 26 19:13:47 2022 +0200 [CRT] Implement portable + amd64 asm version of fabs/fabsf Note: older versions of ML64 are broken and don't understand the register form of movq. See https://stackoverflow.com/questions/24789339/move-quadword-between-xmm-and-… --- modules/rostests/apitests/crt/fabs.c | 4 +-- sdk/lib/crt/math/amd64/fabs.S | 43 +++++++++++++++++++++++-------- sdk/lib/crt/math/amd64/fabsf.S | 49 ++++++++++++++++++++++++++++++++++++ sdk/lib/crt/math/arm/fabs.s | 24 ------------------ sdk/lib/crt/math/fabs.c | 38 ++++++++++++++++++++++++++++ sdk/lib/crt/math/fabsf.c | 26 ++++++++++++++----- sdk/lib/crt/math/math.cmake | 11 ++++---- 7 files changed, 148 insertions(+), 47 deletions(-) diff --git a/modules/rostests/apitests/crt/fabs.c b/modules/rostests/apitests/crt/fabs.c index 88fd9fb8410..eec1f761757 100644 --- a/modules/rostests/apitests/crt/fabs.c +++ b/modules/rostests/apitests/crt/fabs.c @@ -20,7 +20,7 @@ static TESTENTRY_DBL s_fabs_tests[] = { /* Special values */ { 0x7FF0000000000000ull /* INF */, 0x7FF0000000000000ull /* INF */ }, -#ifdef _M_AMD64 +#ifndef _M_IX86 { 0x7FF0000000000001ull /* NAN(SNAN) */, 0x7FF0000000000001ull /* NAN(SNAN) */ }, { 0x7FF7FFFFFFFFFFFFull /* NAN(SNAN) */, 0x7FF7FFFFFFFFFFFFull /* NAN(SNAN) */ }, #else @@ -31,7 +31,7 @@ static TESTENTRY_DBL s_fabs_tests[] = { 0x7FF8000000000001ull /* NAN */, 0x7FF8000000000001ull /* NAN */ }, { 0x7FFFFFFFFFFFFFFFull /* NAN */, 0x7FFFFFFFFFFFFFFFull /* NAN */ }, { 0xFFF0000000000000ull /* -INF */, 0x7FF0000000000000ull /* INF */ }, -#ifdef _M_AMD64 +#ifndef _M_IX86 { 0xFFF0000000000001ull /* -NAN(SNAN) */, 0xFFF0000000000001ull /* NAN(SNAN) */ }, { 0xFFF7FFFFFFFFFFFFull /* -NAN(SNAN) */, 0xFFF7FFFFFFFFFFFFull /* NAN(SNAN) */ }, #else diff --git a/sdk/lib/crt/math/amd64/fabs.S b/sdk/lib/crt/math/amd64/fabs.S index fb6db3b32e3..a35222ab93e 100644 --- a/sdk/lib/crt/math/amd64/fabs.S +++ b/sdk/lib/crt/math/amd64/fabs.S @@ -1,9 +1,8 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of fabs - * FILE: lib/sdk/crt/math/amd64/fabs.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 asm implementation of fabs + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ /* INCLUDES ******************************************************************/ @@ -14,18 +13,42 @@ .code64 #ifdef _USE_ML -/* fabs is now allowed as label name, so create _fabs instead and alias fabs to it */ +/* fabs is not allowed as label name, so create _fabs instead and alias fabs to it */ +ALIAS <fabs> = <_fabs> PUBLIC _fabs _fabs: #else PUBLIC fabs fabs: #endif - UNIMPLEMENTED fabs - ret + /* Copy parameter into rcx */ +#if !defined(_MSC_VER) || (_MSC_VER >= 1916) + movq rcx, xmm0 +#else + /* Old ML64 version does not understand this form of movq and uses movd instead */ + movd rcx, xmm0 +#endif -#ifdef _USE_ML -ALIAS <fabs> = <_fabs> + /* Copy into rax */ + mov rax, rcx + + /* Clear sign bit in rax */ + btr rax, 63 + + /* Check for NAN */ + mov r8, HEX(7FF0000000000000) + cmp rax, r8 + + /* If it is NAN, copy original value back to rax */ + cmova rax, rcx + +#if !defined(_MSC_VER) || (_MSC_VER >= 1916) + movq xmm0, rax +#else + /* Old ML64 version does not understand this form of movq and uses movd instead */ + movd xmm0, rax #endif + ret + END diff --git a/sdk/lib/crt/math/amd64/fabsf.S b/sdk/lib/crt/math/amd64/fabsf.S new file mode 100644 index 00000000000..9d4a9af40a0 --- /dev/null +++ b/sdk/lib/crt/math/amd64/fabsf.S @@ -0,0 +1,49 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: x64 asm implementation of fabsf + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +PUBLIC fabsf +fabsf: + /* Copy parameter into rcx */ +#if !defined(_MSC_VER) || (_MSC_VER >= 1916) + movq rcx, xmm0 +#else + /* Old ML64 version does not understand this form of movq and uses movd instead */ + movd rcx, xmm0 +#endif + + /* Copy into eax */ + mov eax, ecx + + /* Clear sign bit in eax */ + btr eax, 31 + + /* Set error bit in rcx */ + bts ecx, 22 + + /* Check for NAN */ + cmp eax, HEX(7F800000) + + /* If eax is NAN, copy error result to rax */ + cmova eax, ecx + +#if !defined(_MSC_VER) || (_MSC_VER >= 1916) + movq xmm0, rax +#else + /* Old ML64 version does not understand this form of movq and uses movd instead */ + movd xmm0, rax +#endif + + ret + +END diff --git a/sdk/lib/crt/math/arm/fabs.s b/sdk/lib/crt/math/arm/fabs.s deleted file mode 100644 index 331c6ec64c0..00000000000 --- a/sdk/lib/crt/math/arm/fabs.s +++ /dev/null @@ -1,24 +0,0 @@ -/* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of fabs - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <kxarm.h> - -/* CODE **********************************************************************/ - - TEXTAREA - - LEAF_ENTRY fabs - - __assertfail - bx lr - - LEAF_END fabs - - END -/* EOF */ diff --git a/sdk/lib/crt/math/fabs.c b/sdk/lib/crt/math/fabs.c new file mode 100644 index 00000000000..771542881c7 --- /dev/null +++ b/sdk/lib/crt/math/fabs.c @@ -0,0 +1,38 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Portable implementation of fabs + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <math.h> + +#ifdef _MSC_VER +#pragma function(fabs) +#endif + +_Check_return_ +double +__cdecl +fabs( + _In_ double x) +{ + /* Load the value as uint64 */ + unsigned long long u64 = *(unsigned long long*)&x; + + /* Clear the sign bit */ + u64 &= ~(1ULL << 63); + + /* Check for NAN */ + if (u64 > 0x7FF0000000000000ull) + { +#ifdef _M_IX86 + /* Set error bit */ + *(unsigned long long*)&x |= 0x0008000000000000ull; +#endif + return x; + } + + /* Convert back to double */ + return *(double*)&u64; +} diff --git a/sdk/lib/crt/math/fabsf.c b/sdk/lib/crt/math/fabsf.c index 611d94e8a20..155c8559708 100644 --- a/sdk/lib/crt/math/fabsf.c +++ b/sdk/lib/crt/math/fabsf.c @@ -1,8 +1,8 @@ /* - * COPYRIGHT: BSD - See COPYING.ARM in the top level directory - * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of fabsf - * PROGRAMMER: Timo Kreuzer + * PROJECT: ReactOS CRT library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Portable implementation of fabsf + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ #include <math.h> @@ -13,6 +13,20 @@ __cdecl fabsf( _In_ float x) { - return (float)fabs((double)x); -} + /* Load the value as uint */ + unsigned int u32 = *(unsigned int*)&x; + + /* Clear the sign bit */ + u32 &= ~(1 << 31); + /* Check for NAN */ + if (u32 > 0x7F800000) + { + /* Set error bit */ + *(unsigned int*)&x |= 0x00400000; + return x; + } + + /* Convert back to float */ + return *(float*)&u32; +} diff --git a/sdk/lib/crt/math/math.cmake b/sdk/lib/crt/math/math.cmake index fcf9e5eecdf..1f4a4d5da2a 100644 --- a/sdk/lib/crt/math/math.cmake +++ b/sdk/lib/crt/math/math.cmake @@ -8,6 +8,8 @@ list(APPEND LIBCNTPR_MATH_SOURCE if(ARCH STREQUAL "i386") list(APPEND LIBCNTPR_MATH_SOURCE + math/fabs.c + math/fabsf.c math/i386/ci.c math/i386/cicos.c math/i386/cilog.c @@ -31,7 +33,7 @@ if(ARCH STREQUAL "i386") math/i386/aullshr_asm.s math/i386/ceil_asm.s math/i386/cos_asm.s - math/i386/fabs_asm.s + # math/i386/fabs_asm.s # FIXME math/i386/floor_asm.s math/i386/ftol_asm.s math/i386/ftol2_asm.s @@ -60,6 +62,7 @@ elseif(ARCH STREQUAL "amd64") math/amd64/ceil.S math/amd64/exp.S math/amd64/fabs.S + math/amd64/fabsf.S math/amd64/floor.S math/amd64/floorf.S math/amd64/fmod.S @@ -73,6 +76,8 @@ elseif(ARCH STREQUAL "amd64") elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_MATH_SOURCE math/cos.c + math/fabs.c + math/fabsf.c math/floorf.c math/sin.c math/sqrt.c @@ -92,15 +97,11 @@ elseif(ARCH STREQUAL "arm") math/arm/__u64tos.c math/arm/__64tof.h ) - list(APPEND CRT_MATH_SOURCE - math/fabsf.c - ) list(APPEND LIBCNTPR_MATH_ASM_SOURCE math/arm/atan.s math/arm/atan2.s math/arm/ceil.s math/arm/exp.s - math/arm/fabs.s math/arm/fmod.s math/arm/floor.s math/arm/ldexp.s

2 years, 6 months

[reactos] 01/02: [CRT_APITEST] Implement tests for fabs/fabsf

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a67170616e2b4d0aa01d… commit 8a67170616e2b4d0aa01d15f3cda8d7ca2aa62b2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Aug 4 17:22:01 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 26 19:13:47 2022 +0200 [CRT_APITEST] Implement tests for fabs/fabsf --- modules/rostests/apitests/crt/fabs.c | 112 +++++++++++++++++++++ modules/rostests/apitests/crt/math_helpers.h | 77 ++++++++++++++ .../rostests/apitests/crt/msvcrt_crt_apitest.cmake | 6 +- .../rostests/apitests/crt/static_crt_apitest.cmake | 5 + modules/rostests/apitests/crt/testlist.c | 2 + sdk/include/crt/math.h | 4 +- 6 files changed, 204 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/crt/fabs.c b/modules/rostests/apitests/crt/fabs.c new file mode 100644 index 00000000000..88fd9fb8410 --- /dev/null +++ b/modules/rostests/apitests/crt/fabs.c @@ -0,0 +1,112 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Tests for fabs / fabsf + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* Don't use the inline ceilf, unless required */ +#if defined(TEST_STATIC_CRT) || defined(_M_ARM) +#define _CRTBLD +#endif +#include "math_helpers.h" + +#ifdef _MSC_VER +#pragma function(fabs) +// fabsf is not available as an intrinsic +#endif + +static TESTENTRY_DBL s_fabs_tests[] = +{ + /* Special values */ + { 0x7FF0000000000000ull /* INF */, 0x7FF0000000000000ull /* INF */ }, +#ifdef _M_AMD64 + { 0x7FF0000000000001ull /* NAN(SNAN) */, 0x7FF0000000000001ull /* NAN(SNAN) */ }, + { 0x7FF7FFFFFFFFFFFFull /* NAN(SNAN) */, 0x7FF7FFFFFFFFFFFFull /* NAN(SNAN) */ }, +#else + { 0x7FF0000000000001ull /* NAN(SNAN) */, 0x7FF8000000000001ull /* NAN */ }, + { 0x7FF7FFFFFFFFFFFFull /* NAN(SNAN) */, 0x7FFFFFFFFFFFFFFFull /* NAN */ }, +#endif + { 0x7FF8000000000000ull /* NAN */, 0x7FF8000000000000ull /* NAN */ }, + { 0x7FF8000000000001ull /* NAN */, 0x7FF8000000000001ull /* NAN */ }, + { 0x7FFFFFFFFFFFFFFFull /* NAN */, 0x7FFFFFFFFFFFFFFFull /* NAN */ }, + { 0xFFF0000000000000ull /* -INF */, 0x7FF0000000000000ull /* INF */ }, +#ifdef _M_AMD64 + { 0xFFF0000000000001ull /* -NAN(SNAN) */, 0xFFF0000000000001ull /* NAN(SNAN) */ }, + { 0xFFF7FFFFFFFFFFFFull /* -NAN(SNAN) */, 0xFFF7FFFFFFFFFFFFull /* NAN(SNAN) */ }, +#else + { 0xFFF0000000000001ull /* -NAN(SNAN) */, 0xFFF8000000000001ull /* -NAN */ }, + { 0xFFF7FFFFFFFFFFFFull /* -NAN(SNAN) */, 0xFFFFFFFFFFFFFFFFull /* -NAN */ }, +#endif + { 0xFFF8000000000000ull /* -NAN(IND) */, 0xFFF8000000000000ull /* -NAN(IND) */ }, + { 0xFFF8000000000001ull /* -NAN */, 0xFFF8000000000001ull /* -NAN */ }, + { 0xFFFFFFFFFFFFFFFFull /* -NAN */, 0xFFFFFFFFFFFFFFFFull /* -NAN */ }, + + /* Some random floats */ + { 0x0000000000000000 /* 0.000000000000000e+000 */, 0x0000000000000000 /* 0.000000000000000e+000 */ }, + { 0x8000000000000000 /* -0.000000000000000e+000 */, 0x0000000000000000 /* 0.000000000000000e+000 */ }, + { 0x0123456789abcdef /* 3.512700564088504e-303 */, 0x0123456789abcdef /* 3.512700564088504e-303 */ }, + { 0x8123456789abcdef /* -3.512700564088504e-303 */, 0x0123456789abcdef /* 3.512700564088504e-303 */ }, + { 0x472ad8b31f506c9e /* 6.969745516432332e+034 */, 0x472ad8b31f506c9e /* 6.969745516432332e+034 */ }, + { 0xc72ad8b31f506c9e /* -6.969745516432332e+034 */, 0x472ad8b31f506c9e /* 6.969745516432332e+034 */ }, + { 0x1d289e506fa47cb3 /* 3.261613668384938e-168 */, 0x1d289e506fa47cb3 /* 3.261613668384938e-168 */ }, + { 0x9d289e506fa47cb3 /* -3.261613668384938e-168 */, 0x1d289e506fa47cb3 /* 3.261613668384938e-168 */ }, +}; + + +void Test_fabs(void) +{ + int i; + + for (i = 0; i < _countof(s_fabs_tests); i++) + { + double x = u64_to_dbl(s_fabs_tests[i].x); + double z = fabs(x); + ok_eq_dbl_exact("fabs", s_fabs_tests[i].x, z, s_fabs_tests[i].result); + } +} + +static TESTENTRY_FLT s_fabsf_tests[] = +{ + /* Special values */ + { 0x7F800000 /* INF */, 0x7F800000 /* INF */ }, + { 0x7F800001 /* NAN(SNAN) */, 0x7FC00001 /* NAN */ }, + { 0x7FBFFFFF /* NAN(SNAN) */, 0x7FFFFFFF /* NAN */ }, + { 0x7FC00000 /* NAN */, 0x7FC00000 /* NAN */ }, + { 0x7FC00001 /* NAN */, 0x7FC00001 /* NAN */ }, + { 0x7FCFFFFF /* NAN */, 0x7FCFFFFF /* NAN */ }, + { 0xFF800000 /* -INF */, 0x7F800000 /* INF */ }, + { 0xFF800001 /* -NAN(SNAN) */, 0xFFC00001 /* -NAN */ }, + { 0xFFBFFFFF /* -NAN(SNAN) */, 0xFFFFFFFF /* -NAN */ }, + { 0xFFC00000 /* -NAN(IND) */, 0xFFC00000 /* -NAN */ }, + { 0xFFC00001 /* -NAN */, 0xFFC00001 /* -NAN */ }, + { 0xFFCFFFFF /* -NAN */, 0xFFCFFFFF /* -NAN */ }, + + /* Some random floats */ + { 0x00000000 /* 0.000000e+000 */, 0x00000000 /* 0.000000e+000 */ }, + { 0x80000000 /* -0.000000e+000 */, 0x00000000 /* 0.000000e+000 */ }, + { 0x01234567 /* 2.998817e-038 */, 0x01234567 /* 2.998817e-038 */ }, + { 0x81234567 /* -2.998817e-038 */, 0x01234567 /* 2.998817e-038 */ }, + { 0x472ad8b3 /* 4.373670e+004 */, 0x472ad8b3 /* 4.373670e+004 */ }, + { 0xc72ad8b3 /* -4.373670e+004 */, 0x472ad8b3 /* 4.373670e+004 */ }, + { 0x1d289e50 /* 2.231646e-021 */, 0x1d289e50 /* 2.231646e-021 */ }, + { 0x9d289e50 /* -2.231646e-021 */, 0x1d289e50 /* 2.231646e-021 */ }, +}; + +void Test_fabsf(void) +{ + int i; + + for (i = 0; i < _countof(s_fabsf_tests); i++) + { + float x = u32_to_flt(s_fabsf_tests[i].x); + float z = fabsf(x); + ok_eq_flt_exact("fabsf", s_fabsf_tests[i].x, z, s_fabsf_tests[i].result); + } +} + +START_TEST(fabs) +{ + Test_fabs(); + Test_fabsf(); +} diff --git a/modules/rostests/apitests/crt/math_helpers.h b/modules/rostests/apitests/crt/math_helpers.h new file mode 100644 index 00000000000..667f5b63dce --- /dev/null +++ b/modules/rostests/apitests/crt/math_helpers.h @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Helpers for testing math functions + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#pragma once + +#define _USE_MATH_DEFINES +#include <math.h> +#include <float.h> +#include <apitest.h> + +static +__inline +double +u64_to_dbl(UINT64 x) +{ + return *(double*)(&x); +} + +static +__inline +UINT64 +dbl_to_u64(double x) +{ + return *(UINT64*)(&x); +} + +static +__inline +float +u32_to_flt(UINT32 x) +{ + return *(float*)(&x); +} + +static +__inline +UINT32 +flt_to_u32(float x) +{ + return *(UINT32*)(&x); +} + +typedef struct _TESTENTRY_DBL +{ + unsigned long long x; + unsigned long long result; +} TESTENTRY_DBL; + +typedef struct _TESTENTRY_FLT +{ + unsigned long x; + unsigned long result; +} TESTENTRY_FLT; + +#define ok_eq_dbl_exact_(file, line, func, ullx, z, ullexp) \ + { \ + double x = u64_to_dbl(ullx); \ + unsigned long long ullz = dbl_to_u64(z); \ + double exp = u64_to_dbl(ullexp); \ + ok_(file, line)(ullz == ullexp, "Wrong value for '%s(%f)' [0x%016llx], expected: %f [0x%016llx], got: %f [0x%016llx]\n", \ + func, x, ullx, exp, ullexp, z, ullz); \ + } +#define ok_eq_dbl_exact(func, ullx, z, ullexp) ok_eq_dbl_exact_(__FILE__, __LINE__, func, ullx, z, ullexp) + +#define ok_eq_flt_exact_(file, line, func, ux, z, uexp) \ + { \ + float x = u32_to_flt(ux); \ + unsigned int uz = flt_to_u32(z); \ + float exp = u32_to_flt(uexp); \ + ok_(file, line)(uz == uexp, "Wrong value for '%s(%f)' [0x%08x], expected: %f [0x%08x], got: %f [0x%08x]\n", \ + func, x, ux, exp, uexp, z, uz); \ + } +#define ok_eq_flt_exact(func, ux, z, uexp) ok_eq_flt_exact_(__FILE__, __LINE__, func, ux, z, uexp) diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 82283e5a3a6..58a598bb6fb 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1033,7 +1033,7 @@ list(APPEND SOURCE_MSVCRT # div.c # exit.c # exp.c -# fabs.c + fabs.c # fclose.c # feof.c # ferror.c @@ -1404,6 +1404,10 @@ set_module_type(msvcrt_crt_apitest win32cui) add_importlibs(msvcrt_crt_apitest msvcrt kernel32 ntdll) add_rostests_file(TARGET msvcrt_crt_apitest) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(msvcrt_crt_apitest PRIVATE -Wno-format) +endif() + spec2def(msvcrt_crt_dll_startup.dll dll_startup.spec) add_library(msvcrt_crt_dll_startup MODULE dll_startup.cpp diff --git a/modules/rostests/apitests/crt/static_crt_apitest.cmake b/modules/rostests/apitests/crt/static_crt_apitest.cmake index a3e35c412b3..cb1cfaac48e 100644 --- a/modules/rostests/apitests/crt/static_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/static_crt_apitest.cmake @@ -7,6 +7,7 @@ list(APPEND SOURCE_STATIC _vsnprintf.c _vsnwprintf.c atexit.c + fabs.c mbstowcs.c mbtowc.c sprintf.c @@ -40,3 +41,7 @@ target_link_libraries(static_crt_apitest crt wine ${PSEH_LIB}) set_module_type(static_crt_apitest win32cui) add_importlibs(static_crt_apitest kernel32 ntdll) add_rostests_file(TARGET static_crt_apitest) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(static_crt_apitest PRIVATE -Wno-format) +endif() diff --git a/modules/rostests/apitests/crt/testlist.c b/modules/rostests/apitests/crt/testlist.c index e8b4c7670fb..16a3a9d394c 100644 --- a/modules/rostests/apitests/crt/testlist.c +++ b/modules/rostests/apitests/crt/testlist.c @@ -18,6 +18,7 @@ extern void func___64tof(void); #if defined(TEST_NTDLL) extern void func__vscwprintf(void); #endif +extern void func_fabs(void); extern void func_fputc(void); extern void func_fputwc(void); extern void func__snprintf(void); @@ -60,6 +61,7 @@ const struct test winetest_testlist[] = // ... #endif #if defined(TEST_STATIC_CRT) || defined(TEST_MSVCRT) + { "fabs", func_fabs }, #if defined(_M_ARM) { "__rt_div", func___rt_div }, { "__fto64", func___fto64 }, diff --git a/sdk/include/crt/math.h b/sdk/include/crt/math.h index 2f92da209fe..ce896484cd7 100644 --- a/sdk/include/crt/math.h +++ b/sdk/include/crt/math.h @@ -169,7 +169,9 @@ _Check_return_ __CRT_INLINE float __CRTDECL ldexpf(_In_ float x, _In_ int y) { r _Check_return_ __CRT_INLINE long double __CRTDECL tanl(_In_ long double x) { return (tan((double)x)); } #endif -#if defined(__ia64__) || defined(_M_IA64) || \ +#if defined(_CRTBLD) +_Check_return_ float __cdecl fabsf(_In_ float x); +#elif defined(__ia64__) || defined(_M_IA64) || \ defined(__arm__) || defined(_M_ARM) || \ defined(__arm64__) || defined(_M_ARM64) _Check_return_ _CRT_JIT_INTRINSIC _CRTIMP float __cdecl fabsf(_In_ float x);

2 years, 6 months

[reactos] 01/01: [NTDLL_APITEST] Fix RtlGetNtProductType test

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96b847fd040da8f65e89c… commit 96b847fd040da8f65e89c0e12e913b54aecbaeaf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 26 12:01:57 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jun 26 16:09:52 2022 +0200 [NTDLL_APITEST] Fix RtlGetNtProductType test --- modules/rostests/apitests/ntdll/RtlGetNtProductType.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c index c7cc6b0eb9f..03ac8238e07 100644 --- a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c +++ b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c @@ -97,7 +97,7 @@ ChangeNtProductType(DWORD NtProductType) Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0, - KEY_QUERY_VALUE, + KEY_ALL_ACCESS, &Key); if (Result != ERROR_SUCCESS) { @@ -120,7 +120,7 @@ ChangeNtProductType(DWORD NtProductType) } RegCloseKey(Key); - return FALSE; + return TRUE; } START_TEST(RtlGetNtProductType) @@ -153,15 +153,15 @@ START_TEST(RtlGetNtProductType) /* Change product type in the registry */ ok_char(ChangeNtProductType(NtProductWinNt), TRUE); ok_char(RtlGetNtProductType(&ProductType2), TRUE); - ok_long(ProductType2, NtProductWinNt); + ok_long(ProductType2, ProductType); ok_char(ChangeNtProductType(NtProductLanManNt), TRUE); ok_char(RtlGetNtProductType(&ProductType2), TRUE); - ok_long(ProductType2, NtProductLanManNt); + ok_long(ProductType2, ProductType); ok_char(ChangeNtProductType(NtProductServer), TRUE); ok_char(RtlGetNtProductType(&ProductType2), TRUE); - ok_long(ProductType2, NtProductServer); + ok_long(ProductType2, ProductType); ok_char(ChangeNtProductType(ProductType), TRUE); }

2 years, 6 months

[reactos] 01/01: [NTDLL_APITEST] Check whether changing the product type in the registry has an effect on RtlGetNtProductType

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47842d784718a2e877a1e… commit 47842d784718a2e877a1e13a2ecc4c87cb9b5957 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 3 18:46:31 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 25 22:57:18 2022 +0200 [NTDLL_APITEST] Check whether changing the product type in the registry has an effect on RtlGetNtProductType --- .../rostests/apitests/ntdll/RtlGetNtProductType.c | 72 +++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c index 31549152839..c7cc6b0eb9f 100644 --- a/modules/rostests/apitests/ntdll/RtlGetNtProductType.c +++ b/modules/rostests/apitests/ntdll/RtlGetNtProductType.c @@ -68,11 +68,66 @@ ReturnNtProduct(PDWORD ProductNtType) return FALSE; } +static +BOOLEAN +ChangeNtProductType(DWORD NtProductType) +{ + PWSTR ProductTypeString; + LONG Result; + HKEY Key; + DWORD dwSize; + + if (NtProductType == NtProductWinNt) + { + ProductTypeString = L"WinNT"; + } + else if (NtProductType == NtProductLanManNt) + { + ProductTypeString = L"LanmanNT"; + } + else if (NtProductType == NtProductServer) + { + ProductTypeString = L"ServerNT"; + } + else + { + ok(FALSE, "Passed invalid product type to CHangeNtProduct: %lu", NtProductType); + } + + Result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", + 0, + KEY_QUERY_VALUE, + &Key); + if (Result != ERROR_SUCCESS) + { + ok(FALSE, "RegOpenKeyExW failed with 0x%lx\n", Result); + return FALSE; + } + + dwSize = ((DWORD)wcslen(ProductTypeString) + 1) * sizeof(WCHAR); + Result = RegSetValueExW(Key, + L"ProductType", + 0, + REG_SZ, + (PBYTE)ProductTypeString, + dwSize); + if (Result != ERROR_SUCCESS) + { + ok(FALSE, "RegSetValueExW failed with 0x%lx\n", Result); + RegCloseKey(Key); + return FALSE; + } + + RegCloseKey(Key); + return FALSE; +} + START_TEST(RtlGetNtProductType) { BOOLEAN Ret; DWORD ProductNtType; - NT_PRODUCT_TYPE ProductType = NtProductWinNt; + NT_PRODUCT_TYPE ProductType = NtProductWinNt, ProductType2; /* * Wrap the call in SEH. This ensures the testcase won't crash but also @@ -94,4 +149,19 @@ START_TEST(RtlGetNtProductType) Ret = RtlGetNtProductType(&ProductType); ok(Ret == TRUE, "Expected a valid product type value (and TRUE as returned success code) but got %u as status.\n", Ret); ok(ProductNtType == ProductType, "Expected the product type value to be the same but got %lu (original value pointed by RtlGetNtProductType() is %d).\n", ProductNtType, ProductType); + + /* Change product type in the registry */ + ok_char(ChangeNtProductType(NtProductWinNt), TRUE); + ok_char(RtlGetNtProductType(&ProductType2), TRUE); + ok_long(ProductType2, NtProductWinNt); + + ok_char(ChangeNtProductType(NtProductLanManNt), TRUE); + ok_char(RtlGetNtProductType(&ProductType2), TRUE); + ok_long(ProductType2, NtProductLanManNt); + + ok_char(ChangeNtProductType(NtProductServer), TRUE); + ok_char(RtlGetNtProductType(&ProductType2), TRUE); + ok_long(ProductType2, NtProductServer); + + ok_char(ChangeNtProductType(ProductType), TRUE); }

2 years, 6 months

[reactos] 01/01: [RTL] Implement dynamic function tables for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8521f6d7b5849d3b07b60… commit 8521f6d7b5849d3b07b6032f616d9fb48b8bc7ef Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jun 10 18:44:51 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jun 25 21:45:47 2022 +0200 [RTL] Implement dynamic function tables for x64 --- dll/ntdll/CMakeLists.txt | 2 +- dll/ntdll/def/ntdll.spec | 2 +- ntoskrnl/rtl/libsupp.c | 17 +++ sdk/lib/rtl/CMakeLists.txt | 1 + sdk/lib/rtl/amd64/dynfntbl.c | 326 +++++++++++++++++++++++++++++++++++++++++++ sdk/lib/rtl/amd64/unwind.c | 45 ++---- 6 files changed, 355 insertions(+), 38 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index be810e324f8..fbcd5272eb1 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -60,7 +60,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) set_subsystem(ntdll console) ################# END HACK ################# -target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB}) +target_link_libraries(ntdll rtl rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB}) if (STACK_PROTECTOR) target_sources(ntdll PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 57ba0653d7c..80d27637413 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -881,7 +881,7 @@ @ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) @ stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub -version=0x600+ -arch=x86_64 RtlGetFunctionTableListHead +@ stdcall -arch=x86_64 RtlGetFunctionTableListHead() @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stub -version=0x600+ RtlGetIntegerAtom @ stdcall RtlGetLastNtStatus() diff --git a/ntoskrnl/rtl/libsupp.c b/ntoskrnl/rtl/libsupp.c index e8d7b68df88..173944a0573 100644 --- a/ntoskrnl/rtl/libsupp.c +++ b/ntoskrnl/rtl/libsupp.c @@ -823,4 +823,21 @@ RtlCallVectoredContinueHandlers(_In_ PEXCEPTION_RECORD ExceptionRecord, return; } +#ifdef _M_AMD64 + +typedef PVOID PRUNTIME_FUNCTION, PUNWIND_HISTORY_TABLE; + +PRUNTIME_FUNCTION +NTAPI +RtlpLookupDynamicFunctionEntry( + _In_ DWORD64 ControlPc, + _Out_ PDWORD64 ImageBase, + _In_ PUNWIND_HISTORY_TABLE HistoryTable) +{ + /* No support for dynamic function tables in the kernel */ + return NULL; +} + +#endif + /* EOF */ diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index a8d2fdbe348..8550fe9fb8e 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -94,6 +94,7 @@ elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE bitmap64.c byteswap.c + amd64/dynfntbl.c amd64/except.c amd64/unwind.c amd64/stubs.c diff --git a/sdk/lib/rtl/amd64/dynfntbl.c b/sdk/lib/rtl/amd64/dynfntbl.c new file mode 100644 index 00000000000..67c76e7f640 --- /dev/null +++ b/sdk/lib/rtl/amd64/dynfntbl.c @@ -0,0 +1,326 @@ +/* + * PROJECT: ReactOS RTL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Dynamic function table support routines + * COPYRIGHT: Copyright 2022 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +#define TAG_RTLDYNFNTBL 'tfDP' + +typedef +_Function_class_(GET_RUNTIME_FUNCTION_CALLBACK) +PRUNTIME_FUNCTION +GET_RUNTIME_FUNCTION_CALLBACK( + _In_ DWORD64 ControlPc, + _In_opt_ PVOID Context); +typedef GET_RUNTIME_FUNCTION_CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK; + +typedef +_Function_class_(OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK) +DWORD +OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK( + _In_ HANDLE Process, + _In_ PVOID TableAddress, + _Out_ PDWORD Entries, + _Out_ PRUNTIME_FUNCTION* Functions); +typedef OUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK *POUT_OF_PROCESS_FUNCTION_TABLE_CALLBACK; + +typedef enum _FUNCTION_TABLE_TYPE +{ + RF_SORTED = 0x0, + RF_UNSORTED = 0x1, + RF_CALLBACK = 0x2, + RF_KERNEL_DYNAMIC = 0x3, +} FUNCTION_TABLE_TYPE; + +typedef struct _DYNAMIC_FUNCTION_TABLE +{ + LIST_ENTRY ListEntry; + PRUNTIME_FUNCTION FunctionTable; + LARGE_INTEGER TimeStamp; + ULONG64 MinimumAddress; + ULONG64 MaximumAddress; + ULONG64 BaseAddress; + PGET_RUNTIME_FUNCTION_CALLBACK Callback; + PVOID Context; + PWCHAR OutOfProcessCallbackDll; + FUNCTION_TABLE_TYPE Type; + ULONG EntryCount; +#if (NTDDI_VERSION <= NTDDI_WIN10) + // FIXME: RTL_BALANCED_NODE is defined in ntdef.h, it's impossible to get included here due to precompiled header + //RTL_BALANCED_NODE TreeNode; +#else + //RTL_BALANCED_NODE TreeNodeMin; + //RTL_BALANCED_NODE TreeNodeMax; +#endif +} DYNAMIC_FUNCTION_TABLE, *PDYNAMIC_FUNCTION_TABLE; + +RTL_SRWLOCK RtlpDynamicFunctionTableLock = { 0 }; +LIST_ENTRY RtlpDynamicFunctionTableList = { &RtlpDynamicFunctionTableList, &RtlpDynamicFunctionTableList }; + +static __inline +VOID +AcquireDynamicFunctionTableLockExclusive() +{ + RtlAcquireSRWLockExclusive(&RtlpDynamicFunctionTableLock); +} + +static __inline +VOID +ReleaseDynamicFunctionTableLockExclusive() +{ + RtlReleaseSRWLockExclusive(&RtlpDynamicFunctionTableLock); +} + +static __inline +VOID +AcquireDynamicFunctionTableLockShared() +{ + RtlAcquireSRWLockShared(&RtlpDynamicFunctionTableLock); +} + +static __inline +VOID +ReleaseDynamicFunctionTableLockShared() +{ + RtlReleaseSRWLockShared(&RtlpDynamicFunctionTableLock); +} + +/* + * https://docs.microsoft.com/en-us/windows/win32/devnotes/rtlgetfunctiontable… + */ +PLIST_ENTRY +NTAPI +RtlGetFunctionTableListHead(void) +{ + return &RtlpDynamicFunctionTableList; +} + +static +VOID +RtlpInsertDynamicFunctionTable(PDYNAMIC_FUNCTION_TABLE DynamicTable) +{ + //LARGE_INTEGER TimeStamp; + + AcquireDynamicFunctionTableLockExclusive(); + + /* Insert it into the list */ + InsertTailList(&RtlpDynamicFunctionTableList, &DynamicTable->ListEntry); + + // TODO: insert into RB-trees + + ReleaseDynamicFunctionTableLockExclusive(); +} + +BOOLEAN +NTAPI +RtlAddFunctionTable( + _In_ PRUNTIME_FUNCTION FunctionTable, + _In_ DWORD EntryCount, + _In_ DWORD64 BaseAddress) +{ + PDYNAMIC_FUNCTION_TABLE dynamicTable; + ULONG i; + + /* Allocate a dynamic function table */ + dynamicTable = RtlpAllocateMemory(sizeof(*dynamicTable), TAG_RTLDYNFNTBL); + if (dynamicTable == NULL) + { + DPRINT1("Failed to allocate dynamic function table\n"); + return FALSE; + } + + /* Initialize fields */ + dynamicTable->FunctionTable = FunctionTable; + dynamicTable->EntryCount = EntryCount; + dynamicTable->BaseAddress = BaseAddress; + dynamicTable->Callback = NULL; + dynamicTable->Context = NULL; + dynamicTable->Type = RF_UNSORTED; + + /* Loop all entries to find the margins */ + dynamicTable->MinimumAddress = ULONG64_MAX; + dynamicTable->MaximumAddress = 0; + for (i = 0; i < EntryCount; i++) + { + dynamicTable->MinimumAddress = min(dynamicTable->MinimumAddress, + FunctionTable[i].BeginAddress); + dynamicTable->MaximumAddress = max(dynamicTable->MaximumAddress, + FunctionTable[i].EndAddress); + } + + /* Insert the table into the list */ + RtlpInsertDynamicFunctionTable(dynamicTable); + + return TRUE; +} + +BOOLEAN +NTAPI +RtlInstallFunctionTableCallback( + _In_ DWORD64 TableIdentifier, + _In_ DWORD64 BaseAddress, + _In_ DWORD Length, + _In_ PGET_RUNTIME_FUNCTION_CALLBACK Callback, + _In_ PVOID Context, + _In_opt_z_ PCWSTR OutOfProcessCallbackDll) +{ + PDYNAMIC_FUNCTION_TABLE dynamicTable; + SIZE_T stringLength, allocationSize; + + /* Make sure the identifier is valid */ + if ((TableIdentifier & 3) != 3) + { + return FALSE; + } + + /* Check if we have a DLL name */ + if (OutOfProcessCallbackDll != NULL) + { + stringLength = wcslen(OutOfProcessCallbackDll) + 1; + } + else + { + stringLength = 0; + } + + /* Calculate required size */ + allocationSize = sizeof(DYNAMIC_FUNCTION_TABLE) + stringLength * sizeof(WCHAR); + + /* Allocate a dynamic function table */ + dynamicTable = RtlpAllocateMemory(allocationSize, TAG_RTLDYNFNTBL); + if (dynamicTable == NULL) + { + DPRINT1("Failed to allocate dynamic function table\n"); + return FALSE; + } + + /* Initialize fields */ + dynamicTable->FunctionTable = (PRUNTIME_FUNCTION)TableIdentifier; + dynamicTable->EntryCount = 0; + dynamicTable->BaseAddress = BaseAddress; + dynamicTable->Callback = Callback; + dynamicTable->Context = Context; + dynamicTable->Type = RF_CALLBACK; + dynamicTable->MinimumAddress = BaseAddress; + dynamicTable->MaximumAddress = BaseAddress + Length; + + /* If we have a DLL name, copy that, too */ + if (OutOfProcessCallbackDll != NULL) + { + dynamicTable->OutOfProcessCallbackDll = (PWCHAR)(dynamicTable + 1); + RtlCopyMemory(dynamicTable->OutOfProcessCallbackDll, + OutOfProcessCallbackDll, + stringLength * sizeof(WCHAR)); + } + else + { + dynamicTable->OutOfProcessCallbackDll = NULL; + } + + /* Insert the table into the list */ + RtlpInsertDynamicFunctionTable(dynamicTable); + + return TRUE; +} + +BOOLEAN +NTAPI +RtlDeleteFunctionTable( + _In_ PRUNTIME_FUNCTION FunctionTable) +{ + PLIST_ENTRY listLink; + PDYNAMIC_FUNCTION_TABLE dynamicTable; + BOOL removed = FALSE; + + AcquireDynamicFunctionTableLockExclusive(); + + /* Loop all tables to find the one to delete */ + for (listLink = RtlpDynamicFunctionTableList.Flink; + listLink != &RtlpDynamicFunctionTableList; + listLink = listLink->Flink) + { + dynamicTable = CONTAINING_RECORD(listLink, DYNAMIC_FUNCTION_TABLE, ListEntry); + + if (dynamicTable->FunctionTable == FunctionTable) + { + RemoveEntryList(&dynamicTable->ListEntry); + removed = TRUE; + break; + } + } + + ReleaseDynamicFunctionTableLockExclusive(); + + /* If we were successful, free the memory */ + if (removed) + { + RtlpFreeMemory(dynamicTable, TAG_RTLDYNFNTBL); + } + + return removed; +} + +PRUNTIME_FUNCTION +NTAPI +RtlpLookupDynamicFunctionEntry( + _In_ DWORD64 ControlPc, + _Out_ PDWORD64 ImageBase, + _In_ PUNWIND_HISTORY_TABLE HistoryTable) +{ + PLIST_ENTRY listLink; + PDYNAMIC_FUNCTION_TABLE dynamicTable; + PRUNTIME_FUNCTION functionTable, foundEntry = NULL; + PGET_RUNTIME_FUNCTION_CALLBACK callback; + ULONG i; + + AcquireDynamicFunctionTableLockShared(); + + /* Loop all tables to find the one matching ControlPc */ + for (listLink = RtlpDynamicFunctionTableList.Flink; + listLink != &RtlpDynamicFunctionTableList; + listLink = listLink->Flink) + { + dynamicTable = CONTAINING_RECORD(listLink, DYNAMIC_FUNCTION_TABLE, ListEntry); + + if ((ControlPc >= dynamicTable->MinimumAddress) && + (ControlPc < dynamicTable->MaximumAddress)) + { + /* Check if there is a callback */ + callback = dynamicTable->Callback; + if (callback != NULL) + { + PVOID context = dynamicTable->Context; + + *ImageBase = dynamicTable->BaseAddress; + ReleaseDynamicFunctionTableLockShared(); + return callback(ControlPc, context); + } + + /* Loop all entries in the function table */ + functionTable = dynamicTable->FunctionTable; + for (i = 0; i < dynamicTable->EntryCount; i++) + { + /* Check if this entry contains the address */ + if ((ControlPc >= functionTable[i].BeginAddress) && + (ControlPc < functionTable[i].EndAddress)) + { + foundEntry = &functionTable[i]; + *ImageBase = dynamicTable->BaseAddress; + goto Exit; + } + } + } + } + +Exit: + + ReleaseDynamicFunctionTableLockShared(); + + return foundEntry; +} diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 4fe42801281..49e3740bec4 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -107,6 +107,13 @@ RtlLookupFunctionTable( return Table; } +PRUNTIME_FUNCTION +NTAPI +RtlpLookupDynamicFunctionEntry( + _In_ DWORD64 ControlPc, + _Out_ PDWORD64 ImageBase, + _In_ PUNWIND_HISTORY_TABLE HistoryTable); + /*! RtlLookupFunctionEntry * \brief Locates the RUNTIME_FUNCTION entry corresponding to a code address. * \ref http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx @@ -126,10 +133,10 @@ RtlLookupFunctionEntry( /* Find the corresponding table */ FunctionTable = RtlLookupFunctionTable(ControlPc, ImageBase, &TableLength); - /* Fail, if no table is found */ + /* If no table is found, try dynamic function tables */ if (!FunctionTable) { - return NULL; + return RtlpLookupDynamicFunctionEntry(ControlPc, ImageBase, HistoryTable); } /* Use relative virtual address */ @@ -164,40 +171,6 @@ RtlLookupFunctionEntry( return NULL; } -BOOLEAN -NTAPI -RtlAddFunctionTable( - IN PRUNTIME_FUNCTION FunctionTable, - IN DWORD EntryCount, - IN DWORD64 BaseAddress) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOLEAN -NTAPI -RtlDeleteFunctionTable( - IN PRUNTIME_FUNCTION FunctionTable) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOLEAN -NTAPI -RtlInstallFunctionTableCallback( - IN DWORD64 TableIdentifier, - IN DWORD64 BaseAddress, - IN DWORD Length, - IN PGET_RUNTIME_FUNCTION_CALLBACK Callback, - IN PVOID Context, - IN PCWSTR OutOfProcessCallbackDll) -{ - UNIMPLEMENTED; - return FALSE; -} - static __inline ULONG

2 years, 6 months

[reactos] 01/01: [IP] AddrCountPrefixBits(): Fix loop condition (#4556)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef1311b7a4cd65756356e… commit ef1311b7a4cd65756356ea49c199234f1cb7148b Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 25 17:14:03 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 25 17:14:03 2022 +0200 [IP] AddrCountPrefixBits(): Fix loop condition (#4556) Properly handle BitTest reaching 0. CORE-18225 --- sdk/lib/drivers/ip/network/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/drivers/ip/network/address.c b/sdk/lib/drivers/ip/network/address.c index 6ddbfd97e6d..27906f62e98 100644 --- a/sdk/lib/drivers/ip/network/address.c +++ b/sdk/lib/drivers/ip/network/address.c @@ -71,7 +71,7 @@ UINT AddrCountPrefixBits( PIP_ADDRESS Netmask ) { ULONG TestMask = IPv4NToHl(Netmask->Address.IPv4Address); - while( (BitTest & TestMask) == BitTest ) { + while ((BitTest & TestMask) != 0) { Prefix++; BitTest >>= 1; }

2 years, 6 months

[reactos] 01/01: [DISKPART] Support quoted command options in script files

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4a398fb13ccca1d1a3db… commit d4a398fb13ccca1d1a3db735b7e0bf466f991788 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 25 15:20:40 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 25 15:20:40 2022 +0200 [DISKPART] Support quoted command options in script files --- base/system/diskpart/interpreter.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/base/system/diskpart/interpreter.c b/base/system/diskpart/interpreter.c index 7ba17480605..bc18f9f2402 100644 --- a/base/system/diskpart/interpreter.c +++ b/base/system/diskpart/interpreter.c @@ -185,21 +185,26 @@ InterpretScript(LPWSTR input_line) LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; + BOOL bQuote = FALSE; LPWSTR ptr; memset(args_vector, 0, sizeof(args_vector)); + bQuote = FALSE; ptr = input_line; while (*ptr != 0) { - if (iswspace(*ptr) || *ptr == L'\n') + if (*ptr == L'"') + bQuote = !bQuote; + + if ((iswspace(*ptr) && (bQuote == FALSE))|| *ptr == L'\n') { *ptr = 0; bWhiteSpace = TRUE; } else { - if ((bWhiteSpace != FALSE) && (args_count < MAX_ARGS_COUNT)) + if ((bWhiteSpace != FALSE) && (bQuote == FALSE) && (args_count < MAX_ARGS_COUNT)) { args_vector[args_count] = ptr; args_count++;

2 years, 6 months

[reactos] 01/01: [HHCTRL.OCX] Don't break WineSync. Addendum to 65d7fb1. (#4554)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a72a52ce886c5a1bfa1e… commit 3a72a52ce886c5a1bfa1e87b1a9b759e85a5c3d4 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Jun 21 19:48:54 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 21 15:48:54 2022 +0300 [HHCTRL.OCX] Don't break WineSync. Addendum to 65d7fb1. (#4554) Also minor code formatting for HH_LoadString. --- dll/win32/hhctrl.ocx/chm.c | 6 ++++++ dll/win32/hhctrl.ocx/help.c | 25 +++++++++++++++++++++++++ dll/win32/hhctrl.ocx/hhctrl.h | 2 ++ dll/win32/hhctrl.ocx/hhctrl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Cs.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Da.rc | 3 ++- dll/win32/hhctrl.ocx/lang/De.rc | 3 ++- dll/win32/hhctrl.ocx/lang/El.rc | 3 ++- dll/win32/hhctrl.ocx/lang/En.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Es.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Fi.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Fr.rc | 3 ++- dll/win32/hhctrl.ocx/lang/He.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Hu.rc | 3 ++- dll/win32/hhctrl.ocx/lang/It.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ja.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ko.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Lt.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Nl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/No.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Pl.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Pt.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ro.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Ru.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Si.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Sq.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Sv.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Tr.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Uk.rc | 3 ++- dll/win32/hhctrl.ocx/lang/Zh.rc | 3 ++- dll/win32/hhctrl.ocx/resource.h | 3 ++- 31 files changed, 89 insertions(+), 28 deletions(-) diff --git a/dll/win32/hhctrl.ocx/chm.c b/dll/win32/hhctrl.ocx/chm.c index 6336026b378..14ad60a8977 100644 --- a/dll/win32/hhctrl.ocx/chm.c +++ b/dll/win32/hhctrl.ocx/chm.c @@ -21,7 +21,9 @@ #include "hhctrl.h" #include "stream.h" +#ifdef __REACTOS__ #include "resource.h" +#endif #include "winreg.h" #include "shlwapi.h" @@ -460,7 +462,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); if (!info->WinType.pszCaption) +#ifdef __REACTOS__ info->WinType.pszCaption = info->stringsW.pszCaption = (info->pCHMInfo->defTitle ? strdupW(info->pCHMInfo->defTitle) : HH_LoadString(IDS_DEFTITLE)); +#else + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : empty); +#endif if (!info->WinType.pszFile) info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : empty); if (!info->WinType.pszToc) diff --git a/dll/win32/hhctrl.ocx/help.c b/dll/win32/hhctrl.ocx/help.c index de9dc086726..9696f0b846a 100644 --- a/dll/win32/hhctrl.ocx/help.c +++ b/dll/win32/hhctrl.ocx/help.c @@ -171,6 +171,7 @@ static inline BOOL navigation_visible(HHInfo *info) } /* Loads a string from the resource file */ +#ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) { LPWSTR string = NULL; @@ -179,12 +180,28 @@ LPWSTR HH_LoadString(DWORD dwID) iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ + memcpy(string, stringresource, iSize * sizeof(WCHAR)); + string[iSize] = UNICODE_NULL; + + return string; +} +#else +static LPWSTR HH_LoadString(DWORD dwID) +{ + LPWSTR string = NULL; + LPCWSTR stringresource; + int iSize; + + iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ memcpy(string, stringresource, iSize*sizeof(WCHAR)); string[iSize] = 0; return string; } +#endif static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) { @@ -1620,12 +1637,20 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) wcex.cbClsExtra = 0; wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; +#ifdef __REACTOS__ wcex.hIcon = LoadIconW(hhctrl_hinstance, MAKEINTRESOURCEW(IDI_HHICON)); +#else + wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); +#endif wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_MENU + 1); wcex.lpszMenuName = NULL; wcex.lpszClassName = windowClassW; +#ifdef __REACTOS__ wcex.hIconSm = NULL; +#else + wcex.hIconSm = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); +#endif RegisterClassExW(&wcex); diff --git a/dll/win32/hhctrl.ocx/hhctrl.h b/dll/win32/hhctrl.ocx/hhctrl.h index f302815b45d..9b8190d510a 100644 --- a/dll/win32/hhctrl.ocx/hhctrl.h +++ b/dll/win32/hhctrl.ocx/hhctrl.h @@ -229,7 +229,9 @@ WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; extern struct list window_list DECLSPEC_HIDDEN; HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; +#ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) DECLSPEC_HIDDEN; +#endif BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; diff --git a/dll/win32/hhctrl.ocx/hhctrl.rc b/dll/win32/hhctrl.ocx/hhctrl.rc index f743a47239e..1a5e9ec16f6 100644 --- a/dll/win32/hhctrl.ocx/hhctrl.rc +++ b/dll/win32/hhctrl.ocx/hhctrl.rc @@ -114,9 +114,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" +#ifdef __REACTOS__ /* help viewer window icon */ IDI_HHICON ICON "res/hh.ico" - +#endif /* @makedep: hhtoolbar.bmp */ IDB_HHTOOLBAR BITMAP "res/hhtoolbar.bmp" diff --git a/dll/win32/hhctrl.ocx/lang/Cs.rc b/dll/win32/hhctrl.ocx/lang/Cs.rc index ab0e3a0ad87..8495e41e184 100644 --- a/dll/win32/hhctrl.ocx/lang/Cs.rc +++ b/dll/win32/hhctrl.ocx/lang/Cs.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Obsah" IDS_INDEX "I&ndex" IDS_SEARCH "&Hledat" diff --git a/dll/win32/hhctrl.ocx/lang/Da.rc b/dll/win32/hhctrl.ocx/lang/Da.rc index a9a18b62117..807682267a6 100644 --- a/dll/win32/hhctrl.ocx/lang/Da.rc +++ b/dll/win32/hhctrl.ocx/lang/Da.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Indhold" IDS_INDEX "I&ndeks" IDS_SEARCH "&Søg" diff --git a/dll/win32/hhctrl.ocx/lang/De.rc b/dll/win32/hhctrl.ocx/lang/De.rc index a5e73a8c487..a88450e4bba 100644 --- a/dll/win32/hhctrl.ocx/lang/De.rc +++ b/dll/win32/hhctrl.ocx/lang/De.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Inhalt" IDS_INDEX "I&ndex" IDS_SEARCH "&Suche" diff --git a/dll/win32/hhctrl.ocx/lang/El.rc b/dll/win32/hhctrl.ocx/lang/El.rc index ea2dba6a954..559fcbfc593 100644 --- a/dll/win32/hhctrl.ocx/lang/El.rc +++ b/dll/win32/hhctrl.ocx/lang/El.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Περιεχόμενα" IDS_INDEX "I&ndex" IDS_SEARCH "&Αναζήτηση" diff --git a/dll/win32/hhctrl.ocx/lang/En.rc b/dll/win32/hhctrl.ocx/lang/En.rc index 9be92a1ea3f..790dd4416b7 100644 --- a/dll/win32/hhctrl.ocx/lang/En.rc +++ b/dll/win32/hhctrl.ocx/lang/En.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contents" IDS_INDEX "I&ndex" IDS_SEARCH "&Search" diff --git a/dll/win32/hhctrl.ocx/lang/Es.rc b/dll/win32/hhctrl.ocx/lang/Es.rc index d0f52c2ba2c..879dae1e778 100644 --- a/dll/win32/hhctrl.ocx/lang/Es.rc +++ b/dll/win32/hhctrl.ocx/lang/Es.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contenido" IDS_INDEX "Í&ndice" IDS_SEARCH "&Buscar" diff --git a/dll/win32/hhctrl.ocx/lang/Fi.rc b/dll/win32/hhctrl.ocx/lang/Fi.rc index 01627043d66..72240632ae2 100644 --- a/dll/win32/hhctrl.ocx/lang/Fi.rc +++ b/dll/win32/hhctrl.ocx/lang/Fi.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Sisällys" IDS_INDEX "&Hakemisto" IDS_SEARCH "&Etsi" diff --git a/dll/win32/hhctrl.ocx/lang/Fr.rc b/dll/win32/hhctrl.ocx/lang/Fr.rc index a564492455b..8fb8de93d10 100644 --- a/dll/win32/hhctrl.ocx/lang/Fr.rc +++ b/dll/win32/hhctrl.ocx/lang/Fr.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "Aide HTML" - +#endif IDS_CONTENTS "Somm&aire" IDS_INDEX "I&ndex" IDS_SEARCH "&Recherche" diff --git a/dll/win32/hhctrl.ocx/lang/He.rc b/dll/win32/hhctrl.ocx/lang/He.rc index f5a3c16a581..dc7a4bf9b95 100644 --- a/dll/win32/hhctrl.ocx/lang/He.rc +++ b/dll/win32/hhctrl.ocx/lang/He.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "תוכ&ן" IDS_INDEX "&אינקס" IDS_SEARCH "&חפש" diff --git a/dll/win32/hhctrl.ocx/lang/Hu.rc b/dll/win32/hhctrl.ocx/lang/Hu.rc index cbb837489f3..0200ef96d06 100644 --- a/dll/win32/hhctrl.ocx/lang/Hu.rc +++ b/dll/win32/hhctrl.ocx/lang/Hu.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Tartalom" IDS_INDEX "I&ndex" IDS_SEARCH "&Keresés" diff --git a/dll/win32/hhctrl.ocx/lang/It.rc b/dll/win32/hhctrl.ocx/lang/It.rc index a9522943bef..5a934a5cca2 100644 --- a/dll/win32/hhctrl.ocx/lang/It.rc +++ b/dll/win32/hhctrl.ocx/lang/It.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Contenuti" IDS_INDEX "&Indice" IDS_SEARCH "&Ricerca" diff --git a/dll/win32/hhctrl.ocx/lang/Ja.rc b/dll/win32/hhctrl.ocx/lang/Ja.rc index 9cb0943b319..a359e8bed0c 100644 --- a/dll/win32/hhctrl.ocx/lang/Ja.rc +++ b/dll/win32/hhctrl.ocx/lang/Ja.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "目次(&C)" IDS_INDEX "索引(&N)" IDS_SEARCH "検索(&S)" diff --git a/dll/win32/hhctrl.ocx/lang/Ko.rc b/dll/win32/hhctrl.ocx/lang/Ko.rc index cdf568f5674..f158d1cc9b0 100644 --- a/dll/win32/hhctrl.ocx/lang/Ko.rc +++ b/dll/win32/hhctrl.ocx/lang/Ko.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "목록(&C)" IDS_INDEX "인덱스(&N)" IDS_SEARCH "찾기(&S)" diff --git a/dll/win32/hhctrl.ocx/lang/Lt.rc b/dll/win32/hhctrl.ocx/lang/Lt.rc index b672bf3994a..c01d293968a 100644 --- a/dll/win32/hhctrl.ocx/lang/Lt.rc +++ b/dll/win32/hhctrl.ocx/lang/Lt.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Turinys" IDS_INDEX "&Rodyklė" IDS_SEARCH "&Paieška" diff --git a/dll/win32/hhctrl.ocx/lang/Nl.rc b/dll/win32/hhctrl.ocx/lang/Nl.rc index a0b78cf7dac..fb42f683b1d 100644 --- a/dll/win32/hhctrl.ocx/lang/Nl.rc +++ b/dll/win32/hhctrl.ocx/lang/Nl.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Inhoud" IDS_INDEX "I&ndex" IDS_SEARCH "&Zoeken" diff --git a/dll/win32/hhctrl.ocx/lang/No.rc b/dll/win32/hhctrl.ocx/lang/No.rc index f645af26faf..67e3385916b 100644 --- a/dll/win32/hhctrl.ocx/lang/No.rc +++ b/dll/win32/hhctrl.ocx/lang/No.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Innhold" IDS_INDEX "I&ndeks" IDS_SEARCH "&Søk" diff --git a/dll/win32/hhctrl.ocx/lang/Pl.rc b/dll/win32/hhctrl.ocx/lang/Pl.rc index dc2dc2f7d37..f3498fb9fb8 100644 --- a/dll/win32/hhctrl.ocx/lang/Pl.rc +++ b/dll/win32/hhctrl.ocx/lang/Pl.rc @@ -24,8 +24,9 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Spis treści" IDS_INDEX "&Indeks" IDS_SEARCH "&Wyszukaj" diff --git a/dll/win32/hhctrl.ocx/lang/Pt.rc b/dll/win32/hhctrl.ocx/lang/Pt.rc index c0ef9c87186..95550299352 100644 --- a/dll/win32/hhctrl.ocx/lang/Pt.rc +++ b/dll/win32/hhctrl.ocx/lang/Pt.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Conteúdos" IDS_INDEX "&Índice" IDS_SEARCH "&Pesquisar" diff --git a/dll/win32/hhctrl.ocx/lang/Ro.rc b/dll/win32/hhctrl.ocx/lang/Ro.rc index e106ffeaf94..97555fc898a 100644 --- a/dll/win32/hhctrl.ocx/lang/Ro.rc +++ b/dll/win32/hhctrl.ocx/lang/Ro.rc @@ -27,8 +27,9 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "C&uprins" IDS_INDEX "In&dex" IDS_SEARCH "&Caută" diff --git a/dll/win32/hhctrl.ocx/lang/Ru.rc b/dll/win32/hhctrl.ocx/lang/Ru.rc index 8e8e51413d2..62cef188c06 100644 --- a/dll/win32/hhctrl.ocx/lang/Ru.rc +++ b/dll/win32/hhctrl.ocx/lang/Ru.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Содержание" IDS_INDEX "&Оглавление" IDS_SEARCH "&Поиск" diff --git a/dll/win32/hhctrl.ocx/lang/Si.rc b/dll/win32/hhctrl.ocx/lang/Si.rc index 3961f17ca97..9c62b7b77fc 100644 --- a/dll/win32/hhctrl.ocx/lang/Si.rc +++ b/dll/win32/hhctrl.ocx/lang/Si.rc @@ -25,8 +25,9 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Vsebina" IDS_INDEX "I&ndeks" IDS_SEARCH "&Iskanje" diff --git a/dll/win32/hhctrl.ocx/lang/Sq.rc b/dll/win32/hhctrl.ocx/lang/Sq.rc index 5fca78c68ec..68cab4c2103 100644 --- a/dll/win32/hhctrl.ocx/lang/Sq.rc +++ b/dll/win32/hhctrl.ocx/lang/Sq.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "Përmbajtja" IDS_INDEX "I&ndex" IDS_SEARCH "Kerko" diff --git a/dll/win32/hhctrl.ocx/lang/Sv.rc b/dll/win32/hhctrl.ocx/lang/Sv.rc index ccf488aeea9..19072bd110d 100644 --- a/dll/win32/hhctrl.ocx/lang/Sv.rc +++ b/dll/win32/hhctrl.ocx/lang/Sv.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Innehåll" IDS_INDEX "I&ndex" IDS_SEARCH "&Sök" diff --git a/dll/win32/hhctrl.ocx/lang/Tr.rc b/dll/win32/hhctrl.ocx/lang/Tr.rc index c1b4e3e1bb1..05775e0b075 100644 --- a/dll/win32/hhctrl.ocx/lang/Tr.rc +++ b/dll/win32/hhctrl.ocx/lang/Tr.rc @@ -23,8 +23,9 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&İçindekiler" IDS_INDEX "&Dizin" IDS_SEARCH "&Ara" diff --git a/dll/win32/hhctrl.ocx/lang/Uk.rc b/dll/win32/hhctrl.ocx/lang/Uk.rc index 017786967c8..6bd8fe2650a 100644 --- a/dll/win32/hhctrl.ocx/lang/Uk.rc +++ b/dll/win32/hhctrl.ocx/lang/Uk.rc @@ -28,8 +28,9 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "&Зміст" IDS_INDEX "&Вказівник" IDS_SEARCH "&Пошук" diff --git a/dll/win32/hhctrl.ocx/lang/Zh.rc b/dll/win32/hhctrl.ocx/lang/Zh.rc index 39036f99e09..d45021a8c94 100644 --- a/dll/win32/hhctrl.ocx/lang/Zh.rc +++ b/dll/win32/hhctrl.ocx/lang/Zh.rc @@ -26,8 +26,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN +#ifdef __REACTOS__ IDS_DEFTITLE "HTML Help" - +#endif IDS_CONTENTS "内容(&C)" IDS_INDEX "索引(&N)" IDS_SEARCH "搜索(&S)" diff --git a/dll/win32/hhctrl.ocx/resource.h b/dll/win32/hhctrl.ocx/resource.h index a47f3a4c2c5..02c5b490bbf 100644 --- a/dll/win32/hhctrl.ocx/resource.h +++ b/dll/win32/hhctrl.ocx/resource.h @@ -25,9 +25,10 @@ #include <wingdi.h> #include <htmlhelp.h> +#ifdef __REACTOS__ #define IDI_HHICON 100 - #define IDS_DEFTITLE 0 +#endif #define IDS_CONTENTS 1 #define IDS_INDEX 2 #define IDS_SEARCH 3

2 years, 6 months

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 June 2022