Skip to content

[libc] Skip x87 floating point register and only update mxcsr for x86_64 targets when raising exceptions inside math functions. #144951

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
merged 1 commit into from
Jun 19, 2025
Merged

[libc] Skip x87 floating point register and only update mxcsr for x86_64 targets when raising exceptions inside math functions. #144951

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
5 changes: 5 additions & 0 deletions libc/src/__support/FPUtil/FEnvImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ LIBC_INLINE static int set_except_if_required([[maybe_unused]] int excepts) {
LIBC_INLINE static int raise_except_if_required([[maybe_unused]] int excepts) {
#ifndef LIBC_MATH_HAS_NO_EXCEPT
if (math_errhandling & MATH_ERREXCEPT)
#ifdef LIBC_TARGET_ARCH_IS_X86_64
return raise_except</*SKIP_X87_FPU*/ true>(excepts);
#else // !LIBC_TARGET_ARCH_IS_X86
return raise_except(excepts);
#endif // LIBC_TARGET_ARCH_IS_X86

#endif // LIBC_MATH_HAS_NO_EXCEPT
return 0;
}
Expand Down
13 changes: 8 additions & 5 deletions libc/src/__support/FPUtil/x86_64/FEnvImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ LIBC_INLINE int set_except(int excepts) {
return 0;
}

LIBC_INLINE int raise_except(int excepts) {
template <bool SKIP_X87_FPU = false> LIBC_INLINE int raise_except(int excepts) {
uint16_t status_value = internal::get_status_value_for_except(excepts);

// We set the status flag for exception one at a time and call the
Expand All @@ -256,13 +256,16 @@ LIBC_INLINE int raise_except(int excepts) {
// when raising the next exception.

auto raise_helper = [](uint16_t singleExceptFlag) {
internal::X87StateDescriptor state;
if constexpr (!SKIP_X87_FPU) {
internal::X87StateDescriptor state;
internal::get_x87_state_descriptor(state);
state.status_word |= singleExceptFlag;
internal::write_x87_state_descriptor(state);
}

uint32_t mxcsr = 0;
internal::get_x87_state_descriptor(state);
mxcsr = internal::get_mxcsr();
state.status_word |= singleExceptFlag;
mxcsr |= singleExceptFlag;
internal::write_x87_state_descriptor(state);
internal::write_mxcsr(mxcsr);
internal::fwait();
};
Expand Down
Loading