<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Fine with me.<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Aug 23, 2017, at 10:47 AM, Saleem Abdulrasool <<a href="mailto:compnerd@compnerd.org" class="">compnerd@compnerd.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class=""><div dir="auto" class="">This would be nice to merge to 5.0 IMO. It fixes reading the x87 FPU state. What do you think Greg?</div><br class=""><div class="gmail_quote"><div class="">On Wed, Aug 23, 2017 at 10:24 AM Saleem Abdulrasool via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org" class="">lldb-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br class="">
Date: Wed Aug 23 10:23:12 2017<br class="">
New Revision: 311579<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311579&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=311579&view=rev</a><br class="">
Log:<br class="">
Process: fix FXSAVE on x86<br class="">
<br class="">
The FXSAVE member `ftw` (FPU Tag Word) was given the wrong size (8-bit)<br class="">
instead of the correct width (16-bit) as per the x87 Programmer's<br class="">
Manual. Adjust this to ensure that we print out the complete value for<br class="">
the register.<br class="">
<br class="">
Modified:<br class="">
lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py<br class="">
lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp<br class="">
lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h<br class="">
<br class="">
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py?rev=311579&r1=311578&r2=311579&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py?rev=311579&r1=311578&r2=311579&view=diff</a><br class="">
==============================================================================<br class="">
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py (original)<br class="">
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py Wed Aug 23 10:23:12 2017<br class="">
@@ -256,7 +256,7 @@ class RegisterCommandsTestCase(TestBase)<br class="">
self.expect(<br class="">
"register read ftag", substrs=[<br class="">
'ftag' + ' = ', str(<br class="">
- "0x%0.2x" %<br class="">
+ "0x%0.4x" %<br class="">
(reg_value_ftag_initial | (<br class="">
1 << fstat_top_pointer_initial)))])<br class="">
reg_value_ftag_initial = reg_value_ftag_initial | (<br class="">
<br class="">
Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp?rev=311579&r1=311578&r2=311579&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp?rev=311579&r1=311578&r2=311579&view=diff</a><br class="">
==============================================================================<br class="">
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp (original)<br class="">
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp Wed Aug 23 10:23:12 2017<br class="">
@@ -36,8 +36,7 @@ struct GPR {<br class="">
struct FPR_i386 {<br class="">
uint16_t fctrl; // FPU Control Word (fcw)<br class="">
uint16_t fstat; // FPU Status Word (fsw)<br class="">
- uint8_t ftag; // FPU Tag Word (ftw)<br class="">
- uint8_t reserved_1; // Reserved<br class="">
+ uint16_t ftag; // FPU Tag Word (ftw)<br class="">
uint16_t fop; // Last Instruction Opcode (fop)<br class="">
union {<br class="">
struct {<br class="">
<br class="">
Modified: lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h?rev=311579&r1=311578&r2=311579&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h?rev=311579&r1=311578&r2=311579&view=diff</a><br class="">
==============================================================================<br class="">
--- lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h (original)<br class="">
+++ lldb/trunk/source/Plugins/Process/Utility/RegisterContext_x86.h Wed Aug 23 10:23:12 2017<br class="">
@@ -257,8 +257,7 @@ struct XMMReg {<br class="">
struct FXSAVE {<br class="">
uint16_t fctrl; // FPU Control Word (fcw)<br class="">
uint16_t fstat; // FPU Status Word (fsw)<br class="">
- uint8_t ftag; // FPU Tag Word (ftw)<br class="">
- uint8_t reserved_1; // Reserved<br class="">
+ uint16_t ftag; // FPU Tag Word (ftw)<br class="">
uint16_t fop; // Last Instruction Opcode (fop)<br class="">
union {<br class="">
struct {<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
lldb-commits mailing list<br class="">
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank" class="">lldb-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br class="">
</blockquote></div></div><div dir="ltr" class="">-- <br class=""></div><div class="gmail_signature" data-smartmail="gmail_signature">Saleem Abdulrasool<br class="">compnerd (at) compnerd (dot) org</div>
</div></blockquote></div><br class=""></div></body></html>