mirror of
https://github.com/matrix-construct/construct
synced 2024-06-11 06:28:55 +02:00
ircd::utf: Add unpacked decode; de-template for linkage; minor reorg.
This commit is contained in:
Jason Volk
parent
b94c5d370f
commit
bbaeb09c2d
|
|
@ -20,16 +20,13 @@ namespace ircd::utf
|
|||
/// Unicode Transformation Format (8-bit)
|
||||
namespace ircd::utf8
|
||||
{
|
||||
using utf::error;
|
||||
|
||||
template<class u32xN> u32xN length(const u32xN &codepoint) noexcept;
|
||||
template<class u32xN> u32xN encode(const u32xN &codepoint) noexcept;
|
||||
u32x16 length(const u32x16 &codepoints) noexcept;
|
||||
u32x16 encode(const u32x16 &codepoints) noexcept;
|
||||
u32x16 decode(const u8x16 &string) noexcept;
|
||||
}
|
||||
|
||||
/// Unicode Transformation Format (16-bit)
|
||||
namespace ircd::utf16
|
||||
{
|
||||
using utf::error;
|
||||
|
||||
u32x8 convert_u32x8(const u8x16 &pairs) noexcept;
|
||||
}
|
||||
|
|
|
|||
109
ircd/utf.cc
109
ircd/utf.cc
|
|
@ -8,6 +8,10 @@
|
|||
// copyright notice and this permission notice is present in all copies. The
|
||||
// full license for this software is available in the LICENSE file.
|
||||
|
||||
//
|
||||
// utf16
|
||||
//
|
||||
|
||||
/// Convert utf-16 two-byte surrogates (in big-endian) to char32_t codepoints
|
||||
/// in parallel. The result vector is twice the size as the input; no template
|
||||
/// is offered yet, just the dimensions someone needed for somewhere.
|
||||
|
|
@ -28,33 +32,115 @@ noexcept
|
|||
};
|
||||
}
|
||||
|
||||
//
|
||||
// utf8
|
||||
//
|
||||
|
||||
ircd::u32x16
|
||||
ircd::utf8::decode(const u8x16 &string)
|
||||
noexcept
|
||||
{
|
||||
const u32x16 in
|
||||
{
|
||||
simd::lane_cast<u32x16>(string)
|
||||
};
|
||||
|
||||
const u32x16 is_single
|
||||
{
|
||||
(in & 0x80) == 0
|
||||
};
|
||||
|
||||
const u32x16 is_lead
|
||||
{
|
||||
(in - 0xc2) <= 0x32
|
||||
};
|
||||
|
||||
const u32x16 is_trail
|
||||
{
|
||||
in >= 0x80 && in < 0xbf
|
||||
};
|
||||
|
||||
const u32x16 expect_trail
|
||||
{
|
||||
(((in >= 0xe0) & 1) + ((in >= 0xf0) & 1) + 1) & is_lead
|
||||
};
|
||||
|
||||
const u32x16 expect_length
|
||||
{
|
||||
expect_trail + 1
|
||||
};
|
||||
|
||||
const u32x16 shift[4]
|
||||
{
|
||||
in << 0,
|
||||
in << 8,
|
||||
in << 16,
|
||||
in << 24,
|
||||
};
|
||||
|
||||
const u32x16 multibyte_packs
|
||||
{
|
||||
in[0x00] | shift[0x01][0x01] | shift[0x02][0x02] | shift[0x03][0x03],
|
||||
in[0x01] | shift[0x01][0x02] | shift[0x02][0x03] | shift[0x03][0x04],
|
||||
in[0x02] | shift[0x01][0x03] | shift[0x02][0x04] | shift[0x03][0x05],
|
||||
in[0x03] | shift[0x01][0x04] | shift[0x02][0x05] | shift[0x03][0x06],
|
||||
in[0x04] | shift[0x01][0x05] | shift[0x02][0x06] | shift[0x03][0x07],
|
||||
in[0x05] | shift[0x01][0x06] | shift[0x02][0x07] | shift[0x03][0x08],
|
||||
in[0x06] | shift[0x01][0x07] | shift[0x02][0x08] | shift[0x03][0x09],
|
||||
in[0x07] | shift[0x01][0x08] | shift[0x02][0x09] | shift[0x03][0x0a],
|
||||
in[0x08] | shift[0x01][0x09] | shift[0x02][0x0a] | shift[0x03][0x0b],
|
||||
in[0x09] | shift[0x01][0x0a] | shift[0x02][0x0b] | shift[0x03][0x0c],
|
||||
in[0x0a] | shift[0x01][0x0b] | shift[0x02][0x0c] | shift[0x03][0x0d],
|
||||
in[0x0b] | shift[0x01][0x0c] | shift[0x02][0x0d] | shift[0x03][0x0e],
|
||||
in[0x0c] | shift[0x01][0x0d] | shift[0x02][0x0e] | shift[0x03][0x0f],
|
||||
in[0x0d] | shift[0x01][0x0e] | shift[0x02][0x0f] | shift[0x03][0x0f],
|
||||
in[0x0e] | shift[0x01][0x0f] | shift[0x02][0x0f] | shift[0x03][0x0f],
|
||||
in[0x0f] | shift[0x01][0x0f] | shift[0x02][0x0f] | shift[0x03][0x0f],
|
||||
};
|
||||
|
||||
const u32x16 multibyte
|
||||
{
|
||||
0
|
||||
| (multibyte_packs & (expect_length == 1) & 0x000000ffU)
|
||||
| (multibyte_packs & (expect_length == 2) & 0x0000ffffU)
|
||||
| (multibyte_packs & (expect_length == 3) & 0x00ffffffU)
|
||||
| (multibyte_packs & (expect_length == 4) & 0xffffffffU)
|
||||
};
|
||||
|
||||
const u32x16 integers
|
||||
{
|
||||
(in & is_single) | (multibyte & is_lead)
|
||||
};
|
||||
|
||||
return integers;
|
||||
}
|
||||
|
||||
/// Transform multiple char32_t codepoints to their utf-8 encodings in
|
||||
/// parallel, returning a sparse result in each char32_t (this does not
|
||||
/// compress the result down).
|
||||
template<class u32xN>
|
||||
u32xN
|
||||
ircd::utf8::encode(const u32xN &codepoint)
|
||||
ircd::u32x16
|
||||
ircd::utf8::encode(const u32x16 &codepoint)
|
||||
noexcept
|
||||
{
|
||||
const u32xN len
|
||||
const u32x16 len
|
||||
{
|
||||
length(codepoint)
|
||||
};
|
||||
|
||||
const u32xN enc_2
|
||||
const u32x16 enc_2
|
||||
{
|
||||
(((codepoint >> 6) | 0xc0) & 0xff) // byte[0]
|
||||
| ((((codepoint & 0x3f) | 0x80) &0xff) << 8) // byte[1]
|
||||
};
|
||||
|
||||
const u32xN enc_3
|
||||
const u32x16 enc_3
|
||||
{
|
||||
(((codepoint >> 12) | 0xe0) & 0xff) | // byte[0]
|
||||
(((((codepoint >> 6) & 0x3f) | 0x80) & 0xff) << 8) | // byte[1]
|
||||
((((codepoint & 0x3f) | 0x80) & 0xff) << 16) // byte[3]
|
||||
};
|
||||
|
||||
const u32xN enc_4
|
||||
const u32x16 enc_4
|
||||
{
|
||||
(((codepoint >> 18) | 0xf0) & 0xff) | // byte[0]
|
||||
(((((codepoint >> 12) & 0x3f) | 0x80) & 0xff) << 8) | // byte[1]
|
||||
|
|
@ -74,19 +160,18 @@ noexcept
|
|||
/// Determine the utf-8 encoding length of multiple codepoints in parallel.
|
||||
/// The input vector char32_t codepoints and the output yields an integer
|
||||
/// of 0-4 for each lane.
|
||||
template<class u32xN>
|
||||
u32xN
|
||||
ircd::utf8::length(const u32xN &codepoint)
|
||||
ircd::u32x16
|
||||
ircd::utf8::length(const u32x16 &codepoint)
|
||||
noexcept
|
||||
{
|
||||
const u32xN
|
||||
const u32x16
|
||||
length_1 { codepoint <= 0x7f },
|
||||
length_2 { codepoint <= 0x7ff && codepoint > 0x7f },
|
||||
length_3_lo { codepoint <= 0xd7ff && codepoint > 0x7ff },
|
||||
length_3_hi { codepoint <= 0xffff && codepoint > 0xdfff },
|
||||
length_4 { codepoint <= 0x10ffff && codepoint > 0xffff };
|
||||
|
||||
[[gnu::unused]] const u32xN // Preserved here for future reference
|
||||
[[gnu::unused]] const u32x16 // Preserved here for future reference
|
||||
length_3_err { codepoint <= 0xdfff && codepoint > 0xd7ff },
|
||||
length_err { (codepoint > 0x10ffff) | length_3_err };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue