diff --git a/arm64_2numberparsing__defs_8h_source.html b/arm64_2numberparsing__defs_8h_source.html index 25ef0e549..5d394af00 100644 --- a/arm64_2numberparsing__defs_8h_source.html +++ b/arm64_2numberparsing__defs_8h_source.html @@ -102,10 +102,10 @@ $(document).ready(function(){initNavTree('arm64_2numberparsing__defs_8h_source.h
9 
10 #include <cstring>
11 
-
12 #if SIMDJSON_IS_ARM64
+
12 #if _M_ARM64
13 // __umulh requires intrin.h
14 #include <intrin.h>
-
15 #endif // SIMDJSON_IS_ARM64
+
15 #endif // _M_ARM64
16 
17 namespace simdjson {
18 namespace arm64 {
@@ -124,13 +124,13 @@ $(document).ready(function(){initNavTree('arm64_2numberparsing__defs_8h_source.h
32 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
33  internal::value128 answer;
34 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
35 #if SIMDJSON_IS_ARM64
+
35 #ifdef _M_ARM64
36  // ARM64 has native support for 64-bit multiplications, no need to emultate
37  answer.high = __umulh(value1, value2);
38  answer.low = value1 * value2;
39 #else
40  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
41 #endif // SIMDJSON_IS_ARM64
+
41 #endif // _M_ARM64
42 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
43  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
44  answer.low = uint64_t(r);
diff --git a/fallback_2numberparsing__defs_8h_source.html b/fallback_2numberparsing__defs_8h_source.html index 5803f9d32..285b78508 100644 --- a/fallback_2numberparsing__defs_8h_source.html +++ b/fallback_2numberparsing__defs_8h_source.html @@ -146,13 +146,13 @@ $(document).ready(function(){initNavTree('fallback_2numberparsing__defs_8h_sourc
56 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
57  internal::value128 answer;
58 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
59 #if SIMDJSON_IS_ARM64
+
59 #ifdef _M_ARM64
60  // ARM64 has native support for 64-bit multiplications, no need to emultate
61  answer.high = __umulh(value1, value2);
62  answer.low = value1 * value2;
63 #else
64  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
65 #endif // SIMDJSON_IS_ARM64
+
65 #endif // _M_ARM64
66 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
67  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
68  answer.low = uint64_t(r);
diff --git a/haswell_2numberparsing__defs_8h_source.html b/haswell_2numberparsing__defs_8h_source.html index a5a108987..31db1d202 100644 --- a/haswell_2numberparsing__defs_8h_source.html +++ b/haswell_2numberparsing__defs_8h_source.html @@ -128,13 +128,13 @@ $(document).ready(function(){initNavTree('haswell_2numberparsing__defs_8h_source
37 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
38  internal::value128 answer;
39 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
40 #if SIMDJSON_IS_ARM64
+
40 #ifdef _M_ARM64
41  // ARM64 has native support for 64-bit multiplications, no need to emultate
42  answer.high = __umulh(value1, value2);
43  answer.low = value1 * value2;
44 #else
45  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
46 #endif // SIMDJSON_IS_ARM64
+
46 #endif // _M_ARM64
47 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
48  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
49  answer.low = uint64_t(r);
diff --git a/icelake_2numberparsing__defs_8h_source.html b/icelake_2numberparsing__defs_8h_source.html index 4460fd522..f184c8a03 100644 --- a/icelake_2numberparsing__defs_8h_source.html +++ b/icelake_2numberparsing__defs_8h_source.html @@ -125,13 +125,13 @@ $(document).ready(function(){initNavTree('icelake_2numberparsing__defs_8h_source
33 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
34  internal::value128 answer;
35 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
36 #if SIMDJSON_IS_ARM64
+
36 #ifdef _M_ARM64
37  // ARM64 has native support for 64-bit multiplications, no need to emultate
38  answer.high = __umulh(value1, value2);
39  answer.low = value1 * value2;
40 #else
41  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
42 #endif // SIMDJSON_IS_ARM64
+
42 #endif // _M_ARM64
43 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
44  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
45  answer.low = uint64_t(r);
diff --git a/portability_8h_source.html b/portability_8h_source.html index dc174326b..f9d150429 100644 --- a/portability_8h_source.html +++ b/portability_8h_source.html @@ -115,9 +115,9 @@ $(document).ready(function(){initNavTree('portability_8h_source.html',''); initR
32 #endif // __clang__
33 #endif // _MSC_VER
34 
-
35 #if (defined(__x86_64__) || defined(_M_AMD64)) && !defined(_M_ARM64EC)
+
35 #if defined(__x86_64__) || defined(_M_AMD64)
36 #define SIMDJSON_IS_X86_64 1
-
37 #elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+
37 #elif defined(__aarch64__) || defined(_M_ARM64)
38 #define SIMDJSON_IS_ARM64 1
39 #elif defined(__riscv) && __riscv_xlen == 64
40 #define SIMDJSON_IS_RISCV64 1
diff --git a/ppc64_2numberparsing__defs_8h_source.html b/ppc64_2numberparsing__defs_8h_source.html index f9c82c8ee..d18b4e540 100644 --- a/ppc64_2numberparsing__defs_8h_source.html +++ b/ppc64_2numberparsing__defs_8h_source.html @@ -132,13 +132,13 @@ $(document).ready(function(){initNavTree('ppc64_2numberparsing__defs_8h_source.h
41 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
42  internal::value128 answer;
43 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
44 #if SIMDJSON_IS_ARM64
+
44 #ifdef _M_ARM64
45  // ARM64 has native support for 64-bit multiplications, no need to emultate
46  answer.high = __umulh(value1, value2);
47  answer.low = value1 * value2;
48 #else
49  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
50 #endif // SIMDJSON_IS_ARM64
+
50 #endif // _M_ARM64
51 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
52  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
53  answer.low = uint64_t(r);
diff --git a/westmere_2numberparsing__defs_8h_source.html b/westmere_2numberparsing__defs_8h_source.html index ad828ed0d..f25cfab21 100644 --- a/westmere_2numberparsing__defs_8h_source.html +++ b/westmere_2numberparsing__defs_8h_source.html @@ -126,13 +126,13 @@ $(document).ready(function(){initNavTree('westmere_2numberparsing__defs_8h_sourc
35 simdjson_inline internal::value128 full_multiplication(uint64_t value1, uint64_t value2) {
36  internal::value128 answer;
37 #if SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
-
38 #if SIMDJSON_IS_ARM64
+
38 #ifdef _M_ARM64
39  // ARM64 has native support for 64-bit multiplications, no need to emultate
40  answer.high = __umulh(value1, value2);
41  answer.low = value1 * value2;
42 #else
43  answer.low = _umul128(value1, value2, &answer.high); // _umul128 not available on ARM64
-
44 #endif // SIMDJSON_IS_ARM64
+
44 #endif // _M_ARM64
45 #else // SIMDJSON_REGULAR_VISUAL_STUDIO || SIMDJSON_IS_32BITS
46  __uint128_t r = (static_cast<__uint128_t>(value1)) * value2;
47  answer.low = uint64_t(r);