Skip to content

Commit 664f608

Browse files
mr-cmr-c
committed
add some more casts
1 parent eebfeb2 commit 664f608

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

Diff for: ‎simde/arm/neon/cvt_n.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ simde_vcvth_n_u16_f16(simde_float16_t a, const int n)
4444
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 16) {
4545
return simde_vcvth_u16_f16(
4646
simde_float16_from_float32(
47-
simde_float16_to_float32(a) * HEDLEY_STATIC_CAST(simde_float32_t, (UINT64_C(1) << n))));
47+
simde_float16_to_float32(a) * HEDLEY_STATIC_CAST(simde_float32_t, (UINT32_C(1) << n))));
4848
}
4949
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE) && defined(SIMDE_ARM_NEON_FP16)
5050
#define simde_vcvth_n_u16_f16(a, n) vcvth_n_u16_f16(a, n)
@@ -61,7 +61,7 @@ simde_vcvth_n_f16_s16(int16_t a, const int n)
6161
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 16) {
6262
return simde_float16_from_float32(
6363
HEDLEY_STATIC_CAST(simde_float32_t,
64-
HEDLEY_STATIC_CAST(simde_float64_t, a) / (UINT64_C(1) << n)));
64+
HEDLEY_STATIC_CAST(simde_float64_t, a) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
6565
}
6666
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE) && defined(SIMDE_ARM_NEON_FP16)
6767
#define simde_vcvth_n_f16_s16(a, n) vcvth_n_f16_s16(a, n)
@@ -78,7 +78,7 @@ simde_vcvth_n_f16_u16(uint16_t a, const int n)
7878
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 16) {
7979
return simde_float16_from_float32(
8080
HEDLEY_STATIC_CAST(simde_float32_t,
81-
HEDLEY_STATIC_CAST(simde_float64_t, a) / (UINT64_C(1) << n)));
81+
HEDLEY_STATIC_CAST(simde_float64_t, a) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
8282
}
8383
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE) && defined(SIMDE_ARM_NEON_FP16)
8484
#define simde_vcvth_n_f16_u16(a, n) vcvth_n_f16_u16(a, n)
@@ -122,7 +122,7 @@ simde_float32_t
122122
simde_vcvts_n_f32_s32(int32_t a, const int n)
123123
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 32) {
124124
return HEDLEY_STATIC_CAST(simde_float32_t,
125-
HEDLEY_STATIC_CAST(simde_float64_t, a) / (UINT64_C(1) << n));
125+
HEDLEY_STATIC_CAST(simde_float64_t, a) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
126126
}
127127
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
128128
#define simde_vcvts_n_f32_s32(a, n) vcvts_n_f32_s32(a, n)
@@ -137,7 +137,7 @@ simde_float32_t
137137
simde_vcvts_n_f32_u32(uint32_t a, const int n)
138138
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 32) {
139139
return HEDLEY_STATIC_CAST(simde_float32_t,
140-
HEDLEY_STATIC_CAST(simde_float64_t, a) / (UINT64_C(1) << n));
140+
HEDLEY_STATIC_CAST(simde_float64_t, a) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
141141
}
142142
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
143143
#define simde_vcvts_n_f32_u32(a, n) vcvts_n_f32_u32(a, n)
@@ -151,7 +151,7 @@ SIMDE_FUNCTION_ATTRIBUTES
151151
int64_t
152152
simde_vcvtd_n_s64_f64(simde_float64_t a, const int n)
153153
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 64) {
154-
return simde_vcvtd_s64_f64(a * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
154+
return simde_vcvtd_s64_f64(a * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
155155
}
156156
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
157157
#define simde_vcvtd_n_s64_f64(a, n) vcvtd_n_s64_f64(a, n)
@@ -165,7 +165,7 @@ SIMDE_FUNCTION_ATTRIBUTES
165165
uint64_t
166166
simde_vcvtd_n_u64_f64(simde_float64_t a, const int n)
167167
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 64) {
168-
return simde_vcvtd_u64_f64(a * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
168+
return simde_vcvtd_u64_f64(a * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
169169
}
170170
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
171171
#define simde_vcvtd_n_u64_f64(a, n) vcvtd_n_u64_f64(a, n)
@@ -179,7 +179,7 @@ SIMDE_FUNCTION_ATTRIBUTES
179179
simde_float64_t
180180
simde_vcvtd_n_f64_s64(int64_t a, const int n)
181181
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 64) {
182-
return HEDLEY_STATIC_CAST(simde_float64_t, a) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n);
182+
return HEDLEY_STATIC_CAST(simde_float64_t, a) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
183183
}
184184
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
185185
#define simde_vcvtd_n_f64_s64(a, n) vcvtd_n_f64_s64(a, n)
@@ -193,7 +193,7 @@ SIMDE_FUNCTION_ATTRIBUTES
193193
simde_float64_t
194194
simde_vcvtd_n_f64_u64(uint64_t a, const int n)
195195
SIMDE_REQUIRE_CONSTANT_RANGE(n, 1, 64) {
196-
return HEDLEY_STATIC_CAST(simde_float64_t, a) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n);
196+
return HEDLEY_STATIC_CAST(simde_float64_t, a) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
197197
}
198198
#if defined(SIMDE_ARM_NEON_A64V8_NATIVE)
199199
#define simde_vcvtd_n_f64_u64(a, n) vcvtd_n_f64_u64(a, n)
@@ -234,7 +234,7 @@ simde_vcvt_n_s64_f64(simde_float64x1_t a, const int n)
234234

235235
SIMDE_VECTORIZE
236236
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
237-
r_.values[i] = simde_vcvtd_s64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
237+
r_.values[i] = simde_vcvtd_s64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
238238
}
239239

240240
return simde_int64x1_from_private(r_);
@@ -303,7 +303,7 @@ simde_vcvt_n_u64_f64(simde_float64x1_t a, const int n)
303303

304304
SIMDE_VECTORIZE
305305
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
306-
r_.values[i] = simde_vcvtd_u64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
306+
r_.values[i] = simde_vcvtd_u64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
307307
}
308308

309309
return simde_uint64x1_from_private(r_);
@@ -348,7 +348,7 @@ simde_vcvtq_n_s64_f64(simde_float64x2_t a, const int n)
348348

349349
SIMDE_VECTORIZE
350350
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
351-
r_.values[i] = simde_vcvtd_s64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
351+
r_.values[i] = simde_vcvtd_s64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
352352
}
353353

354354
return simde_int64x2_from_private(r_);
@@ -418,7 +418,7 @@ simde_vcvtq_n_u64_f64(simde_float64x2_t a, const int n)
418418

419419
SIMDE_VECTORIZE
420420
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
421-
r_.values[i] = simde_vcvtd_u64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
421+
r_.values[i] = simde_vcvtd_u64_f64(a_.values[i] * ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
422422
}
423423

424424
return simde_uint64x2_from_private(r_);
@@ -441,7 +441,7 @@ simde_vcvt_n_f16_u16(simde_uint16x4_t a, const int n)
441441

442442
SIMDE_VECTORIZE
443443
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
444-
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n)));
444+
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
445445
}
446446

447447
return simde_float16x4_from_private(r_);
@@ -464,7 +464,7 @@ simde_vcvt_n_f16_s16(simde_int16x4_t a, const int n)
464464

465465
SIMDE_VECTORIZE
466466
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
467-
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n)));
467+
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
468468
}
469469

470470
return simde_float16x4_from_private(r_);
@@ -487,7 +487,7 @@ simde_vcvtq_n_f16_u16(simde_uint16x8_t a, const int n)
487487

488488
SIMDE_VECTORIZE
489489
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
490-
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n)));
490+
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
491491
}
492492

493493
return simde_float16x8_from_private(r_);
@@ -510,7 +510,7 @@ simde_vcvtq_n_f16_s16(simde_int16x8_t a, const int n)
510510

511511
SIMDE_VECTORIZE
512512
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
513-
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n)));
513+
r_.values[i] = simde_float16_from_float32(HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
514514
}
515515

516516
return simde_float16x8_from_private(r_);
@@ -533,7 +533,7 @@ simde_vcvt_n_f32_u32(simde_uint32x2_t a, const int n)
533533

534534
SIMDE_VECTORIZE
535535
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
536-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n));
536+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
537537
}
538538

539539
return simde_float32x2_from_private(r_);
@@ -555,7 +555,7 @@ simde_vcvt_n_f32_s32(simde_int32x2_t a, const int n)
555555

556556
SIMDE_VECTORIZE
557557
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
558-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n));
558+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
559559
}
560560

561561
return simde_float32x2_from_private(r_);
@@ -577,7 +577,7 @@ simde_vcvt_n_f64_u64(simde_uint64x1_t a, const int n)
577577

578578
SIMDE_VECTORIZE
579579
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
580-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
580+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
581581
}
582582

583583
return simde_float64x1_from_private(r_);
@@ -599,7 +599,7 @@ simde_vcvtq_n_f64_u64(simde_uint64x2_t a, const int n)
599599

600600
SIMDE_VECTORIZE
601601
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
602-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
602+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
603603
}
604604

605605
return simde_float64x2_from_private(r_);
@@ -621,7 +621,7 @@ simde_vcvt_n_f64_s64(simde_int64x1_t a, const int n)
621621

622622
SIMDE_VECTORIZE
623623
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
624-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
624+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
625625
}
626626

627627
return simde_float64x1_from_private(r_);
@@ -643,7 +643,7 @@ simde_vcvtq_n_f64_s64(simde_int64x2_t a, const int n)
643643

644644
SIMDE_VECTORIZE
645645
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
646-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : UINT64_C(1) << n));
646+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float64_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / ((n == 64) ? simde_math_pow(2, n) : HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n))));
647647
}
648648

649649
return simde_float64x2_from_private(r_);
@@ -665,7 +665,7 @@ simde_vcvtq_n_f32_s32(simde_int32x4_t a, const int n)
665665

666666
SIMDE_VECTORIZE
667667
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
668-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n));
668+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
669669
}
670670

671671
return simde_float32x4_from_private(r_);
@@ -687,7 +687,7 @@ simde_vcvtq_n_f32_u32(simde_uint32x4_t a, const int n)
687687

688688
SIMDE_VECTORIZE
689689
for (size_t i = 0 ; i < (sizeof(r_.values) / sizeof(r_.values[0])) ; i++) {
690-
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / (UINT64_C(1) << n));
690+
r_.values[i] = HEDLEY_STATIC_CAST(simde_float32_t, HEDLEY_STATIC_CAST(simde_float64_t, a_.values[i]) / HEDLEY_STATIC_CAST(simde_float64_t, (UINT64_C(1) << n)));
691691
}
692692

693693
return simde_float32x4_from_private(r_);

0 commit comments

Comments
 (0)