Skip to content

Commit 173b28b

Browse files
committed
Move all vector math wrappers into f::.
1 parent ddf21c5 commit 173b28b

19 files changed

+421
-371
lines changed

include/bitcoin/system/impl/hash/sha/algorithm_iterate.ipp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,21 @@ pack(const xblock_t<Lanes>& xblock) NOEXCEPT
4141

4242
if constexpr (Lanes == 2)
4343
{
44-
return byteswap<word_t>(set<xword_t>(
44+
return f::byteswap<word_t>(f::set<xword_t>(
4545
xblock[0][Word],
4646
xblock[1][Word]));
4747
}
4848
else if constexpr (Lanes == 4)
4949
{
50-
return byteswap<word_t>(set<xword_t>(
50+
return f::byteswap<word_t>(f::set<xword_t>(
5151
xblock[0][Word],
5252
xblock[1][Word],
5353
xblock[2][Word],
5454
xblock[3][Word]));
5555
}
5656
else if constexpr (Lanes == 8)
5757
{
58-
return byteswap<word_t>(set<xword_t>(
58+
return f::byteswap<word_t>(f::set<xword_t>(
5959
xblock[0][Word],
6060
xblock[1][Word],
6161
xblock[2][Word],
@@ -67,7 +67,7 @@ pack(const xblock_t<Lanes>& xblock) NOEXCEPT
6767
}
6868
else if constexpr (Lanes == 16)
6969
{
70-
return byteswap<word_t>(set<xword_t>(
70+
return f::byteswap<word_t>(f::set<xword_t>(
7171
xblock[ 0][Word],
7272
xblock[ 1][Word],
7373
xblock[ 2][Word],
@@ -125,7 +125,7 @@ INLINE Word CLASS::
125125
extract(xWord a) NOEXCEPT
126126
{
127127
// Extract word from lane of vectorized buffer.
128-
return get<Word, Lane>(a);
128+
return f::get<Word, Lane>(a);
129129
}
130130

131131
TEMPLATE

include/bitcoin/system/impl/hash/sha/algorithm_konstant.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@ vector_konstant(wbuffer_t<xWord>& wbuffer) NOEXCEPT
5454

5555
if constexpr (lanes == 16)
5656
{
57-
wbuffer[Round] = add<word_t>(wbuffer[Round], set<xWord>(
57+
wbuffer[Round] = f::add<word_t>(wbuffer[Round], f::set<xWord>(
5858
K::get[r + 0], K::get[r + 1], K::get[r + 2], K::get[r + 3],
5959
K::get[r + 4], K::get[r + 5], K::get[r + 6], K::get[r + 7],
6060
K::get[r + 8], K::get[r + 9], K::get[r + 10], K::get[r + 11],
6161
K::get[r + 12], K::get[r + 13], K::get[r + 14], K::get[r + 15]));
6262
}
6363
else if constexpr (lanes == 8)
6464
{
65-
wbuffer[Round] = add<word_t>(wbuffer[Round], set<xWord>(
65+
wbuffer[Round] = f::add<word_t>(wbuffer[Round], f::set<xWord>(
6666
K::get[r + 0], K::get[r + 1], K::get[r + 2], K::get[r + 3],
6767
K::get[r + 4], K::get[r + 5], K::get[r + 6], K::get[r + 7]));
6868
}
6969
else if constexpr (lanes == 4)
7070
{
71-
wbuffer[Round] = add<word_t>(wbuffer[Round], set<xWord>(
71+
wbuffer[Round] = f::add<word_t>(wbuffer[Round], f::set<xWord>(
7272
K::get[r + 0], K::get[r + 1], K::get[r + 2], K::get[r + 3]));
7373
}
7474
}

0 commit comments

Comments
 (0)