diff options
author | Eric Christopher <echristo@gmail.com> | 2013-08-30 17:50:57 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2013-08-30 17:50:57 +0000 |
commit | 8acb98b6d749803ab39d7ce981b27380381161d8 (patch) | |
tree | b117e80d50c7dfc11c068c6896f4d42a6384fe7e /lldb/source | |
parent | 9f75fa5db19458d80e43f48bf5e7706eb7102fae (diff) |
Fix a bunch of compile time warnings and a build failure on ubuntu.
Diffstat (limited to 'lldb/source')
-rw-r--r-- | lldb/source/Commands/CommandObjectPlatform.cpp | 1 | ||||
-rw-r--r-- | lldb/source/Core/ConstString.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Core/DataExtractor.cpp | 4 | ||||
-rw-r--r-- | lldb/source/Core/SourceManager.cpp | 6 | ||||
-rw-r--r-- | lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp | 2 | ||||
-rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h | 2 | ||||
-rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp | 8 |
7 files changed, 13 insertions, 14 deletions
diff --git a/lldb/source/Commands/CommandObjectPlatform.cpp b/lldb/source/Commands/CommandObjectPlatform.cpp index 09942f96753..28a9e1a19f7 100644 --- a/lldb/source/Commands/CommandObjectPlatform.cpp +++ b/lldb/source/Commands/CommandObjectPlatform.cpp @@ -2190,7 +2190,6 @@ RecurseCopy_Callback (void *baton, case FileSpec::eFileTypeInvalid: case FileSpec::eFileTypeOther: case FileSpec::eFileTypeUnknown: - default: rc_baton->error.SetErrorStringWithFormat("invalid file detected during copy: %s/%s", spec.GetDirectory().GetCString(), spec.GetFilename().GetCString()); return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out break; diff --git a/lldb/source/Core/ConstString.cpp b/lldb/source/Core/ConstString.cpp index 875169428d2..5bbcc5fe774 100644 --- a/lldb/source/Core/ConstString.cpp +++ b/lldb/source/Core/ConstString.cpp @@ -259,8 +259,8 @@ int ConstString::Compare (const ConstString& lhs, const ConstString& rhs) { // If the iterators are the same, this is the same string - register const char *lhs_cstr = lhs.m_string; - register const char *rhs_cstr = rhs.m_string; + const char *lhs_cstr = lhs.m_string; + const char *rhs_cstr = rhs.m_string; if (lhs_cstr == rhs_cstr) return 0; if (lhs_cstr && rhs_cstr) diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp index 518faeb71ea..8c0ee038567 100644 --- a/lldb/source/Core/DataExtractor.cpp +++ b/lldb/source/Core/DataExtractor.cpp @@ -1336,12 +1336,12 @@ static float half2float (uint16_t half) if( 0 == (v & 0x7c00)) { u.u = v & 0x80007FFFU; - return u.f * 0x1.0p125f; + return u.f * ldexpf(1, 125); } v <<= 13; u.u = v | 0x70000000U; - return u.f * 0x1.0p-112f; + return u.f * ldexpf(1, -112); } lldb::offset_t diff --git a/lldb/source/Core/SourceManager.cpp b/lldb/source/Core/SourceManager.cpp index 9f289348fd9..940034625c0 100644 --- a/lldb/source/Core/SourceManager.cpp +++ b/lldb/source/Core/SourceManager.cpp @@ -567,15 +567,15 @@ SourceManager::File::CalculateLineOffsets (uint32_t line) // Push a 1 at index zero to indicate the file has been completely indexed. m_offsets.push_back(UINT32_MAX); - register const char *s; + const char *s; for (s = start; s < end; ++s) { - register char curr_ch = *s; + char curr_ch = *s; if (is_newline_char (curr_ch)) { if (s + 1 < end) { - register char next_ch = s[1]; + char next_ch = s[1]; if (is_newline_char (next_ch)) { if (curr_ch != next_ch) diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp index 05f2d9b31e4..67cdbfd588a 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -55,7 +55,6 @@ GDBRemoteCommunicationClient::GDBRemoteCommunicationClient(bool is_platform) : m_supports_vCont_C (eLazyBoolCalculate), m_supports_vCont_s (eLazyBoolCalculate), m_supports_vCont_S (eLazyBoolCalculate), - m_supports_p (eLazyBoolCalculate), m_qHostInfo_is_valid (eLazyBoolCalculate), m_qProcessInfo_is_valid (eLazyBoolCalculate), m_supports_alloc_dealloc_memory (eLazyBoolCalculate), @@ -65,6 +64,7 @@ GDBRemoteCommunicationClient::GDBRemoteCommunicationClient(bool is_platform) : m_watchpoints_trigger_after_instruction(eLazyBoolCalculate), m_attach_or_wait_reply(eLazyBoolCalculate), m_prepare_for_reg_writing_reply (eLazyBoolCalculate), + m_supports_p (eLazyBoolCalculate), m_supports_qProcessInfoPID (true), m_supports_qfProcessInfo (true), m_supports_qUserName (true), diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h index 8310b1dda5f..40c8af3d6e8 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h @@ -28,7 +28,7 @@ public: dw_form_t get_form() const { return (dw_form_t)m_attr_form; } void get(dw_attr_t& attr, dw_form_t& form) const { - register uint32_t attr_form = m_attr_form; + uint32_t attr_form = m_attr_form; attr = attr_form >> 16; form = (dw_form_t)attr_form; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp index 03c12e366f9..7351f1d9509 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp @@ -151,8 +151,8 @@ DWARFDebugInfoEntry::FastExtract m_has_children = abbrevDecl->HasChildren(); // Skip all data in the .debug_info for the attributes const uint32_t numAttributes = abbrevDecl->NumAttributes(); - register uint32_t i; - register dw_form_t form; + uint32_t i; + dw_form_t form; for (i=0; i<numAttributes; ++i) { form = abbrevDecl->GetFormByIndexUnchecked(i); @@ -166,7 +166,7 @@ DWARFDebugInfoEntry::FastExtract do { form_is_indirect = false; - register uint32_t form_size = 0; + uint32_t form_size = 0; switch (form) { // Blocks if inlined data that have a length field and the data bytes @@ -332,7 +332,7 @@ DWARFDebugInfoEntry::Extract do { form_is_indirect = false; - register uint32_t form_size = 0; + uint32_t form_size = 0; switch (form) { // Blocks if inlined data that have a length field and the data bytes |