summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/source/Target/RegisterContext.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/lldb/source/Target/RegisterContext.cpp b/lldb/source/Target/RegisterContext.cpp
index 0d89db724ab..b422ef356f4 100644
--- a/lldb/source/Target/RegisterContext.cpp
+++ b/lldb/source/Target/RegisterContext.cpp
@@ -456,6 +456,15 @@ RegisterContext::CalculateExecutionContext (ExecutionContext &exe_ctx)
bool
RegisterContext::ConvertBetweenRegisterKinds (int source_rk, uint32_t source_regnum, int target_rk, uint32_t& target_regnum)
{
+ // FIXME: This works around a problem with 32-bit register mapping on Linux.
+ // A more general fix is needed.
+ if (target_rk == eRegisterKindLLDB)
+ {
+ target_regnum = ConvertRegisterKindToRegisterNumber(source_rk, source_regnum);
+ if (target_regnum != LLDB_INVALID_REGNUM)
+ return true;
+ }
+
const uint32_t num_registers = GetRegisterCount();
for (uint32_t reg = 0; reg < num_registers; ++reg)
{
OpenPOWER on IntegriCloud