Author: labath Date: Mon Nov 28 09:51:47 2016 New Revision: 288038 URL: http://llvm.org/viewvc/llvm-project?rev=288038&view=rev Log: Fix floating point register reads x86_64 linux on targets with no AVX support
Summary: On for 64-bit targets, the correct register set to read the fxsave are is NT_PRFPREG (only 32-bit targets need NT_PRXFPREG, presumably for historic reasons). Reference: <https://github.com/torvalds/linux/blob/v4.8/arch/x86/kernel/ptrace.c#L1261>. Reviewers: tberghammer, valentinagiusti Subscribers: lldb-commits Differential Revision: https://reviews.llvm.org/D27161 Modified: lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp Modified: lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp?rev=288038&r1=288037&r2=288038&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.cpp Mon Nov 28 09:51:47 2016 @@ -20,6 +20,8 @@ #include "Plugins/Process/Utility/RegisterContextLinux_i386.h" #include "Plugins/Process/Utility/RegisterContextLinux_x86_64.h" +#include <linux/elf.h> + using namespace lldb_private; using namespace lldb_private::process_linux; @@ -218,6 +220,12 @@ static const RegisterSet g_reg_sets_x86_ #define NT_PRXFPREG 0x46e62b7f #endif +// On x86_64 NT_PRFPREG is used to access the FXSAVE area. On i386, we need to +// use NT_PRXFPREG. +static inline unsigned int fxsr_regset(const ArchSpec &arch) { + return arch.GetAddressByteSize() == 8 ? NT_PRFPREG : NT_PRXFPREG; +} + // ---------------------------------------------------------------------------- // Required MPX define. // ---------------------------------------------------------------------------- @@ -852,8 +860,9 @@ bool NativeRegisterContextLinux_x86_64:: Error NativeRegisterContextLinux_x86_64::WriteFPR() { switch (m_xstate_type) { case XStateType::FXSAVE: - return WriteRegisterSet(&m_iovec, sizeof(m_fpr.xstate.xsave), - NT_PRXFPREG); + return WriteRegisterSet( + &m_iovec, sizeof(m_fpr.xstate.xsave), + fxsr_regset(GetRegisterInfoInterface().GetTargetArchitecture())); case XStateType::XSAVE: return WriteRegisterSet(&m_iovec, sizeof(m_fpr.xstate.xsave), NT_X86_XSTATE); @@ -957,7 +966,9 @@ Error NativeRegisterContextLinux_x86_64: return error; } } - error = ReadRegisterSet(&m_iovec, sizeof(m_fpr.xstate.xsave), NT_PRXFPREG); + error = ReadRegisterSet( + &m_iovec, sizeof(m_fpr.xstate.xsave), + fxsr_regset(GetRegisterInfoInterface().GetTargetArchitecture())); if (!error.Fail()) { m_xstate_type = XStateType::FXSAVE; return error; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
