diff options
Diffstat (limited to 'lldb/source/Plugins/Process')
9 files changed, 60 insertions, 55 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp index a4f21eb5be4..feb3300d572 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/MacOSX/MachTask.cpp @@ -21,6 +21,7 @@ #endif +#include "lldb/Host/Endian.h" #include "lldb/Host/Host.h" #include "lldb/Core/DataExtractor.h" @@ -165,7 +166,7 @@ MachTask::ReadMemory (lldb::addr_t addr, void *buf, size_t size, Error& error) log->Printf ("MachTask::ReadMemory ( addr = 0x%16.16llx, size = %zu, buf = %8.8p) => %u bytes read", (uint64_t)addr, size, buf, n); if (log->GetMask().Test(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().Test(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) { - DataExtractor data((uint8_t*)buf, n, eByteOrderHost, 4); + DataExtractor data((uint8_t*)buf, n, lldb::endian::InlHostByteOrder(), 4); data.PutToLog(log.get(), 0, n, addr, 16, DataExtractor::TypeUInt8); } } @@ -191,7 +192,7 @@ MachTask::WriteMemory (lldb::addr_t addr, const void *buf, size_t size, Error& e log->Printf ("MachTask::WriteMemory ( addr = 0x%16.16llx, size = %zu, buf = %8.8p) => %u bytes written", (uint64_t)addr, size, buf, n); if (log->GetMask().Test(PD_LOG_MEMORY_DATA_LONG) || (log->GetMask().Test(PD_LOG_MEMORY_DATA_SHORT) && size <= 8)) { - DataExtractor data((uint8_t*)buf, n, eByteOrderHost, 4); + DataExtractor data((uint8_t*)buf, n, lldb::endian::InlHostByteOrder(), 4); data.PutToLog(log.get(), 0, n, addr, 16, DataExtractor::TypeUInt8); } } diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp index 9aebc8fdec6..cfcd7f9fe2d 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/ProcessMacOSX.cpp @@ -32,6 +32,7 @@ #include "lldb/Core/PluginManager.h" #include "lldb/Core/State.h" #include "lldb/Core/Timer.h" +#include "lldb/Host/Host.h" #include "lldb/Host/TimeValue.h" #include "lldb/Symbol/ObjectFile.h" #include "lldb/Target/DynamicLoader.h" @@ -48,7 +49,6 @@ #endif // #if defined (__arm__) // Project includes -#include "lldb/Host/Host.h" #include "ProcessMacOSX.h" #include "ProcessMacOSXLog.h" #include "ThreadMacOSX.h" diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp index 55e5534a5d8..cac805ef560 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_arm.cpp @@ -18,6 +18,7 @@ #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/DataExtractor.h" #include "lldb/Core/Scalar.h" +#include "lldb/Host/Endian.h" // Project includes #include "ARM_GCC_Registers.h" @@ -837,7 +838,7 @@ RegisterContextMach_arm::ReadRegisterBytes (uint32_t reg, DataExtractor &data) case gpr_lr: case gpr_pc: case gpr_cpsr: - data.SetData(&gpr.r[reg - gpr_r0], reg_info->byte_size, eByteOrderHost); + data.SetData(&gpr.r[reg - gpr_r0], reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_s0: @@ -872,23 +873,23 @@ RegisterContextMach_arm::ReadRegisterBytes (uint32_t reg, DataExtractor &data) case fpu_s29: case fpu_s30: case fpu_s31: - data.SetData(&fpu.floats.s[reg - fpu_s0], reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.floats.s[reg - fpu_s0], reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fpscr: - data.SetData(&fpu.fpscr, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fpscr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_exception: - data.SetData(&exc.exception, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.exception, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_fsr: - data.SetData(&exc.fsr, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.fsr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_far: - data.SetData(&exc.far, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.far, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; default: diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.cpp index 077a492bbf4..6bf4dec3691 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_i386.cpp @@ -16,6 +16,7 @@ #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/DataExtractor.h" #include "lldb/Core/Scalar.h" +#include "lldb/Host/Endian.h" // Project includes #include "RegisterContextMach_i386.h" @@ -817,47 +818,47 @@ RegisterContextMach_i386::ReadRegisterBytes (uint32_t reg, DataExtractor &data) case gpr_es: case gpr_fs: case gpr_gs: - data.SetData(&gpr.eax + reg - gpr_eax, reg_info->byte_size, eByteOrderHost); + data.SetData(&gpr.eax + reg - gpr_eax, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fcw: - data.SetData(&fpu.fcw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fcw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fsw: - data.SetData(&fpu.fsw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fsw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ftw: - data.SetData(&fpu.ftw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ftw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fop: - data.SetData(&fpu.fop, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fop, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ip: - data.SetData(&fpu.ip, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ip, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_cs: - data.SetData(&fpu.cs, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.cs, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_dp: - data.SetData(&fpu.dp, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.dp, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ds: - data.SetData(&fpu.ds, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ds, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_mxcsr: - data.SetData(&fpu.mxcsr, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.mxcsr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_mxcsrmask: - data.SetData(&fpu.mxcsrmask, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.mxcsrmask, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_stmm0: @@ -868,7 +869,7 @@ RegisterContextMach_i386::ReadRegisterBytes (uint32_t reg, DataExtractor &data) case fpu_stmm5: case fpu_stmm6: case fpu_stmm7: - data.SetData(fpu.stmm[reg - fpu_stmm0].bytes, reg_info->byte_size, eByteOrderHost); + data.SetData(fpu.stmm[reg - fpu_stmm0].bytes, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_xmm0: @@ -879,19 +880,19 @@ RegisterContextMach_i386::ReadRegisterBytes (uint32_t reg, DataExtractor &data) case fpu_xmm5: case fpu_xmm6: case fpu_xmm7: - data.SetData(fpu.xmm[reg - fpu_xmm0].bytes, reg_info->byte_size, eByteOrderHost); + data.SetData(fpu.xmm[reg - fpu_xmm0].bytes, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_trapno: - data.SetData(&exc.trapno, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.trapno, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_err: - data.SetData(&exc.err, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.err, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_faultvaddr: - data.SetData(&exc.faultvaddr, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.faultvaddr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; default: diff --git a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp index 8b1ed79d3c7..9995b0d2da0 100644 --- a/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp +++ b/lldb/source/Plugins/Process/MacOSX-User/source/RegisterContextMach_x86_64.cpp @@ -16,6 +16,7 @@ #include "lldb/Core/DataBufferHeap.h" #include "lldb/Core/DataExtractor.h" #include "lldb/Core/Scalar.h" +#include "lldb/Host/Endian.h" // Project includes #include "RegisterContextMach_x86_64.h" @@ -895,47 +896,47 @@ RegisterContextMach_x86_64::ReadRegisterBytes (uint32_t reg, DataExtractor &data case gpr_cs: case gpr_fs: case gpr_gs: - data.SetData(&gpr.rax + reg - gpr_rax, reg_info->byte_size, eByteOrderHost); + data.SetData(&gpr.rax + reg - gpr_rax, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fcw: - data.SetData(&fpu.fcw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fcw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fsw: - data.SetData(&fpu.fsw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fsw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ftw: - data.SetData(&fpu.ftw, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ftw, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_fop: - data.SetData(&fpu.fop, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.fop, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ip: - data.SetData(&fpu.ip, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ip, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_cs: - data.SetData(&fpu.cs, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.cs, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_dp: - data.SetData(&fpu.dp, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.dp, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_ds: - data.SetData(&fpu.ds, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.ds, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_mxcsr: - data.SetData(&fpu.mxcsr, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.mxcsr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_mxcsrmask: - data.SetData(&fpu.mxcsrmask, reg_info->byte_size, eByteOrderHost); + data.SetData(&fpu.mxcsrmask, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_stmm0: @@ -946,7 +947,7 @@ RegisterContextMach_x86_64::ReadRegisterBytes (uint32_t reg, DataExtractor &data case fpu_stmm5: case fpu_stmm6: case fpu_stmm7: - data.SetData(fpu.stmm[reg - fpu_stmm0].bytes, reg_info->byte_size, eByteOrderHost); + data.SetData(fpu.stmm[reg - fpu_stmm0].bytes, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case fpu_xmm0: @@ -965,19 +966,19 @@ RegisterContextMach_x86_64::ReadRegisterBytes (uint32_t reg, DataExtractor &data case fpu_xmm13: case fpu_xmm14: case fpu_xmm15: - data.SetData(fpu.xmm[reg - fpu_xmm0].bytes, reg_info->byte_size, eByteOrderHost); + data.SetData(fpu.xmm[reg - fpu_xmm0].bytes, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_trapno: - data.SetData(&exc.trapno, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.trapno, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_err: - data.SetData(&exc.err, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.err, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; case exc_faultvaddr: - data.SetData(&exc.faultvaddr, reg_info->byte_size, eByteOrderHost); + data.SetData(&exc.faultvaddr, reg_info->byte_size, lldb::endian::InlHostByteOrder()); break; default: diff --git a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp index c23c0b91aa5..c508b86a163 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp +++ b/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp @@ -707,35 +707,35 @@ RegisterContextLLDB::ReadRegisterBytesFromRegisterLocation (uint32_t regnum, Reg if (regloc.type == eRegisterValueInferred) { - data.SetByteOrder (eByteOrderHost); + data.SetByteOrder (lldb::endian::InlHostByteOrder()); switch (reg_info->byte_size) { case 1: { uint8_t val = regloc.location.register_value; memcpy (data_sp->GetBytes(), &val, sizeof (val)); - data.SetByteOrder (eByteOrderHost); + data.SetByteOrder (lldb::endian::InlHostByteOrder()); return true; } case 2: { uint16_t val = regloc.location.register_value; memcpy (data_sp->GetBytes(), &val, sizeof (val)); - data.SetByteOrder (eByteOrderHost); + data.SetByteOrder (lldb::endian::InlHostByteOrder()); return true; } case 4: { uint32_t val = regloc.location.register_value; memcpy (data_sp->GetBytes(), &val, sizeof (val)); - data.SetByteOrder (eByteOrderHost); + data.SetByteOrder (lldb::endian::InlHostByteOrder()); return true; } case 8: { uint64_t val = regloc.location.register_value; memcpy (data_sp->GetBytes(), &val, sizeof (val)); - data.SetByteOrder (eByteOrderHost); + data.SetByteOrder (lldb::endian::InlHostByteOrder()); return true; } } diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index 54382ff1240..e9b0117cb84 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -18,6 +18,7 @@ #include "lldb/Core/Log.h" #include "lldb/Core/State.h" #include "lldb/Core/StreamString.h" +#include "lldb/Host/Host.h" #include "lldb/Host/TimeValue.h" // Project includes @@ -48,7 +49,7 @@ GDBRemoteCommunication::GDBRemoteCommunication() : m_arch(), m_os(), m_vendor(), - m_byte_order(eByteOrderHost), + m_byte_order(lldb::endian::InlHostByteOrder()), m_pointer_byte_size(0) { m_rx_packet_listener.StartListeningForEvents(this, @@ -773,7 +774,7 @@ GDBRemoteCommunication::SendArgumentsPacket (char const *argv[], uint32_t timeou if (i > 0) packet.PutChar(','); packet.Printf("%i,%i,", arg_len * 2, i); - packet.PutBytesAsRawHex8(arg, arg_len, eByteOrderHost, eByteOrderHost); + packet.PutBytesAsRawHex8(arg, arg_len, lldb::endian::InlHostByteOrder(), lldb::endian::InlHostByteOrder()); } StringExtractorGDBRemote response; @@ -815,7 +816,7 @@ GDBRemoteCommunication::GetHostInfo (uint32_t timeout_seconds) m_arch.Clear(); m_os.Clear(); m_vendor.Clear(); - m_byte_order = eByteOrderHost; + m_byte_order = lldb::endian::InlHostByteOrder(); m_pointer_byte_size = 0; StringExtractorGDBRemote response; diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 2c00b9a8431..0e29f2f368f 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -341,8 +341,8 @@ GDBRemoteRegisterContext::WriteRegisterBytes (uint32_t reg, DataExtractor &data, packet.PutBytesAsRawHex8 (m_reg_data.GetDataStart(), m_reg_data.GetByteSize(), - eByteOrderHost, - eByteOrderHost); + lldb::endian::InlHostByteOrder(), + lldb::endian::InlHostByteOrder()); if (thread_suffix_supported) packet.Printf (";thread:%4.4x;", m_thread.GetID()); @@ -369,8 +369,8 @@ GDBRemoteRegisterContext::WriteRegisterBytes (uint32_t reg, DataExtractor &data, packet.Printf ("P%x=", reg); packet.PutBytesAsRawHex8 (m_reg_data.PeekData(reg_info->byte_offset, reg_info->byte_size), reg_info->byte_size, - eByteOrderHost, - eByteOrderHost); + lldb::endian::InlHostByteOrder(), + lldb::endian::InlHostByteOrder()); if (thread_suffix_supported) packet.Printf (";thread:%4.4x;", m_thread.GetID()); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index d50c57a3fd2..2fd77223740 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -758,7 +758,7 @@ ProcessGDBRemote::DoAttachToProcessWithName (const char *process_name, bool wait else packet.PutCString("vAttachName"); packet.PutChar(';'); - packet.PutBytesAsRawHex8(process_name, strlen(process_name), eByteOrderHost, eByteOrderHost); + packet.PutBytesAsRawHex8(process_name, strlen(process_name), lldb::endian::InlHostByteOrder(), lldb::endian::InlHostByteOrder()); m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncContinue, new EventDataBytes (packet.GetData(), packet.GetSize())); @@ -1324,7 +1324,7 @@ ProcessGDBRemote::DoWriteMemory (addr_t addr, const void *buf, size_t size, Erro { StreamString packet; packet.Printf("M%llx,%zx:", addr, size); - packet.PutBytesAsRawHex8(buf, size, eByteOrderHost, eByteOrderHost); + packet.PutBytesAsRawHex8(buf, size, lldb::endian::InlHostByteOrder(), lldb::endian::InlHostByteOrder()); StringExtractorGDBRemote response; if (m_gdb_comm.SendPacketAndWaitForResponse(packet.GetData(), packet.GetSize(), response, 2, true)) { |
