Fixes to get the arm native debugserver building again.

Fix a small typeo in the i386/x86_64 debugserver plugins.

llvm-svn: 195308

6 files changed, 20 insertions, 13 deletions

diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
index 88073afee00..e9781717d94 100644
--- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
@@ -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 (uint32_t save_id)
             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);
diff --git a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h
index 4021fd5668e..8cda8025395 100644
--- a/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h
+++ b/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h
@@ -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__)
diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
index 9c708f31359..faa534ef79e 100644
--- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp
@@ -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;
diff --git a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
index ae9ef4980fc..611aa48a160 100644
--- a/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
+++ b/lldb/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
@@ -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__)
diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
index 0ceabc56547..e2d39311a66 100644
--- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp
@@ -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;
diff --git a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
index 4302c6b319d..ac171ee7642 100644
--- a/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
+++ b/lldb/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
@@ -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__)