summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2015-12-04 18:37:48 +0000
committerGreg Clayton <gclayton@apple.com>2015-12-04 18:37:48 +0000
commitb1583dc67d362faa9fea014083c9ee2ceee33168 (patch)
treec5428805e471e93b8199834076e2819ce6048853
parent0650e9b2b7cbac9e1cdf2201f9a403184652fa3e (diff)
downloadbcm5719-llvm-b1583dc67d362faa9fea014083c9ee2ceee33168.tar.gz
bcm5719-llvm-b1583dc67d362faa9fea014083c9ee2ceee33168.zip
Fill in the generic register kind if in AugmentRegisterInfoViaABI if it is available.
llvm-svn: 254743
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 9e396fc32e3..87d1f12008e 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -529,16 +529,21 @@ AugmentRegisterInfoViaABI (RegisterInfo &reg_info, ConstString reg_name, ABISP a
RegisterInfo abi_reg_info;
if (abi_sp->GetRegisterInfoByName (reg_name, abi_reg_info))
{
- if (reg_info.kinds[eRegisterKindEHFrame] == LLDB_INVALID_REGNUM
- && abi_reg_info.kinds[eRegisterKindEHFrame] != LLDB_INVALID_REGNUM)
+ if (reg_info.kinds[eRegisterKindEHFrame] == LLDB_INVALID_REGNUM &&
+ abi_reg_info.kinds[eRegisterKindEHFrame] != LLDB_INVALID_REGNUM)
{
reg_info.kinds[eRegisterKindEHFrame] = abi_reg_info.kinds[eRegisterKindEHFrame];
}
- if (reg_info.kinds[eRegisterKindDWARF] == LLDB_INVALID_REGNUM
- && abi_reg_info.kinds[eRegisterKindDWARF] != LLDB_INVALID_REGNUM)
+ if (reg_info.kinds[eRegisterKindDWARF] == LLDB_INVALID_REGNUM &&
+ abi_reg_info.kinds[eRegisterKindDWARF] != LLDB_INVALID_REGNUM)
{
reg_info.kinds[eRegisterKindDWARF] = abi_reg_info.kinds[eRegisterKindDWARF];
}
+ if (reg_info.kinds[eRegisterKindGeneric] == LLDB_INVALID_REGNUM &&
+ abi_reg_info.kinds[eRegisterKindGeneric] != LLDB_INVALID_REGNUM)
+ {
+ reg_info.kinds[eRegisterKindGeneric] = abi_reg_info.kinds[eRegisterKindGeneric];
+ }
}
}
}
OpenPOWER on IntegriCloud