Author: gclayton
Date: Fri Dec  4 12:37:48 2015
New Revision: 254743

URL: http://llvm.org/viewvc/llvm-project?rev=254743&view=rev
Log:
Fill in the generic register kind if in AugmentRegisterInfoViaABI if it is 
available.

Modified:
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=254743&r1=254742&r2=254743&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Fri Dec  
4 12:37:48 2015
@@ -529,16 +529,21 @@ AugmentRegisterInfoViaABI (RegisterInfo
             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];
+                }
             }
         }
     }


_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to