[Lldb-commits] [lldb] r195308 - Fixes to get the arm native debugserver building again.
Jason Molenda
jmolenda at apple.com
Wed Nov 20 19:59:47 PST 2013
Author: jmolenda
Date: Wed Nov 20 21:59:47 2013
New Revision: 195308
URL: http://llvm.org/viewvc/llvm-project?rev=195308&view=rev
Log:
Fixes to get the arm native debugserver building again.
Fix a small typeo in the i386/x86_64 debugserver plugins.
Modified:
lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h
lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
Modified: lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp Wed Nov 20 21:59:47 2013
@@ -154,7 +154,7 @@ DNBArchMachARM::SetPC(uint64_t value)
kern_return_t err = GetGPRState(false);
if (err == KERN_SUCCESS)
{
- m_state.context.gpr.__pc = value;
+ m_state.context.gpr.__pc = (uint32_t) value;
err = SetGPRState();
}
return err == KERN_SUCCESS;
@@ -1818,9 +1818,9 @@ DNBArchMachARM::SaveRegisterState ()
{
DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::SaveRegisterState () error: GPR regs failed to read: %u ", kret);
}
- else if ((kret = GetFPUState(force)) != KERN_SUCCESS)
+ else if ((kret = GetVFPState(force)) != KERN_SUCCESS)
{
- DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::SaveRegisterState () error: %s regs failed to read: %u", CPUHasAVX() ? "AVX" : "FPU", kret);
+ DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::SaveRegisterState () error: %s regs failed to read: %u", "VFP", kret);
}
else
{
@@ -1830,10 +1830,11 @@ DNBArchMachARM::SaveRegisterState ()
}
return UINT32_MAX;
}
+
bool
DNBArchMachARM::RestoreRegisterState (uint32_t save_id)
{
- SaveRegiterStates::iterator pos = m_saved_register_states.find(save_id);
+ SaveRegisterStates::iterator pos = m_saved_register_states.find(save_id);
if (pos != m_saved_register_states.end())
{
m_state.context.gpr = pos->second.gpr;
@@ -1845,9 +1846,9 @@ DNBArchMachARM::RestoreRegisterState (ui
DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::RestoreRegisterState (save_id = %u) error: GPR regs failed to write: %u", save_id, kret);
success = false;
}
- else if ((kret = SetFPUState()) != KERN_SUCCESS)
+ else if ((kret = SetVFPState()) != KERN_SUCCESS)
{
- DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::RestoreRegisterState (save_id = %u) error: %s regs failed to write: %u", save_id, CPUHasAVX() ? "AVX" : "FPU", kret);
+ DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM::RestoreRegisterState (save_id = %u) error: %s regs failed to write: %u", save_id, "VFP", kret);
success = false;
}
m_saved_register_states.erase(pos);
Modified: lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h Wed Nov 20 21:59:47 2013
@@ -34,7 +34,8 @@ public:
m_last_decode_pc(INVALID_NUB_ADDRESS),
m_watchpoint_hw_index(-1),
m_watchpoint_did_occur(false),
- m_watchpoint_resume_single_step_enabled(false)
+ m_watchpoint_resume_single_step_enabled(false),
+ m_saved_register_states()
{
memset(&m_dbg_save, 0, sizeof(m_dbg_save));
#if defined (USE_ARM_DISASSEMBLER_FRAMEWORK)
@@ -54,6 +55,8 @@ public:
virtual bool SetRegisterValue(int set, int reg, const DNBRegisterValue *value);
virtual nub_size_t GetRegisterContext (void *buf, nub_size_t buf_len);
virtual nub_size_t SetRegisterContext (const void *buf, nub_size_t buf_len);
+ virtual uint32_t SaveRegisterState ();
+ virtual bool RestoreRegisterState (uint32_t save_id);
virtual kern_return_t GetRegisterState (int set, bool force);
virtual kern_return_t SetRegisterState (int set);
@@ -246,6 +249,9 @@ protected:
int32_t m_watchpoint_hw_index;
bool m_watchpoint_did_occur;
bool m_watchpoint_resume_single_step_enabled;
+
+ typedef std::map<uint32_t, Context> SaveRegisterStates;
+ SaveRegisterStates m_saved_register_states;
};
#endif // #if defined (__arm__)
Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp Wed Nov 20 21:59:47 2013
@@ -1824,7 +1824,7 @@ DNBArchImplI386::SaveRegisterState ()
bool
DNBArchImplI386::RestoreRegisterState (uint32_t save_id)
{
- SaveRegiterStates::iterator pos = m_saved_register_states.find(save_id);
+ SaveRegisterStates::iterator pos = m_saved_register_states.find(save_id);
if (pos != m_saved_register_states.end())
{
m_state.context.gpr = pos->second.gpr;
Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h Wed Nov 20 21:59:47 2013
@@ -247,8 +247,8 @@ protected:
State m_state;
DBG m_2pc_dbg_checkpoint;
uint32_t m_2pc_trans_state; // Is transaction of DBG state change: Pedning (0), Done (1), or Rolled Back (2)?
- typedef std::map<uint32_t, Context> SaveRegiterStates;
- SaveRegiterStates m_saved_register_states;
+ typedef std::map<uint32_t, Context> SaveRegisterStates;
+ SaveRegisterStates m_saved_register_states;
};
#endif // #if defined (__i386__) || defined (__x86_64__)
Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Wed Nov 20 21:59:47 2013
@@ -2217,7 +2217,7 @@ DNBArchImplX86_64::SaveRegisterState ()
bool
DNBArchImplX86_64::RestoreRegisterState (uint32_t save_id)
{
- SaveRegiterStates::iterator pos = m_saved_register_states.find(save_id);
+ SaveRegisterStates::iterator pos = m_saved_register_states.find(save_id);
if (pos != m_saved_register_states.end())
{
m_state.context.gpr = pos->second.gpr;
Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h?rev=195308&r1=195307&r2=195308&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h (original)
+++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h Wed Nov 20 21:59:47 2013
@@ -253,8 +253,8 @@ protected:
State m_state;
DBG m_2pc_dbg_checkpoint;
uint32_t m_2pc_trans_state; // Is transaction of DBG state change: Pedning (0), Done (1), or Rolled Back (2)?
- typedef std::map<uint32_t, Context> SaveRegiterStates;
- SaveRegiterStates m_saved_register_states;
+ typedef std::map<uint32_t, Context> SaveRegisterStates;
+ SaveRegisterStates m_saved_register_states;
};
#endif // #if defined (__i386__) || defined (__x86_64__)
More information about the lldb-commits
mailing list