[Lldb-commits] [PATCH] EmulationStateARM: Don't have >= comparisons against dwarf_r0

[David Majnemer]

Hi zturner, tfiala,

dwarf_r0 is defined to be zero in ARM_DWARF_Registers.h, this makes
unsigned comparisons against it pointless and provokes warnings on GCC.

http://reviews.llvm.org/D4629

Files:
  source/Plugins/Instruction/ARM/EmulationStateARM.cpp

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/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))
     {

_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits