summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/Process
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/source/Plugins/Process')
-rw-r--r--lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp4
-rw-r--r--lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp3
2 files changed, 2 insertions, 5 deletions
diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
index 36795e584cf..4cab19adf92 100644
--- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
+++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
@@ -532,11 +532,7 @@ WriteRegOperation::Execute(ProcessMonitor *monitor)
void* buf;
Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_REGISTERS));
-#if __WORDSIZE == 32
- buf = (void*) m_value.GetAsUInt32();
-#else
buf = (void*) m_value.GetAsUInt64();
-#endif
if (log)
log->Printf ("ProcessMonitor::%s() reg %s: %p", __FUNCTION__, m_reg_name, buf);
diff --git a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp b/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
index f2c1bab9f73..a8b4b6d7541 100644
--- a/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
+++ b/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
@@ -83,8 +83,9 @@ struct UserArea
};
#define DR_SIZE sizeof(UserArea::u_debugreg[0])
+#define DR_0_OFFSET 0xFC
#define DR_OFFSET(reg_index) \
- (LLVM_EXTENSION offsetof(UserArea, u_debugreg[reg_index]))
+ (DR_0_OFFSET + (reg_index * 4))
#define FPR_SIZE(reg) sizeof(((FPR_i386*)NULL)->reg)
//---------------------------------------------------------------------------
OpenPOWER on IntegriCloud