diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-08 15:27:12 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-08 15:27:12 +0200 |
| commit | 5e7c8b2f3684d8de1c2722515f693c2e54323208 (patch) | |
| tree | d6d51f45658d0ee6830a47deb3483e85b95b51e2 | |
| parent | e4f356b9592599ad91aac34bf2265c9bcdfbb81f (diff) | |
| parent | 394c32ed8db5ef520117d19da573db9576e0c31e (diff) | |
| download | nissy-core-5e7c8b2f3684d8de1c2722515f693c2e54323208.tar.gz nissy-core-5e7c8b2f3684d8de1c2722515f693c2e54323208.zip | |
Merge branch 'master' of tronto.net:h48
| -rw-r--r-- | src/arch/neon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/neon.h b/src/arch/neon.h index 45db305..6261c9a 100644 --- a/src/arch/neon.h +++ b/src/arch/neon.h | |||
| @@ -69,7 +69,7 @@ equal(cube_t c1, cube_t c2) | |||
| 69 | 69 | ||
| 70 | // convert the comparison vectors to 64-bit vectors and combine them | 70 | // convert the comparison vectors to 64-bit vectors and combine them |
| 71 | cmp_corner_u64 = vreinterpretq_u64_u8( | 71 | cmp_corner_u64 = vreinterpretq_u64_u8( |
| 72 | vcombine_u64(cmp_corner, cmp_corner)); | 72 | vcombine_u8(cmp_corner, cmp_corner)); |
| 73 | cmp_edge_u64 = vreinterpretq_u64_u8(cmp_edge); | 73 | cmp_edge_u64 = vreinterpretq_u64_u8(cmp_edge); |
| 74 | cmp_result = vandq_u64(cmp_corner_u64, cmp_edge_u64); | 74 | cmp_result = vandq_u64(cmp_corner_u64, cmp_edge_u64); |
| 75 | 75 | ||
| @@ -130,7 +130,7 @@ compose_edges_slim(uint8x16_t edge1, uint8x16_t edge2) | |||
| 130 | uint8x16_t ret = vorrq_u8(vandq_u8(piece1, p_bits), orien); | 130 | uint8x16_t ret = vorrq_u8(vandq_u8(piece1, p_bits), orien); |
| 131 | 131 | ||
| 132 | // Mask to clear the last 32 bits of the result | 132 | // Mask to clear the last 32 bits of the result |
| 133 | uint8x16_t mask_last_32 = | 133 | uint32x4_t mask_last_32 = |
| 134 | vsetq_lane_u32(0, vreinterpretq_u32_u8(ret), 3); | 134 | vsetq_lane_u32(0, vreinterpretq_u32_u8(ret), 3); |
| 135 | ret = vreinterpretq_u8_u32(mask_last_32); | 135 | ret = vreinterpretq_u8_u32(mask_last_32); |
| 136 | 136 | ||