Skip to content

Fix several wrongs #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trcrsired merged 1 commit into from
Mar 24, 2026
Merged

Fix several wrongs #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions include/fast_io_core_impl/dynamic_output_buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,25 @@ write_all_overflow_define_impl(basic_generic_dynamic_output_buffer<char_type, bu
::std::size_t bfsz{static_cast<::std::size_t>(bob.end_ptr - bob.begin_ptr)};
::std::size_t rlsz{static_cast<::std::size_t>(bob.curr_ptr - bob.begin_ptr)};
::std::size_t diff{static_cast<::std::size_t>(last - first)};
::std::size_t to_allocate{bfsz + diff};
::std::size_t twicebfsz;
constexpr ::std::size_t mx{::std::numeric_limits<::std::size_t>::max()};
::std::size_t to_allocate;
if (bfsz > mx - diff)
{
to_allocate = mx;
}
else
{
to_allocate = bfsz + diff;
}
::std::size_t twicebfsz;
constexpr ::std::size_t mxdv2{mx >> 1u};
if (bfsz > mxdv2)
{
twicebfsz = mx;
}
else
{
twicebfsz = bfsz;
twicebfsz = bfsz << 1u;
}
if (to_allocate < twicebfsz)
{
Expand Down
94 changes: 0 additions & 94 deletions include/fast_io_core_impl/read_all.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,101 +34,7 @@ read_all_impl_decay_cold(input in, typename input::char_type *first, typename in
}
}

#if 0
template<typename char_type,::std::input_or_output_iterator output_iter>
inline output_iter type_punning_copy(char_type const* first,char_type const* last,output_iter result)
{
using value_type = ::std::iter_value_t<output_iter>;
if constexpr(sizeof(value_type)==0)
return result;
else if constexpr(sizeof(value_type)==sizeof(char_type))
{
for(;first!=last;)
{
if constexpr(::std::same_as<char_type,value_type>)
*result=*first;
else
{
my_memcpy(__builtin_addressof(result),first,sizeof(value_type));
}
++first;
++result;
}
return result;
}
else
{
static_assert(sizeof(char_type)==1);
for(;first!=last;)
{
my_memcpy(__builtin_addressof(result),first,sizeof(value_type));
first+=sizeof(value_type);
++result;
}
return result;
}
}

template<::fast_io::input_stream input,::std::forward_iterator Iter>
inline constexpr void read_all_impl_none_contiguous(input in,Iter first,Iter last)
{
using char_type = typename input::char_type;
using iter_value_type = ::std::iter_value_t<Iter>;
if constexpr(::fast_io::buffer_input_stream<input>)
{
auto to_read{::std::distance(first,last)};
for(;to_read;)
{
auto curr{ibuffer_curr(in)};
auto ed{ibuffer_end(in)};
auto remains{ed-curr};
if constexpr(sizeof(char_type)==sizeof(iter_value_type))
{
if(to_read<remains)
{
remains=to_read;
to_read=0;
}
else
{
to_read-=remains;
}
}
else
{
::std::size_t real_to_read{static_cast<::std::size_t>(to_read)*sizeof(iter_value_type)};
if(real_to_read<remains)
{
remains=real_to_read;
to_read=0;
}
else
{
to_read-=remains/;
}
}

first=type_punning_copy(curr,curr+remains,first);
ibuffer_set_curr(in,curr);
if(curr)
}
}
else
{
constexpr ::std::size_t buffer_size{512};
char_type buffer[buffer_size];
auto to_read{::std::distance(first,last)};
for(;to_read;)
{
::std::size_t read_this_round{buffer_size};
if(to_read>=buffer_size)
{

}
}
}
}
#endif
template <::fast_io::input_stream input>
inline constexpr void read_all_impl_decay(input in, typename input::char_type *first, typename input::char_type *last)
{
Expand Down
4 changes: 2 additions & 2 deletions include/fast_io_core_impl/simd_find.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ inline constexpr auto create_find_simd_vector_with_unsigned_toggle(char_type val
{
::fast_io::freestanding::array<char_type, N> arr;
using signed_char_type = ::std::make_signed_t<char_type>;
using unsigned_char_type = ::std::make_signed_t<char_type>;
using unsigned_char_type = ::std::make_unsigned_t<char_type>;
constexpr unsigned_char_type signed_min_unsigned_val{
static_cast<unsigned_char_type>(::std::numeric_limits<signed_char_type>::min())};
if constexpr (signed_disposition)
Expand Down Expand Up @@ -213,7 +213,7 @@ inline constexpr char_type const *find_space_simd_common_impl(char_type const *f
else
{
using unsigned_char_type = ::std::make_unsigned_t<::std::remove_cvref_t<char_type>>;
using signed_char_type = ::std::make_unsigned_t<unsigned_char_type>;
using signed_char_type = ::std::make_signed_t<unsigned_char_type>;
constexpr char_type spacech{char_literal_v<u8' ', ::std::remove_cvref_t<char_type>>};
constexpr char_type horizontaltab{char_literal_v<u8'\t', ::std::remove_cvref_t<char_type>>};
constexpr char_type verticaltab{char_literal_v<u8'\v', ::std::remove_cvref_t<char_type>>};
Expand Down
44 changes: 42 additions & 2 deletions include/fast_io_crypto/cipher/aes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct aes
{
inline static constexpr ::std::size_t block_size = 16;
inline static constexpr ::std::size_t key_size = keysize;
inline static constexpr ::std::size_t key_schedule_size = keysize == 16 ? 10 : (keysize == 24 ? 12 : 15);
inline static constexpr ::std::size_t key_schedule_size = keysize == 16 ? 11 : (keysize == 24 ? 13 : 15);
__m128i key_schedule[key_schedule_size];
inline explicit aes(::std::span<::std::byte const, key_size> key_span) noexcept
{
Expand Down Expand Up @@ -135,9 +135,49 @@ struct aes
key_schedule[13] = aes_256_key_exp_2(key_schedule[11], key_schedule[12]);
key_schedule[14] = aes_256_key_exp(key_schedule[12], key_schedule[13], 0x40);
}
if constexpr (decrypt)
{
// Prepare decryption key schedule: reverse order and apply InvMixColumns
for (::std::size_t i{}, j{key_schedule_size - 1}; i < j; ++i, --j)
{
__m128i tmp = key_schedule[i];
key_schedule[i] = key_schedule[j];
key_schedule[j] = tmp;
}
for (::std::size_t i{1}; i < key_schedule_size - 1; ++i)
{
key_schedule[i] = _mm_aesimc_si128(key_schedule[i]);
}
}
}
inline void operator()(::std::byte const *from, ::std::size_t blocks, ::std::byte *to) noexcept
{}
{
constexpr ::std::size_t rounds = key_schedule_size - 1;
for (::std::size_t i{}; i != blocks; ++i)
{
__m128i block = _mm_loadu_si128(reinterpret_cast<__m128i const *>(from));
block = _mm_xor_si128(block, key_schedule[0]);
if constexpr (!decrypt)
{
for (::std::size_t j{1}; j != rounds; ++j)
{
block = _mm_aesenc_si128(block, key_schedule[j]);
}
block = _mm_aesenclast_si128(block, key_schedule[rounds]);
}
else
{
for (::std::size_t j{1}; j != rounds; ++j)
{
block = _mm_aesdec_si128(block, key_schedule[j]);
}
block = _mm_aesdeclast_si128(block, key_schedule[rounds]);
}
_mm_storeu_si128(reinterpret_cast<__m128i *>(to), block);
from += block_size;
to += block_size;
}
}
};

} // namespace fast_io
5 changes: 2 additions & 3 deletions include/fast_io_i18n/lc_numbers/cond.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,11 @@ inline constexpr char_type *cond_lc_print_reserve_define_impl(basic_lc_all<char_
}
else if constexpr (reserve_printable<char_type, T1>)
{
constexpr ::std::size_t sz{print_reserve_size(io_reserve_type<char_type, T1>)};
return sz;
return print_reserve_define(io_reserve_type<char_type, T1>, iter, c);
}
else
{
return print_reserve_size(io_reserve_type<char_type, T1>, c);
return print_reserve_define(io_reserve_type<char_type, T1>, iter, c);
}
}

Expand Down
Loading