Index: source/Plugins/Instruction/ARM/EmulationStateARM.cpp
===================================================================
--- source/Plugins/Instruction/ARM/EmulationStateARM.cpp
+++ source/Plugins/Instruction/ARM/EmulationStateARM.cpp
@@ -77,7 +77,7 @@
 bool
 EmulationStateARM::StorePseudoRegisterValue (uint32_t reg_num, uint64_t value)
 {
-    if ((dwarf_r0 <= reg_num) && (reg_num <= dwarf_cpsr))
+    if (reg_num <= dwarf_cpsr)
         m_gpr[reg_num  - dwarf_r0] = (uint32_t) value;
     else if ((dwarf_s0 <= reg_num) && (reg_num <= dwarf_s31))
     {
@@ -105,7 +105,7 @@
     uint64_t value = 0;
     success = true;
     
-    if ((dwarf_r0 <= reg_num) && (reg_num <= dwarf_cpsr))
+    if (reg_num <= dwarf_cpsr)
         value = m_gpr[reg_num  - dwarf_r0];
     else if ((dwarf_s0 <= reg_num) && (reg_num <= dwarf_s31))
     {
Index: source/Utility/ARM64_DWARF_Registers.cpp
===================================================================
--- source/Utility/ARM64_DWARF_Registers.cpp
+++ source/Utility/ARM64_DWARF_Registers.cpp
@@ -109,7 +109,7 @@
     ::memset (&reg_info, 0, sizeof(RegisterInfo));
     ::memset (reg_info.kinds, LLDB_INVALID_REGNUM, sizeof(reg_info.kinds));
     
-    if (reg_num >= x0 && reg_num <= pc)
+    if (reg_num <= pc)
     {
         reg_info.byte_size = 8;
         reg_info.format = eFormatHex;