diff options
Diffstat (limited to 'lldb/source/Core')
-rw-r--r-- | lldb/source/Core/Address.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Core/DataEncoder.cpp | 10 | ||||
-rw-r--r-- | lldb/source/Core/DataExtractor.cpp | 30 | ||||
-rw-r--r-- | lldb/source/Core/Event.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Core/Opcode.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Core/Scalar.cpp | 28 | ||||
-rw-r--r-- | lldb/source/Core/Stream.cpp | 16 | ||||
-rw-r--r-- | lldb/source/Core/Value.cpp | 6 | ||||
-rw-r--r-- | lldb/source/Core/ValueObjectConstResultImpl.cpp | 2 |
9 files changed, 49 insertions, 49 deletions
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp index ab8d2e5544b..83100dea93b 100644 --- a/lldb/source/Core/Address.cpp +++ b/lldb/source/Core/Address.cpp @@ -179,7 +179,7 @@ ReadCStringFromMemory (ExecutionContextScope *exe_scope, const Address &address, buf[k_buf_len] = '\0'; // NULL terminate // Byte order and address size don't matter for C string dumping.. - DataExtractor data (buf, sizeof(buf), lldb::endian::InlHostByteOrder(), 4); + DataExtractor data (buf, sizeof(buf), endian::InlHostByteOrder(), 4); size_t total_len = 0; size_t bytes_read; Address curr_address(address); diff --git a/lldb/source/Core/DataEncoder.cpp b/lldb/source/Core/DataEncoder.cpp index d21ca423892..040d0964756 100644 --- a/lldb/source/Core/DataEncoder.cpp +++ b/lldb/source/Core/DataEncoder.cpp @@ -61,7 +61,7 @@ WriteSwappedInt64(unsigned char* ptr, unsigned offset, uint64_t value) DataEncoder::DataEncoder () : m_start (NULL), m_end (NULL), - m_byte_order(lldb::endian::InlHostByteOrder()), + m_byte_order(endian::InlHostByteOrder()), m_addr_size (sizeof(void*)), m_data_sp () { @@ -114,7 +114,7 @@ DataEncoder::Clear () { m_start = NULL; m_end = NULL; - m_byte_order = lldb::endian::InlHostByteOrder(); + m_byte_order = endian::InlHostByteOrder(); m_addr_size = sizeof(void*); m_data_sp.reset(); } @@ -240,7 +240,7 @@ DataEncoder::PutU16 (uint32_t offset, uint16_t value) { if (ValidOffsetForDataOfSize(offset, sizeof(value))) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) WriteSwappedInt16 (m_start, offset, value); else WriteInt16 (m_start, offset, value); @@ -255,7 +255,7 @@ DataEncoder::PutU32 (uint32_t offset, uint32_t value) { if (ValidOffsetForDataOfSize(offset, sizeof(value))) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) WriteSwappedInt32 (m_start, offset, value); else WriteInt32 (m_start, offset, value); @@ -270,7 +270,7 @@ DataEncoder::PutU64 (uint32_t offset, uint64_t value) { if (ValidOffsetForDataOfSize(offset, sizeof(value))) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) WriteSwappedInt64 (m_start, offset, value); else WriteInt64 (m_start, offset, value); diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp index 8e8dc1cccb9..8db48ef3186 100644 --- a/lldb/source/Core/DataExtractor.cpp +++ b/lldb/source/Core/DataExtractor.cpp @@ -130,7 +130,7 @@ ReadSwapInt64(const void* ptr) DataExtractor::DataExtractor () : m_start (NULL), m_end (NULL), - m_byte_order(lldb::endian::InlHostByteOrder()), + m_byte_order(endian::InlHostByteOrder()), m_addr_size (sizeof(void *)), m_data_sp (), m_target_byte_size(1) @@ -249,7 +249,7 @@ DataExtractor::Clear () { m_start = NULL; m_end = NULL; - m_byte_order = lldb::endian::InlHostByteOrder(); + m_byte_order = endian::InlHostByteOrder(); m_addr_size = sizeof(void *); m_data_sp.reset(); } @@ -442,7 +442,7 @@ DataExtractor::GetU16 (offset_t *offset_ptr) const const uint8_t *data = (const uint8_t *)GetData (offset_ptr, sizeof(val)); if (data) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) val = ReadSwapInt16(data); else val = ReadInt16 (data); @@ -454,7 +454,7 @@ uint16_t DataExtractor::GetU16_unchecked (offset_t *offset_ptr) const { uint16_t val; - if (m_byte_order == lldb::endian::InlHostByteOrder()) + if (m_byte_order == endian::InlHostByteOrder()) val = ReadInt16 (m_start, *offset_ptr); else val = ReadSwapInt16(m_start, *offset_ptr); @@ -466,7 +466,7 @@ uint32_t DataExtractor::GetU32_unchecked (offset_t *offset_ptr) const { uint32_t val; - if (m_byte_order == lldb::endian::InlHostByteOrder()) + if (m_byte_order == endian::InlHostByteOrder()) val = ReadInt32 (m_start, *offset_ptr); else val = ReadSwapInt32 (m_start, *offset_ptr); @@ -478,7 +478,7 @@ uint64_t DataExtractor::GetU64_unchecked (offset_t *offset_ptr) const { uint64_t val; - if (m_byte_order == lldb::endian::InlHostByteOrder()) + if (m_byte_order == endian::InlHostByteOrder()) val = ReadInt64 (m_start, *offset_ptr); else val = ReadSwapInt64 (m_start, *offset_ptr); @@ -503,7 +503,7 @@ DataExtractor::GetU16 (offset_t *offset_ptr, void *void_dst, uint32_t count) con const uint16_t *src = (const uint16_t *)GetData (offset_ptr, src_size); if (src) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { uint16_t *dst_pos = (uint16_t *)void_dst; uint16_t *dst_end = dst_pos + count; @@ -538,7 +538,7 @@ DataExtractor::GetU32 (offset_t *offset_ptr) const const uint8_t *data = (const uint8_t *)GetData (offset_ptr, sizeof(val)); if (data) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { val = ReadSwapInt32 (data); } @@ -566,7 +566,7 @@ DataExtractor::GetU32 (offset_t *offset_ptr, void *void_dst, uint32_t count) con const uint32_t *src = (const uint32_t *)GetData (offset_ptr, src_size); if (src) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { uint32_t *dst_pos = (uint32_t *)void_dst; uint32_t *dst_end = dst_pos + count; @@ -601,7 +601,7 @@ DataExtractor::GetU64 (offset_t *offset_ptr) const const uint8_t *data = (const uint8_t *)GetData (offset_ptr, sizeof(val)); if (data) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { val = ReadSwapInt64 (data); } @@ -627,7 +627,7 @@ DataExtractor::GetU64 (offset_t *offset_ptr, void *void_dst, uint32_t count) con const uint64_t *src = (const uint64_t *)GetData (offset_ptr, src_size); if (src) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { uint64_t *dst_pos = (uint64_t *)void_dst; uint64_t *dst_end = dst_pos + count; @@ -775,7 +775,7 @@ DataExtractor::GetFloat (offset_t *offset_ptr) const const float_type *src = (const float_type *)GetData (offset_ptr, src_size); if (src) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { const uint8_t *src_data = (const uint8_t *)src; uint8_t *dst_data = (uint8_t *)&val; @@ -799,7 +799,7 @@ DataExtractor::GetDouble (offset_t *offset_ptr) const const float_type *src = (const float_type *)GetData (offset_ptr, src_size); if (src) { - if (m_byte_order != lldb::endian::InlHostByteOrder()) + if (m_byte_order != endian::InlHostByteOrder()) { const uint8_t *src_data = (const uint8_t *)src; uint8_t *dst_data = (uint8_t *)&val; @@ -820,9 +820,9 @@ DataExtractor::GetLongDouble (offset_t *offset_ptr) const { long double val = 0.0; #if defined (__i386__) || defined (__amd64__) || defined (__x86_64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_X64) - *offset_ptr += CopyByteOrderedData (*offset_ptr, 10, &val, sizeof(val), lldb::endian::InlHostByteOrder()); + *offset_ptr += CopyByteOrderedData (*offset_ptr, 10, &val, sizeof(val), endian::InlHostByteOrder()); #else - *offset_ptr += CopyByteOrderedData (*offset_ptr, sizeof(val), &val, sizeof(val), lldb::endian::InlHostByteOrder()); + *offset_ptr += CopyByteOrderedData (*offset_ptr, sizeof(val), &val, sizeof(val), endian::InlHostByteOrder()); #endif return val; } diff --git a/lldb/source/Core/Event.cpp b/lldb/source/Core/Event.cpp index bf5ff222a12..293a322257e 100644 --- a/lldb/source/Core/Event.cpp +++ b/lldb/source/Core/Event.cpp @@ -147,7 +147,7 @@ EventDataBytes::Dump (Stream *s) const else if (m_bytes.size() > 0) { DataExtractor data; - data.SetData(&m_bytes[0], m_bytes.size(), lldb::endian::InlHostByteOrder()); + data.SetData(&m_bytes[0], m_bytes.size(), endian::InlHostByteOrder()); data.Dump(s, 0, eFormatBytes, 1, m_bytes.size(), 32, LLDB_INVALID_ADDRESS, 0, 0); } } diff --git a/lldb/source/Core/Opcode.cpp b/lldb/source/Core/Opcode.cpp index 73f5f85923c..89eea2624ce 100644 --- a/lldb/source/Core/Opcode.cpp +++ b/lldb/source/Core/Opcode.cpp @@ -82,7 +82,7 @@ Opcode::GetDataByteOrder () const case Opcode::eType16: case Opcode::eType16_2: case Opcode::eType32: - case Opcode::eType64: return lldb::endian::InlHostByteOrder(); + case Opcode::eType64: return endian::InlHostByteOrder(); case Opcode::eTypeBytes: break; } diff --git a/lldb/source/Core/Scalar.cpp b/lldb/source/Core/Scalar.cpp index e16f74b19ae..400222813dc 100644 --- a/lldb/source/Core/Scalar.cpp +++ b/lldb/source/Core/Scalar.cpp @@ -143,7 +143,7 @@ Scalar::GetData (DataExtractor &data, size_t limit_byte_size) const { if (limit_byte_size < byte_size) { - if (lldb::endian::InlHostByteOrder() == eByteOrderLittle) + if (endian::InlHostByteOrder() == eByteOrderLittle) { // On little endian systems if we want fewer bytes from the // current type we just specify fewer bytes since the LSByte @@ -160,23 +160,23 @@ Scalar::GetData (DataExtractor &data, size_t limit_byte_size) const case e_ulonglong: case e_sint128: case e_uint128: - data.SetData((const uint8_t *)m_integer.getRawData(), limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)m_integer.getRawData(), limit_byte_size, endian::InlHostByteOrder()); return true; case e_float: f_val = m_float.convertToFloat(); - data.SetData((uint8_t *)&f_val, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&f_val, limit_byte_size, endian::InlHostByteOrder()); return true; case e_double: d_val = m_float.convertToDouble(); - data.SetData((uint8_t *)&d_val, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&d_val, limit_byte_size, endian::InlHostByteOrder()); return true; case e_long_double: static llvm::APInt ldbl_val = m_float.bitcastToAPInt(); - data.SetData((const uint8_t *)ldbl_val.getRawData(), limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)ldbl_val.getRawData(), limit_byte_size, endian::InlHostByteOrder()); return true; } } - else if (lldb::endian::InlHostByteOrder() == eByteOrderBig) + else if (endian::InlHostByteOrder() == eByteOrderBig) { // On big endian systems if we want fewer bytes from the // current type have to advance our initial byte pointer and @@ -193,19 +193,19 @@ Scalar::GetData (DataExtractor &data, size_t limit_byte_size) const case e_ulonglong: case e_sint128: case e_uint128: - data.SetData((const uint8_t *)m_integer.getRawData() + byte_size - limit_byte_size, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)m_integer.getRawData() + byte_size - limit_byte_size, limit_byte_size, endian::InlHostByteOrder()); return true; case e_float: f_val = m_float.convertToFloat(); - data.SetData((uint8_t *)&f_val + byte_size - limit_byte_size, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&f_val + byte_size - limit_byte_size, limit_byte_size, endian::InlHostByteOrder()); return true; case e_double: d_val = m_float.convertToDouble(); - data.SetData((uint8_t *)&d_val + byte_size - limit_byte_size, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&d_val + byte_size - limit_byte_size, limit_byte_size, endian::InlHostByteOrder()); return true; case e_long_double: static llvm::APInt ldbl_val = m_float.bitcastToAPInt(); - data.SetData((const uint8_t *)ldbl_val.getRawData() + byte_size - limit_byte_size, limit_byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)ldbl_val.getRawData() + byte_size - limit_byte_size, limit_byte_size, endian::InlHostByteOrder()); return true; } } @@ -225,19 +225,19 @@ Scalar::GetData (DataExtractor &data, size_t limit_byte_size) const case e_ulonglong: case e_sint128: case e_uint128: - data.SetData((const uint8_t *)m_integer.getRawData(), byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)m_integer.getRawData(), byte_size, endian::InlHostByteOrder()); return true; case e_float: f_val = m_float.convertToFloat(); - data.SetData((uint8_t *)&f_val, byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&f_val, byte_size, endian::InlHostByteOrder()); return true; case e_double: d_val = m_float.convertToDouble(); - data.SetData((uint8_t *)&d_val, byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((uint8_t *)&d_val, byte_size, endian::InlHostByteOrder()); return true; case e_long_double: static llvm::APInt ldbl_val = m_float.bitcastToAPInt(); - data.SetData((const uint8_t *)ldbl_val.getRawData(), byte_size, lldb::endian::InlHostByteOrder()); + data.SetData((const uint8_t *)ldbl_val.getRawData(), byte_size, endian::InlHostByteOrder()); return true; } } diff --git a/lldb/source/Core/Stream.cpp b/lldb/source/Core/Stream.cpp index b3d1a359e8e..15876d558ec 100644 --- a/lldb/source/Core/Stream.cpp +++ b/lldb/source/Core/Stream.cpp @@ -30,7 +30,7 @@ Stream::Stream (uint32_t flags, uint32_t addr_size, ByteOrder byte_order) : Stream::Stream () : m_flags (0), m_addr_size (4), - m_byte_order (lldb::endian::InlHostByteOrder()), + m_byte_order (endian::InlHostByteOrder()), m_indent_level(0) { } @@ -632,7 +632,7 @@ Stream::PutMaxHex64 size_t Stream::PutPointer (void *ptr) { - return PutRawBytes (&ptr, sizeof(ptr), lldb::endian::InlHostByteOrder(), lldb::endian::InlHostByteOrder()); + return PutRawBytes (&ptr, sizeof(ptr), endian::InlHostByteOrder(), endian::InlHostByteOrder()); } size_t @@ -641,7 +641,7 @@ Stream::PutFloat(float f, ByteOrder byte_order) if (byte_order == eByteOrderInvalid) byte_order = m_byte_order; - return PutRawBytes (&f, sizeof(f), lldb::endian::InlHostByteOrder(), byte_order); + return PutRawBytes (&f, sizeof(f), endian::InlHostByteOrder(), byte_order); } size_t @@ -650,7 +650,7 @@ Stream::PutDouble(double d, ByteOrder byte_order) if (byte_order == eByteOrderInvalid) byte_order = m_byte_order; - return PutRawBytes (&d, sizeof(d), lldb::endian::InlHostByteOrder(), byte_order); + return PutRawBytes (&d, sizeof(d), endian::InlHostByteOrder(), byte_order); } size_t @@ -659,7 +659,7 @@ Stream::PutLongDouble(long double ld, ByteOrder byte_order) if (byte_order == eByteOrderInvalid) byte_order = m_byte_order; - return PutRawBytes (&ld, sizeof(ld), lldb::endian::InlHostByteOrder(), byte_order); + return PutRawBytes (&ld, sizeof(ld), endian::InlHostByteOrder(), byte_order); } size_t @@ -743,21 +743,21 @@ Stream::UnitTest(Stream *s) s->PutHex8(0x12); s->PutChar(' '); - s->PutHex16(0x3456, lldb::endian::InlHostByteOrder()); + s->PutHex16(0x3456, endian::InlHostByteOrder()); s->PutChar(' '); s->PutHex16(0x3456, eByteOrderBig); s->PutChar(' '); s->PutHex16(0x3456, eByteOrderLittle); s->PutChar(' '); - s->PutHex32(0x789abcde, lldb::endian::InlHostByteOrder()); + s->PutHex32(0x789abcde, endian::InlHostByteOrder()); s->PutChar(' '); s->PutHex32(0x789abcde, eByteOrderBig); s->PutChar(' '); s->PutHex32(0x789abcde, eByteOrderLittle); s->PutChar(' '); - s->PutHex64(0x1122334455667788ull, lldb::endian::InlHostByteOrder()); + s->PutHex64(0x1122334455667788ull, endian::InlHostByteOrder()); s->PutChar(' '); s->PutHex64(0x1122334455667788ull, eByteOrderBig); s->PutChar(' '); diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp index 49c8a3807fe..a5c48e823ac 100644 --- a/lldb/source/Core/Value.cpp +++ b/lldb/source/Core/Value.cpp @@ -189,7 +189,7 @@ Value::AppendDataToHostBuffer (const Value &rhs) { rhs.m_value.GetAsMemoryData (m_data_buffer.GetBytes() + curr_size, scalar_size, - lldb::endian::InlHostByteOrder(), + endian::InlHostByteOrder(), error); return scalar_size; } @@ -420,7 +420,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, case eValueTypeScalar: { - data.SetByteOrder (lldb::endian::InlHostByteOrder()); + data.SetByteOrder (endian::InlHostByteOrder()); if (ast_type.IsValid()) data.SetAddressByteSize (ast_type.GetPointerByteSize()); else @@ -623,7 +623,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, } } // fallback to host settings - data.SetByteOrder(lldb::endian::InlHostByteOrder()); + data.SetByteOrder(endian::InlHostByteOrder()); data.SetAddressByteSize(sizeof(void *)); break; } diff --git a/lldb/source/Core/ValueObjectConstResultImpl.cpp b/lldb/source/Core/ValueObjectConstResultImpl.cpp index 248d7175532..1646e5af65f 100644 --- a/lldb/source/Core/ValueObjectConstResultImpl.cpp +++ b/lldb/source/Core/ValueObjectConstResultImpl.cpp @@ -143,7 +143,7 @@ ValueObjectConstResultImpl::AddressOf (Error &error) compiler_type.GetPointerType(), ConstString(new_name.c_str()), buffer, - lldb::endian::InlHostByteOrder(), + endian::InlHostByteOrder(), exe_ctx.GetAddressByteSize()); m_address_of_backend->GetValue().SetValueType(Value::eValueTypeScalar); |