summaryrefslogtreecommitdiffstats
path: root/lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>2013-11-21 03:59:47 +0000
committerJason Molenda <jmolenda@apple.com>2013-11-21 03:59:47 +0000
commitdb2f51e5f18650cd0b5e91886bd78db1da441e35 (patch)
tree2335ab939a3bc94027c1ffab3d55636637a7df9c /lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp
parent178324d903d74382d33f6258074e5c982b17aef1 (diff)
downloadbcm5719-llvm-db2f51e5f18650cd0b5e91886bd78db1da441e35.tar.gz
bcm5719-llvm-db2f51e5f18650cd0b5e91886bd78db1da441e35.zip
Fixes to get the arm native debugserver building again.
Fix a small typeo in the i386/x86_64 debugserver plugins. llvm-svn: 195308
Diffstat (limited to 'lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp')
-rw-r--r--lldb/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp13
1 files changed, 7 insertions, 6 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);
OpenPOWER on IntegriCloud