diff options
Diffstat (limited to 'lldb/source/Plugins/Process/gdb-remote')
3 files changed, 16 insertions, 16 deletions
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp index 921d08eaa65..c5e86736f96 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp @@ -85,7 +85,7 @@ GDBRemoteRegisterContext::GetRegisterCount () } const RegisterInfo * -GDBRemoteRegisterContext::GetRegisterInfoAtIndex (uint32_t reg) +GDBRemoteRegisterContext::GetRegisterInfoAtIndex (size_t reg) { return m_reg_info.GetRegisterInfoAtIndex (reg); } @@ -99,7 +99,7 @@ GDBRemoteRegisterContext::GetRegisterSetCount () const RegisterSet * -GDBRemoteRegisterContext::GetRegisterSet (uint32_t reg_set) +GDBRemoteRegisterContext::GetRegisterSet (size_t reg_set) { return m_reg_info.GetRegisterSet (reg_set); } @@ -857,7 +857,7 @@ GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters(bool from_scratch) static ConstString gpr_reg_set ("General Purpose Registers"); static ConstString sfp_reg_set ("Software Floating Point Registers"); static ConstString vfp_reg_set ("Floating Point Registers"); - uint32_t i; + size_t i; if (from_scratch) { // Calculate the offsets of the registers @@ -905,8 +905,8 @@ GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters(bool from_scratch) else { // Add composite registers to our primordial registers, then. - const uint32_t num_composites = llvm::array_lengthof(g_composites); - const uint32_t num_primordials = GetNumRegisters(); + const size_t num_composites = llvm::array_lengthof(g_composites); + const size_t num_primordials = GetNumRegisters(); RegisterInfo *g_comp_register_infos = g_register_infos + (num_registers - num_composites); for (i=0; i<num_composites; ++i) { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h index d052449e9b0..3110ddf8edf 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h @@ -51,7 +51,7 @@ public: lldb_private::ConstString ®_alt_name, lldb_private::ConstString &set_name) { - const uint32_t reg_num = m_regs.size(); + const uint32_t reg_num = (uint32_t)m_regs.size(); m_reg_names.push_back (reg_name); m_reg_alt_names.push_back (reg_alt_name); reg_info.name = reg_name.AsCString(); @@ -73,7 +73,7 @@ public: reg_info.invalidate_regs = m_invalidate_regs_map[reg_num].data(); } m_regs.push_back (reg_info); - uint32_t set = GetRegisterSetIndexByName (set_name, true); + uint32_t set = GetRegisterSetIndexByName (set_name); assert (set < m_sets.size()); assert (set < m_set_reg_nums.size()); assert (set < m_set_names.size()); @@ -129,20 +129,20 @@ public: } uint32_t - GetRegisterSetIndexByName (lldb_private::ConstString &set_name, bool can_create) + GetRegisterSetIndexByName (lldb_private::ConstString &set_name) { name_collection::iterator pos, end = m_set_names.end(); for (pos = m_set_names.begin(); pos != end; ++pos) { if (*pos == set_name) - return std::distance (m_set_names.begin(), pos); + return static_cast<uint32_t>(std::distance (m_set_names.begin(), pos)); } m_set_names.push_back(set_name); m_set_reg_nums.resize(m_set_reg_nums.size()+1); lldb_private::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL }; m_sets.push_back (new_set); - return m_sets.size() - 1; + return static_cast<uint32_t>(m_sets.size() - 1); } uint32_t @@ -152,7 +152,7 @@ public: for (pos = m_regs.begin(); pos != end; ++pos) { if (pos->kinds[kind] == num) - return std::distance (m_regs.begin(), pos); + return static_cast<uint32_t>(std::distance (m_regs.begin(), pos)); } return LLDB_INVALID_REGNUM; @@ -217,13 +217,13 @@ public: GetRegisterCount (); virtual const lldb_private::RegisterInfo * - GetRegisterInfoAtIndex (uint32_t reg); + GetRegisterInfoAtIndex (size_t reg); virtual size_t GetRegisterSetCount (); virtual const lldb_private::RegisterSet * - GetRegisterSet (uint32_t reg_set); + GetRegisterSet (size_t reg_set); virtual bool ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value); diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 07ced0df798..bdeb8671857 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -596,7 +596,7 @@ ProcessGDBRemote::CheckForKernel (Stream *strm) DataExtractor data4 (buf, sizeof(buf), gdb_remote_arch.GetByteOrder(), 4); if (DoReadMemory (0xffff0110, buf, 4, error) == 4) { - uint32_t offset = 0; + lldb::offset_t offset = 0; kernel_addr = data4.GetU32(&offset); memory_module_sp = ReadModuleFromMemory (FileSpec("mach_kernel", false), kernel_addr, false, false); if (!memory_module_sp.get() @@ -616,7 +616,7 @@ ProcessGDBRemote::CheckForKernel (Stream *strm) DataExtractor data8 (buf, sizeof(buf), gdb_remote_arch.GetByteOrder(), 8); if (DoReadMemory (0xffffff8000002010ULL, buf, 8, error) == 8) { - uint32_t offset = 0; + lldb::offset_t offset = 0; kernel_addr = data8.GetU64(&offset); memory_module_sp = ReadModuleFromMemory (FileSpec("mach_kernel", false), kernel_addr, false, false); if (!memory_module_sp.get() @@ -3041,7 +3041,7 @@ ProcessGDBRemote::GetDispatchQueueNameForThread Error error; if (ReadMemory (m_dispatch_queue_offsets_addr, memory_buffer, sizeof(dispatch_queue_offsets), error) == sizeof(dispatch_queue_offsets)) { - uint32_t data_offset = 0; + lldb::offset_t data_offset = 0; if (data.GetU16(&data_offset, &dispatch_queue_offsets.dqo_version, sizeof(dispatch_queue_offsets)/sizeof(uint16_t))) { if (ReadMemory (thread_dispatch_qaddr, &memory_buffer, data.GetAddressByteSize(), error) == data.GetAddressByteSize()) |
