commit 24348847b93337ad548032e046c71f37e647da26
author Johnny Chen <johnny.chen@apple.com> Wed Feb 23 00:15:56 2011 +0000
committer Johnny Chen <johnny.chen@apple.com> Wed Feb 23 00:15:56 2011 +0000
tree 8280cb5906e28a2f022cd0e858a4225fb4372bd7
parent 90e607bfccc74572e8422ea85d20f10db6f936b9

Renamed macro definition of CPSR_C to be CPSR_C_POS to avoid confusions and subtle bugs.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@126271 91177308-0d34-0410-b5e6-96231b3b80d8

source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp

diff --git a/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
index 216c7b3..491cdad 100644
--- a/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -24,8 +24,8 @@
 using namespace lldb_private;
 
 // Convenient macro definitions.
-#define APSR_C Bit32(m_inst_cpsr, CPSR_C)
-#define APSR_V Bit32(m_inst_cpsr, CPSR_V)
+#define APSR_C Bit32(m_inst_cpsr, CPSR_C_POS)
+#define APSR_V Bit32(m_inst_cpsr, CPSR_V_POS)
 
 #define AlignPC(pc_val) (pc_val & 0xFFFFFFFC)
 
@@ -7226,12 +7226,12 @@
                                    const uint32_t overflow)
 {
     m_new_inst_cpsr = m_inst_cpsr;
-    SetBit32(m_new_inst_cpsr, CPSR_N, Bit32(result, CPSR_N));
-    SetBit32(m_new_inst_cpsr, CPSR_Z, result == 0 ? 1 : 0);
+    SetBit32(m_new_inst_cpsr, CPSR_N_POS, Bit32(result, CPSR_N_POS));
+    SetBit32(m_new_inst_cpsr, CPSR_Z_POS, result == 0 ? 1 : 0);
     if (carry != ~0u)
-        SetBit32(m_new_inst_cpsr, CPSR_C, carry);
+        SetBit32(m_new_inst_cpsr, CPSR_C_POS, carry);
     if (overflow != ~0u)
-        SetBit32(m_new_inst_cpsr, CPSR_V, overflow);
+        SetBit32(m_new_inst_cpsr, CPSR_V_POS, overflow);
     if (m_new_inst_cpsr != m_inst_cpsr)
     {
         if (!WriteRegisterUnsigned (context, eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FLAGS, m_new_inst_cpsr))