- Applied to the 32-bit context as well.
http://llvm-reviews.chandlerc.com/D1307
CHANGE SINCE LAST DIFF
http://llvm-reviews.chandlerc.com/D1307?vs=3242&id=3243#toc
Files:
source/Plugins/Process/POSIX/RegisterContext_i386.cpp
source/Plugins/Process/POSIX/RegisterContext_i386.h
source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
source/Plugins/Process/POSIX/RegisterContext_x86_64.h
Index: source/Plugins/Process/POSIX/RegisterContext_i386.cpp
===================================================================
--- source/Plugins/Process/POSIX/RegisterContext_i386.cpp
+++ source/Plugins/Process/POSIX/RegisterContext_i386.cpp
@@ -50,10 +50,10 @@
fpu_fsw,
fpu_ftw,
fpu_fop,
- fpu_ip,
- fpu_cs,
- fpu_foo,
- fpu_fos,
+ fpu_fip,
+ fpu_fcs,
+ fpu_fdp,
+ fpu_fds,
fpu_mxcsr,
fpu_stmm0,
fpu_stmm1,
@@ -115,10 +115,10 @@
fpu_fsw,
fpu_ftw,
fpu_fop,
- fpu_ip,
- fpu_cs,
- fpu_foo,
- fpu_fos,
+ fpu_fip,
+ fpu_fcs,
+ fpu_fdp,
+ fpu_fds,
fpu_mxcsr,
fpu_stmm0,
fpu_stmm1,
@@ -213,10 +213,10 @@
DEFINE_FPR(fsw, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fsw),
DEFINE_FPR(ftw, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ftw),
DEFINE_FPR(fop, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fop),
- DEFINE_FPR(ip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ip),
- DEFINE_FPR(cs, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs),
- DEFINE_FPR(foo, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_dp),
- DEFINE_FPR(fos, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds),
+ DEFINE_FPR(fip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ip),
+ DEFINE_FPR(fcs, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs),
+ DEFINE_FPR(fdp, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_dp),
+ DEFINE_FPR(fds, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds),
DEFINE_FPR(mxcsr, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_mxcsr),
DEFINE_FP(stmm, 0),
@@ -463,10 +463,10 @@
case gdb_fcw : return fpu_fcw;
case gdb_fsw : return fpu_fsw;
case gdb_ftw : return fpu_ftw;
- case gdb_fpu_cs : return fpu_cs;
- case gdb_ip : return fpu_ip;
- case gdb_fpu_ds : return fpu_fos;
- case gdb_dp : return fpu_foo;
+ case gdb_fpu_cs : return fpu_fcs;
+ case gdb_ip : return fpu_fip;
+ case gdb_fpu_ds : return fpu_fds;
+ case gdb_dp : return fpu_fdp;
case gdb_fop : return fpu_fop;
case gdb_xmm0 : return fpu_xmm0;
case gdb_xmm1 : return fpu_xmm1;
Index: source/Plugins/Process/POSIX/RegisterContext_i386.h
===================================================================
--- source/Plugins/Process/POSIX/RegisterContext_i386.h
+++ source/Plugins/Process/POSIX/RegisterContext_i386.h
@@ -122,10 +122,10 @@
uint16_t fsw;
uint16_t ftw;
uint16_t fop;
- uint32_t ip;
- uint32_t cs;
- uint32_t foo;
- uint32_t fos;
+ uint32_t fip;
+ uint32_t fcs;
+ uint32_t fdp;
+ uint32_t fds;
uint32_t mxcsr;
uint32_t reserved;
MMSReg stmm[8];
Index: source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
===================================================================
--- source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
+++ source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
@@ -221,10 +221,10 @@
fpu_fsw,
fpu_ftw,
fpu_fop,
- fpu_ip,
- fpu_cs,
- fpu_dp,
- fpu_ds,
+ fpu_fip,
+ fpu_fcs,
+ fpu_fdp,
+ fpu_fds,
fpu_mxcsr,
fpu_mxcsrmask,
fpu_stmm0,
@@ -398,12 +398,12 @@
DEFINE_FPR(fsw, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_fsw),
DEFINE_FPR(ftw, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ftw),
DEFINE_FPR(fop, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_fop),
- DEFINE_FPR(ip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ip),
- // FIXME: Extract segment from ip.
- DEFINE_FPR(ip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs_64),
- DEFINE_FPR(dp, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_dp),
+ DEFINE_FPR(fip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ip),
+ // FIXME: Extract segment from ip. (this isn't exposed on many OSs)
+ //DEFINE_FPR(fip, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs_64),
+ DEFINE_FPR(fdp, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_dp),
// FIXME: Extract segment from dp.
- DEFINE_FPR(dp, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds_64),
+ //DEFINE_FPR(fdp, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds_64),
DEFINE_FPR(mxcsr, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_mxcsr),
DEFINE_FPR(mxcsrmask, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM),
@@ -732,17 +732,17 @@
{
default:
return false;
- case fpu_dp:
- value = m_fpr.xstate.fxsave.dp;
+ case fpu_fdp:
+ value = m_fpr.xstate.fxsave.fdp;
break;
case fpu_fcw:
value = m_fpr.xstate.fxsave.fcw;
break;
case fpu_fsw:
value = m_fpr.xstate.fxsave.fsw;
break;
- case fpu_ip:
- value = m_fpr.xstate.fxsave.ip;
+ case fpu_fip:
+ value = m_fpr.xstate.fxsave.fip;
break;
case fpu_fop:
value = m_fpr.xstate.fxsave.fop;
@@ -825,17 +825,17 @@
return false;
}
break;
- case fpu_dp:
- m_fpr.xstate.fxsave.dp = value.GetAsUInt64();
+ case fpu_fdp:
+ m_fpr.xstate.fxsave.fdp = value.GetAsUInt64();
break;
case fpu_fcw:
m_fpr.xstate.fxsave.fcw = value.GetAsUInt16();
break;
case fpu_fsw:
m_fpr.xstate.fxsave.fsw = value.GetAsUInt16();
break;
- case fpu_ip:
- m_fpr.xstate.fxsave.ip = value.GetAsUInt64();
+ case fpu_fip:
+ m_fpr.xstate.fxsave.fip = value.GetAsUInt64();
break;
case fpu_fop:
m_fpr.xstate.fxsave.fop = value.GetAsUInt16();
@@ -1004,10 +1004,10 @@
case gdb_fcw : return fpu_fcw;
case gdb_fsw : return fpu_fsw;
case gdb_ftw : return fpu_ftw;
- case gdb_fpu_cs : return fpu_cs;
- case gdb_ip : return fpu_ip;
- case gdb_fpu_ds : return fpu_ds; //fpu_fos
- case gdb_dp : return fpu_dp; //fpu_foo
+ case gdb_fpu_cs : return fpu_fcs;
+ case gdb_ip : return fpu_fip;
+ case gdb_fpu_ds : return fpu_fds; //fpu_fos
+ case gdb_dp : return fpu_fdp; //fpu_foo
case gdb_fop : return fpu_fop;
case gdb_xmm0 : return fpu_xmm0;
case gdb_xmm1 : return fpu_xmm1;
@@ -1151,10 +1151,10 @@
case gdb_fpu_fcw : return fpu_fcw;
case gdb_fpu_fsw : return fpu_fsw;
case gdb_fpu_ftw : return fpu_ftw;
- case gdb_fpu_cs_64 : return fpu_cs;
- case gdb_fpu_ip : return fpu_ip;
- case gdb_fpu_ds_64 : return fpu_ds;
- case gdb_fpu_dp : return fpu_dp;
+ case gdb_fpu_cs_64 : return fpu_fcs;
+ case gdb_fpu_ip : return fpu_fip;
+ case gdb_fpu_ds_64 : return fpu_fds;
+ case gdb_fpu_dp : return fpu_fdp;
case gdb_fpu_fop : return fpu_fop;
case gdb_fpu_xmm0 : return fpu_xmm0;
case gdb_fpu_xmm1 : return fpu_xmm1;
Index: source/Plugins/Process/POSIX/RegisterContext_x86_64.h
===================================================================
--- source/Plugins/Process/POSIX/RegisterContext_x86_64.h
+++ source/Plugins/Process/POSIX/RegisterContext_x86_64.h
@@ -62,10 +62,10 @@
fpu_fsw,
fpu_ftw,
fpu_fop,
- fpu_ip,
- fpu_cs,
- fpu_dp,
- fpu_ds,
+ fpu_fip,
+ fpu_fcs,
+ fpu_fdp,
+ fpu_fds,
fpu_mxcsr,
fpu_mxcsrmask,
fpu_stmm0,
@@ -238,8 +238,8 @@
uint16_t fsw;
uint16_t ftw;
uint16_t fop;
- uint64_t ip;
- uint64_t dp;
+ uint64_t fip;
+ uint64_t fdp;
uint32_t mxcsr;
uint32_t mxcsrmask;
MMSReg stmm[8];
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
