[Lldb-commits] [lldb] r160198 - /lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp

[Jason Molenda]

Author: jmolenda
Date: Fri Jul 13 17:40:51 2012
New Revision: 160198

URL: http://llvm.org/viewvc/llvm-project?rev=160198&view=rev
Log:
Revert the change I committed yesterday, it caused a regression
with one armv7 unwind.  I'll look at updating this or finding a
different way of fixing it later tonight.


Modified:
    lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp

Modified: lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp?rev=160198&r1=160197&r2=160198&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp (original)
+++ lldb/trunk/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp Fri Jul 13 17:40:51 2012
@@ -490,20 +490,6 @@
                 {
                     m_curr_row.SetRegisterLocationToSame (reg_num, must_replace);
                 }
-                // if we just restored the caller's reg value in the reg we were using for the frame pointer,
-                // change the CFA to be in terms of the stack pointer again.
-                if (m_fp_is_cfa && reg_num == m_cfa_reg_info.kinds[m_unwind_plan_ptr->GetRegisterKind()])
-                {
-                    m_fp_is_cfa = false;
-                    m_inst_emulator_ap->GetRegisterInfo (m_unwind_plan_ptr->GetRegisterKind(), 
-                                                         m_unwind_plan_ptr->GetInitialCFARegister(), 
-                                                         m_cfa_reg_info);
-                    m_curr_row.SetCFARegister(m_cfa_reg_info.kinds[m_unwind_plan_ptr->GetRegisterKind()]);
-                    if (log && log->GetVerbose())
-                    {
-                        log->Printf("UnwindAssemblyInstEmulation::WriteRegister - CFA is expressed in terms of %s again", m_cfa_reg_info.name);
-                    }
-                }
             }
             break;