[Lldb-commits] [lldb] r243978 - [lldb-mi] Fix non-OS X builds.
Author: brucem Date: Tue Aug 4 08:25:23 2015 New Revision: 243978 URL: http://llvm.org/viewvc/llvm-project?rev=243978&view=rev Log: [lldb-mi] Fix non-OS X builds. Modified: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp Modified: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp?rev=243978&r1=243977&r2=243978&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp Tue Aug 4 08:25:23 2015 @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIOutOfBandRecord.h" #include "MICmnResources.h" ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r243975 - [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation.
Author: brucem Date: Tue Aug 4 08:12:31 2015 New Revision: 243975 URL: http://llvm.org/viewvc/llvm-project?rev=243975&view=rev Log: [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation. Summary: * Remove extraneous members that were just storing temporary values. * OutOfBand_e parameters don't need to be const as they are scalars. * Switch from a map with CMIUtilString values to using a mapping function. This uses a switch statement which will generate a warning if a new result class is added. * Make BuildAsyncRecord a static function rather than a private member function so that we can construct the result text correctly and avoid having extra stuff in the header. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11751 Modified: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h Modified: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp?rev=243975&r1=243974&r2=243975&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp Tue Aug 4 08:12:31 2015 @@ -12,38 +12,98 @@ #include "MICmnResources.h" // Instantiations: -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_MapOutOfBandToOutOfBandText = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "running"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "stopped"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "breakpoint-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "breakpoint-modified"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, ""}, // "" Meant to be empty -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "thread-group-added"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "thread-group-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "thread-group-removed"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "thread-group-started"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "thread-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "thread-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "thread-selected"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "library-loaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "library-unloaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, ""}}; -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_constMapAsyncRecordTextToToken = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, "@"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, "@"}}; +static const char * +MapOutOfBandToText(CMICmnMIOutOfBandRecord::OutOfBand_e veType) +{ +switch (veType) +{ +case CMICmnMIOutOfBandRecord::eOutOfBand_Running: +return "running"; +case CMICmnMIOutOfBandRecord::eOutOfBand_Stopped: +return "stopped"; +case CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated: +return "breakpoint-created"; +case CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified: +return "breakpoint-modified"; +case CMICmnMIOutOfBandRecord::eOutOfBand_Thread: +return ""; // "" Meant to be empty +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded: +return "thread-group-added"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited: +return "thread-group-exited"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved: +return "thread-group-removed"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted: +return "thread-group-started"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated: +return "thread-created"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadE
Re: [Lldb-commits] [PATCH] D11751: [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation.
This revision was automatically updated to reflect the committed changes. Closed by commit rL243975: [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11751?vs=31318&id=31322#toc Repository: rL LLVM http://reviews.llvm.org/D11751 Files: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h Index: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp === --- lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp +++ lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp @@ -12,38 +12,98 @@ #include "MICmnResources.h" // Instantiations: -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_MapOutOfBandToOutOfBandText = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "running"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "stopped"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "breakpoint-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "breakpoint-modified"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, ""}, // "" Meant to be empty -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "thread-group-added"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "thread-group-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "thread-group-removed"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "thread-group-started"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "thread-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "thread-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "thread-selected"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "library-loaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "library-unloaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, ""}}; -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_constMapAsyncRecordTextToToken = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, "@"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, "@"}}; +static const char * +MapOutOfBandToText(CMICmnMIOutOfBandRecord::OutOfBand_e veType) +{ +switch (veType) +{ +case CMICmnMIOutOfBandRecord::eOutOfBand_Running: +return "running"; +case CMICmnMIOutOfBandRecord::eOutOfBand_Stopped: +return "stopped"; +case CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated: +return "breakpoint-created"; +case CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified: +return "breakpoint-modified"; +case CMICmnMIOutOfBandRecord::eOutOfBand_Thread: +return ""; // "" Meant to be empty +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded: +return "thread-group-added"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited: +return "thread-group-exited"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved: +return "thread-group-removed"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted: +return "thread-group-started"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated: +return "thread-created"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited: +return "thread-exited"; +case CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected: +return "thread-selected"; +case CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded: +return "library-loaded"; +case CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded: +return "library-unloaded"; +case CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput: +return ""; +} +assert(false && "unknown CMICmnMIOutofBandRecord::OutOfBand_e"); +return NULL; +} + +static const char * +MapOutOfBandToToken(CMICmnMIOutOfBandRecord::OutOfBand_e veType) +{ +switch (veType) +{ +
Re: [Lldb-commits] [PATCH] D11751: [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation.
brucem updated this revision to Diff 31318. brucem added a comment. Update for formatting fix. http://reviews.llvm.org/D11751 Files: tools/lldb-mi/MICmnMIOutOfBandRecord.cpp tools/lldb-mi/MICmnMIOutOfBandRecord.h Index: tools/lldb-mi/MICmnMIOutOfBandRecord.h === --- tools/lldb-mi/MICmnMIOutOfBandRecord.h +++ tools/lldb-mi/MICmnMIOutOfBandRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -61,21 +58,15 @@ eOutOfBand_ThreadSelected, eOutOfBand_TargetModuleLoaded, eOutOfBand_TargetModuleUnloaded, -eOutOfBand_TargetStreamOutput, -eOutOfBand_count // Always the last one +eOutOfBand_TargetStreamOutput }; -// Typedefs: - public: -typedef std::map MapOutOfBandToOutOfBandText_t; -typedef std::map MapOutOfBandToToken_t; - // Methods: public: /* ctor */ CMICmnMIOutOfBandRecord(); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType, const CMICmnMIValueConst &vConst); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType, const CMICmnMIValueResult &vResult); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType, const CMICmnMIValueConst &vConst); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType, const CMICmnMIValueResult &vResult); // const CMIUtilString &GetString() const; void Add(const CMICmnMIValueResult &vResult); @@ -85,16 +76,7 @@ // From CMICmnBase /* dtor */ ~CMICmnMIOutOfBandRecord() override; -// Methods: - private: -void BuildAsyncRecord(); - // Attributes: private: -static MapOutOfBandToOutOfBandText_t ms_constMapOutOfBandToAsyncRecordText; -static MapOutOfBandToToken_t ms_constMapOutOfBandTextToToken; -// -OutOfBand_e m_eResultAsyncRecordClass; CMIUtilString m_strAsyncRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIOutOfBandRecord.cpp === --- tools/lldb-mi/MICmnMIOutOfBandRecord.cpp +++ tools/lldb-mi/MICmnMIOutOfBandRecord.cpp @@ -12,38 +12,98 @@ #include "MICmnResources.h" // Instantiations: -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_MapOutOfBandToOutOfBandText = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "running"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "stopped"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "breakpoint-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "breakpoint-modified"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, ""}, // "" Meant to be empty -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "thread-group-added"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "thread-group-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "thread-group-removed"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "thread-group-started"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "thread-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "thread-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "thread-selected"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "library-loaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "library-unloaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, ""}}; -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_constMapAsyncRecordTextToToken = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, "@"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, "@"}}; +static const char * +MapOutOfBandToText(CMICmnMIOutOfBandRecord::OutOfBand_e veType) +{ +switch (veType) +{ +case CMICmnMIOutOfBandRecord::eOutOfBand_Running: +re
[Lldb-commits] [PATCH] D11751: [lldb-mi] Simplify MICmnMIOutOfBandRecord implementation.
brucem created this revision. brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. * Remove extraneous members that were just storing temporary values. * OutOfBand_e parameters don't need to be const as they are scalars. * Switch from a map with CMIUtilString values to using a mapping function. This uses a switch statement which will generate a warning if a new result class is added. * Make BuildAsyncRecord a static function rather than a private member function so that we can construct the result text correctly and avoid having extra stuff in the header. http://reviews.llvm.org/D11751 Files: tools/lldb-mi/MICmnMIOutOfBandRecord.cpp tools/lldb-mi/MICmnMIOutOfBandRecord.h Index: tools/lldb-mi/MICmnMIOutOfBandRecord.h === --- tools/lldb-mi/MICmnMIOutOfBandRecord.h +++ tools/lldb-mi/MICmnMIOutOfBandRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -61,21 +58,15 @@ eOutOfBand_ThreadSelected, eOutOfBand_TargetModuleLoaded, eOutOfBand_TargetModuleUnloaded, -eOutOfBand_TargetStreamOutput, -eOutOfBand_count // Always the last one +eOutOfBand_TargetStreamOutput }; -// Typedefs: - public: -typedef std::map MapOutOfBandToOutOfBandText_t; -typedef std::map MapOutOfBandToToken_t; - // Methods: public: /* ctor */ CMICmnMIOutOfBandRecord(); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType, const CMICmnMIValueConst &vConst); -/* ctor */ CMICmnMIOutOfBandRecord(const OutOfBand_e veType, const CMICmnMIValueResult &vResult); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType, const CMICmnMIValueConst &vConst); +/* ctor */ CMICmnMIOutOfBandRecord(OutOfBand_e veType, const CMICmnMIValueResult &vResult); // const CMIUtilString &GetString() const; void Add(const CMICmnMIValueResult &vResult); @@ -85,16 +76,7 @@ // From CMICmnBase /* dtor */ ~CMICmnMIOutOfBandRecord() override; -// Methods: - private: -void BuildAsyncRecord(); - // Attributes: private: -static MapOutOfBandToOutOfBandText_t ms_constMapOutOfBandToAsyncRecordText; -static MapOutOfBandToToken_t ms_constMapOutOfBandTextToToken; -// -OutOfBand_e m_eResultAsyncRecordClass; CMIUtilString m_strAsyncRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIOutOfBandRecord.cpp === --- tools/lldb-mi/MICmnMIOutOfBandRecord.cpp +++ tools/lldb-mi/MICmnMIOutOfBandRecord.cpp @@ -12,38 +12,97 @@ #include "MICmnResources.h" // Instantiations: -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_MapOutOfBandToOutOfBandText = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "running"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "stopped"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "breakpoint-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "breakpoint-modified"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, ""}, // "" Meant to be empty -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "thread-group-added"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "thread-group-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "thread-group-removed"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "thread-group-started"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "thread-created"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadExited, "thread-exited"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadSelected, "thread-selected"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleLoaded, "library-loaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetModuleUnloaded, "library-unloaded"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_TargetStreamOutput, ""}}; -CMICmnMIOutOfBandRecord::MapOutOfBandToOutOfBandText_t ms_constMapAsyncRecordTextToToken = { -{CMICmnMIOutOfBandRecord::eOutOfBand_Running, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Stopped, "*"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointCreated, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_BreakPointModified, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_Thread, "@"}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupAdded, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupExited, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupRemoved, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadGroupStarted, "="}, -{CMICmnMIOutOfBandRecord::eOutOfBand_ThreadCreated, "="}, -{CMICmnMIOutO
Re: [Lldb-commits] [PATCH] D11745: [debugserver] Fix "control may reach end of non-void function" warnings.
This revision was automatically updated to reflect the committed changes. Closed by commit rL243953: [debugserver] Fix "control may reach end of non-void function" warnings. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11745?vs=31293&id=31296#toc Repository: rL LLVM http://reviews.llvm.org/D11745 Files: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Index: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp === --- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -680,9 +680,9 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } void DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) @@ -794,9 +794,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp === --- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -734,10 +734,11 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } + void DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) { @@ -849,9 +850,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp === --- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -680,9 +680,9 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } void DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) @@ -794,9 +794,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp === --- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -734,10 +734,11 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } + void DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) { @@ -849,9 +850,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r243953 - [debugserver] Fix "control may reach end of non-void function" warnings.
Author: brucem Date: Mon Aug 3 23:01:16 2015 New Revision: 243953 URL: http://llvm.org/viewvc/llvm-project?rev=243953&view=rev Log: [debugserver] Fix "control may reach end of non-void function" warnings. Reviewers: clayborg, jingham Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11745 Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Modified: lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp?rev=243953&r1=243952&r2=243953&view=diff == --- lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp Mon Aug 3 23:01:16 2015 @@ -734,10 +734,11 @@ size_and_rw_bits(nub_size_t size, bool r return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } + void DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) { @@ -849,9 +850,9 @@ DNBArchImplI386::GetWatchAddress(const D return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Modified: lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp?rev=243953&r1=243952&r2=243953&view=diff == --- lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Mon Aug 3 23:01:16 2015 @@ -680,9 +680,9 @@ size_and_rw_bits(nub_size_t size, bool r return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } void DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) @@ -794,9 +794,9 @@ DNBArchImplX86_64::GetWatchAddress(const return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11745: [debugserver] Fix "control may reach end of non-void function" warnings.
brucem created this revision. brucem added reviewers: clayborg, jingham. brucem added a subscriber: lldb-commits. http://reviews.llvm.org/D11745 Files: tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Index: tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp === --- tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -680,9 +680,9 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } void DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) @@ -794,9 +794,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp === --- tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -734,10 +734,11 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } + void DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) { @@ -849,9 +850,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp === --- tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -680,9 +680,9 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } void DNBArchImplX86_64::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) @@ -794,9 +794,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool Index: tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp === --- tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -734,10 +734,11 @@ return (0x3 << 2) | rw; case 8: return (0x2 << 2) | rw; -default: -assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); } +assert(0 && "invalid size, must be one of 1, 2, 4, or 8"); +return 0; } + void DNBArchImplI386::SetWatchpoint(DBG &debug_state, uint32_t hw_index, nub_addr_t addr, nub_size_t size, bool read, bool write) { @@ -849,9 +850,9 @@ return debug_state.__dr2; case 3: return debug_state.__dr3; -default: -assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); } +assert(0 && "invalid hardware register index, must be one of 0, 1, 2, or 3"); +return 0; } bool ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r243941 - Fix cmake build on non-Windows platforms.
Author: brucem Date: Mon Aug 3 21:41:49 2015 New Revision: 243941 URL: http://llvm.org/viewvc/llvm-project?rev=243941&view=rev Log: Fix cmake build on non-Windows platforms. r243914 introduced a change which mistakenly tried to build the Windows minidump code on all platforms rather than only on Windows. Modified: lldb/trunk/source/Plugins/Process/CMakeLists.txt Modified: lldb/trunk/source/Plugins/Process/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/CMakeLists.txt?rev=243941&r1=243940&r2=243941&view=diff == --- lldb/trunk/source/Plugins/Process/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/CMakeLists.txt Mon Aug 3 21:41:49 2015 @@ -6,6 +6,7 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "FreeB add_subdirectory(POSIX) elseif (CMAKE_SYSTEM_NAME MATCHES "Windows") add_subdirectory(Windows) + add_subdirectory(win-minidump) elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin") add_subdirectory(MacOSX-Kernel) endif() @@ -13,4 +14,3 @@ add_subdirectory(gdb-remote) add_subdirectory(Utility) add_subdirectory(mach-core) add_subdirectory(elf-core) -add_subdirectory(win-minidump) ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11717: Bug 24332 - Fix the build of lldb under GNU/Linux when using autotools
brucem added a comment. I don't have the authority to approve something to be committed afaik, but hopefully my comments here are useful. Comment at: source/Plugins/Makefile:45 @@ -44,2 +44,3 @@ PARALLEL_DIRS += JITLoader/GDB +PARALLEL_DIRS += ScriptInterpreter/Python ScriptInterpreter/None endif I'm not an expert in the autotools build system, but it seems likely that the ScriptInterpreters could be added to the global list of them rather than the per-OS ones. (This differs from what I wrote in the bug probably.) It might be worth checking with Keno Fischer as well as he likes to have a build that doesn't use Python and he might have some feedback on this. Comment at: source/Plugins/Makefile:52 @@ -50,2 +51,3 @@ PARALLEL_DIRS += JITLoader/GDB +PARALLEL_DIRS += ScriptInterpreter/Python ScriptInterpreter/None endif As above. Repository: rL LLVM http://reviews.llvm.org/D11717 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11451: Add UNUSED_IF_ASSERT_DISABLED and apply it.
This revision was automatically updated to reflect the committed changes. Closed by commit rL243074: Add UNUSED_IF_ASSERT_DISABLED and apply it. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11451?vs=30457&id=30548#toc Repository: rL LLVM http://reviews.llvm.org/D11451 Files: lldb/trunk/include/lldb/lldb-defines.h lldb/trunk/source/Host/posix/MainLoopPosix.cpp lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp lldb/trunk/source/Symbol/ClangASTImporter.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/tools/debugserver/source/DNB.cpp lldb/trunk/tools/debugserver/source/DNBDefs.h lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Index: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp === --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp @@ -133,7 +133,7 @@ int platform_port; std::string platform_path; bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path); -(void)ok; +UNUSED_IF_ASSERT_DISABLED(ok); assert(ok); Error error = StartDebugserverProcess ( platform_ip.c_str(), Index: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp === --- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp +++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp @@ -718,7 +718,7 @@ const size_t count_v13 = count_v11 + addr_size + // sharedCacheSlide sizeof (uuid_t);// sharedCacheUUID -(void) count_v13; // Avoid warnings when assertions are off. +UNUSED_IF_ASSERT_DISABLED(count_v13); assert (sizeof (buf) >= count_v13); Error error; Index: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp === --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp @@ -44,7 +44,7 @@ while (type.HasAtLeast(1) && type.Peek() != '"') buffer.Printf("%c",type.Next()); StringLexer::Character next = type.Next(); -(void) next; // Avoid warnings when assertions are off. +UNUSED_IF_ASSERT_DISABLED(next); assert (next == '"'); return buffer.GetString(); } Index: lldb/trunk/source/Host/posix/MainLoopPosix.cpp === --- lldb/trunk/source/Host/posix/MainLoopPosix.cpp +++ lldb/trunk/source/Host/posix/MainLoopPosix.cpp @@ -97,7 +97,7 @@ MainLoopPosix::UnregisterReadObject(IOObject::WaitableHandle handle) { bool erased = m_read_fds.erase(handle); -(void) erased; +UNUSED_IF_ASSERT_DISABLED(erased); assert(erased); } Index: lldb/trunk/source/Symbol/ClangASTImporter.cpp === --- lldb/trunk/source/Symbol/ClangASTImporter.cpp +++ lldb/trunk/source/Symbol/ClangASTImporter.cpp @@ -623,7 +623,7 @@ m_decls_to_deport->erase(decl); DeclOrigin &origin = to_context_md->m_origins[decl]; -(void)origin; +UNUSED_IF_ASSERT_DISABLED(origin); assert (origin.ctx == m_source_ctx);// otherwise we should never have added this // because it doesn't need to be deported Index: lldb/trunk/source/Interpreter/CommandInterpreter.cpp === --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp @@ -511,8 +511,7 @@ char buffer[1024]; int num_printed = snprintf(buffer, 1024, "%s %s", break_regexes[i][1], "-o"); assert (num_printed < 1024); - // Quiet unused variable warning for release builds. - (void) num_printed; +UNUSED_IF_ASSERT_DISABLED(nu
[Lldb-commits] [lldb] r243074 - Add UNUSED_IF_ASSERT_DISABLED and apply it.
Author: brucem Date: Thu Jul 23 19:23:29 2015 New Revision: 243074 URL: http://llvm.org/viewvc/llvm-project?rev=243074&view=rev Log: Add UNUSED_IF_ASSERT_DISABLED and apply it. Summary: This replaces (void)x; usages where they x was subsequently involved in an assertion with this macro to make the intent more clear. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11451 Modified: lldb/trunk/include/lldb/lldb-defines.h lldb/trunk/source/Host/posix/MainLoopPosix.cpp lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp lldb/trunk/source/Symbol/ClangASTImporter.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/tools/debugserver/source/DNB.cpp lldb/trunk/tools/debugserver/source/DNBDefs.h lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Modified: lldb/trunk/include/lldb/lldb-defines.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-defines.h?rev=243074&r1=243073&r2=243074&view=diff == --- lldb/trunk/include/lldb/lldb-defines.h (original) +++ lldb/trunk/include/lldb/lldb-defines.h Thu Jul 23 19:23:29 2015 @@ -137,6 +137,8 @@ #define __attribute__(X) #endif +#define UNUSED_IF_ASSERT_DISABLED(x) ((void)(x)) + #if defined(__cplusplus) //-- Modified: lldb/trunk/source/Host/posix/MainLoopPosix.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/MainLoopPosix.cpp?rev=243074&r1=243073&r2=243074&view=diff == --- lldb/trunk/source/Host/posix/MainLoopPosix.cpp (original) +++ lldb/trunk/source/Host/posix/MainLoopPosix.cpp Thu Jul 23 19:23:29 2015 @@ -97,7 +97,7 @@ void MainLoopPosix::UnregisterReadObject(IOObject::WaitableHandle handle) { bool erased = m_read_fds.erase(handle); -(void) erased; +UNUSED_IF_ASSERT_DISABLED(erased); assert(erased); } Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=243074&r1=243073&r2=243074&view=diff == --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Thu Jul 23 19:23:29 2015 @@ -511,8 +511,7 @@ CommandInterpreter::LoadCommandDictionar char buffer[1024]; int num_printed = snprintf(buffer, 1024, "%s %s", break_regexes[i][1], "-o"); assert (num_printed < 1024); - // Quiet unused variable warning for release builds. - (void) num_printed; +UNUSED_IF_ASSERT_DISABLED(num_printed); success = tbreak_regex_cmd_ap->AddRegexCommand (break_regexes[i][0], buffer); if (!success) break; Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=243074&r1=243073&r2=243074&view=diff == --- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original) +++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Thu Jul 23 19:23:29 2015 @@ -718,7 +718,7 @@ DynamicLoaderMacOSXDYLD::ReadAllImageInf const size_t count_v13 = count_v11 + addr_size + // sharedCacheSlide sizeof (uuid_t);// sharedCacheUUID -(void) count_v13; // Avoid warnings when assertions are off. +UNUSED_IF_ASSERT_DISABLED(count_v13); assert (sizeof (buf) >= count_v13); Error error; Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp?rev=243074&r1=243073&r2=243074&view=diff == --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEn
[Lldb-commits] [lldb] r243072 - Fix Mac OS X build, debugserver version handling.
Author: brucem Date: Thu Jul 23 19:13:45 2015 New Revision: 243072 URL: http://llvm.org/viewvc/llvm-project?rev=243072&view=rev Log: Fix Mac OS X build, debugserver version handling. Summary: No longer rely on cmake to set DEBUGSERVER_VERSION_STR, but now generate the _vers.c file like xcode does and include the generated file into the build on Mac OS X. This fixes the cmake Mac OS X build after an earlier change by Jason Molenda. Reviewers: clayborg, jasonmolenda Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11450 Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=243072&r1=243071&r2=243072&view=diff == --- lldb/trunk/tools/debugserver/source/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt Thu Jul 23 19:13:45 2015 @@ -34,9 +34,11 @@ if (CXX_SUPPORTS_NO_EXTENDED_OFFSETOF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( +-DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" +) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} Modified: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt?rev=243072&r1=243071&r2=243072&view=diff == --- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Thu Jul 23 19:13:45 2015 @@ -18,6 +18,14 @@ add_custom_command(OUTPUT ${generated_ma DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ add_lldb_executable(debugserver MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11450: Fix Mac OS X build, debugserver version handling.
This revision was automatically updated to reflect the committed changes. Closed by commit rL243072: Fix Mac OS X build, debugserver version handling. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11450?vs=30455&id=30547#toc Repository: rL LLVM http://reviews.llvm.org/D11450 Files: lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Index: lldb/trunk/tools/debugserver/source/CMakeLists.txt === --- lldb/trunk/tools/debugserver/source/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt @@ -34,9 +34,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( +-DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" +) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} Index: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt === --- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt @@ -18,6 +18,14 @@ DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( Index: lldb/trunk/tools/debugserver/source/CMakeLists.txt === --- lldb/trunk/tools/debugserver/source/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt @@ -34,9 +34,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( +-DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" +) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} Index: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt === --- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt @@ -18,6 +18,14 @@ DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r242996 - [lldb-mi] Remove unwanted comment blocks.
Author: brucem Date: Thu Jul 23 04:04:56 2015 New Revision: 242996 URL: http://llvm.org/viewvc/llvm-project?rev=242996&view=rev Log: [lldb-mi] Remove unwanted comment blocks. Summary: This removes Authors:, Gotchas:, Changes: and Copyright:. It leaves a couple of Gotcha: blocks that were not empty. Reviewers: abidh, ki.stfu, domipheus Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11452 Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgSet.h lldb/trunk/tools/lldb-mi/MICmdArgValBase.h lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.h lldb/trunk/tools/lldb-mi/MICmdArgValListBase.h lldb/trunk/tools/lldb-mi/MICmdArgValListOfN.h lldb/trunk/tools/lldb-mi/MICmdArgValNumber.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.h lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MICmdArgValThreadGrp.h lldb/trunk/tools/lldb-mi/MICmdBase.h lldb/trunk/tools/lldb-mi/MICmdCmd.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.h lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.h lldb/trunk/tools/lldb-mi/MICmdCmdFile.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbThread.h lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.h lldb/trunk/tools/lldb-mi/MICmdCmdStack.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportList.h lldb/trunk/tools/lldb-mi/MICmdCmdTarget.h lldb/trunk/tools/lldb-mi/MICmdCmdThread.h lldb/trunk/tools/lldb-mi/MICmdCmdTrace.h lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdCommands.h lldb/trunk/tools/lldb-mi/MICmdData.h lldb/trunk/tools/lldb-mi/MICmdFactory.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.h lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmdMgr.h lldb/trunk/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h lldb/trunk/tools/lldb-mi/MICmnBase.h lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.h lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.h lldb/trunk/tools/lldb-mi/MICmnLog.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h lldb/trunk/tools/lldb-mi/MICmnMIValue.h lldb/trunk/tools/lldb-mi/MICmnMIValueConst.h lldb/trunk/tools/lldb-mi/MICmnMIValueList.h lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.h lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStderr.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MICmnStreamStdout.h lldb/trunk/tools/lldb-mi/MICmnThreadMgrStd.h lldb/trunk/tools/lldb-mi/MIDriver.h lldb/trunk/tools/lldb-mi/MIDriverBase.h lldb/trunk/tools/lldb-mi/MIDriverMgr.h lldb/trunk/tools/lldb-mi/MIUtilDateTimeStd.h lldb/trunk/tools/lldb-mi/MIUtilDebug.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilMapIdToVariant.h lldb/trunk/tools/lldb-mi/MIUtilSingletonBase.h lldb/trunk/tools/lldb-mi/MIUtilSingletonHelper.h lldb/trunk/tools/lldb-mi/MIUtilString.h lldb/trunk/tools/lldb-mi/MIUtilSystemLinux.h lldb/trunk/tools/lldb-mi/MIUtilSystemOsx.h lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.h lldb/trunk/tools/lldb-mi/MIUtilThreadBaseStd.cpp lldb/trunk/tools/lldb-mi/MIUtilThreadBaseStd.h lldb/trunk/tools/lldb-mi/MIUtilVariant.cpp lldb/trunk/tools/lldb-mi/MIUtilVariant.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.h?rev=242996&r1=242995&r2=242996&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h Thu Jul 23 04:04:56 2015 @@ -16,9 +16,6 @@ // Details: MI common code class. Command arguments and options string. Holds // the context string. // Based on the Interpreter pattern. -// Gotchas: None. -// Authors: Illya Rudkin 14/04/2014. -// Changes: None. //-- class CMICmdArgContext { Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.h?rev=242996&r1=242995&r2=242996&view=diff
Re: [Lldb-commits] [PATCH] D11452: [lldb-mi] Remove unwanted comment blocks.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242996: [lldb-mi] Remove unwanted comment blocks. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11452?vs=30459&id=30463#toc Repository: rL LLVM http://reviews.llvm.org/D11452 Files: lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgSet.h lldb/trunk/tools/lldb-mi/MICmdArgValBase.h lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.h lldb/trunk/tools/lldb-mi/MICmdArgValListBase.h lldb/trunk/tools/lldb-mi/MICmdArgValListOfN.h lldb/trunk/tools/lldb-mi/MICmdArgValNumber.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.h lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MICmdArgValThreadGrp.h lldb/trunk/tools/lldb-mi/MICmdBase.h lldb/trunk/tools/lldb-mi/MICmdCmd.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.h lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.h lldb/trunk/tools/lldb-mi/MICmdCmdFile.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbThread.h lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.h lldb/trunk/tools/lldb-mi/MICmdCmdStack.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportList.h lldb/trunk/tools/lldb-mi/MICmdCmdTarget.h lldb/trunk/tools/lldb-mi/MICmdCmdThread.h lldb/trunk/tools/lldb-mi/MICmdCmdTrace.h lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdCommands.h lldb/trunk/tools/lldb-mi/MICmdData.h lldb/trunk/tools/lldb-mi/MICmdFactory.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.h lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmdMgr.h lldb/trunk/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h lldb/trunk/tools/lldb-mi/MICmnBase.h lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.h lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.h lldb/trunk/tools/lldb-mi/MICmnLog.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h lldb/trunk/tools/lldb-mi/MICmnMIValue.h lldb/trunk/tools/lldb-mi/MICmnMIValueConst.h lldb/trunk/tools/lldb-mi/MICmnMIValueList.h lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.h lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStderr.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MICmnStreamStdout.h lldb/trunk/tools/lldb-mi/MICmnThreadMgrStd.h lldb/trunk/tools/lldb-mi/MIDriver.h lldb/trunk/tools/lldb-mi/MIDriverBase.h lldb/trunk/tools/lldb-mi/MIDriverMgr.h lldb/trunk/tools/lldb-mi/MIUtilDateTimeStd.h lldb/trunk/tools/lldb-mi/MIUtilDebug.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilMapIdToVariant.h lldb/trunk/tools/lldb-mi/MIUtilSingletonBase.h lldb/trunk/tools/lldb-mi/MIUtilSingletonHelper.h lldb/trunk/tools/lldb-mi/MIUtilString.h lldb/trunk/tools/lldb-mi/MIUtilSystemLinux.h lldb/trunk/tools/lldb-mi/MIUtilSystemOsx.h lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.h lldb/trunk/tools/lldb-mi/MIUtilThreadBaseStd.cpp lldb/trunk/tools/lldb-mi/MIUtilThreadBaseStd.h lldb/trunk/tools/lldb-mi/MIUtilVariant.cpp lldb/trunk/tools/lldb-mi/MIUtilVariant.h Index: lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h === --- lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h +++ lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h @@ -37,9 +37,6 @@ // // More information see: // http://ftp.gnu.org/old-gnu/Manuals/gdb-5.1.1/html_chapter/gdb_22.html// -// Gotchas: None. -// Authors: Illya Rudkin 24/02/2014. -// Changes: None. //-- class CMICmnMIOutOfBandRecord : public CMICmnBase { Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h @@ -38,9 +38,6 @@ // retrieved by the same or other subsequent commands. // It primarily holds LLDB type objects. // A singleton class. -// Gotchas: None. -// Authors: Illya Rudkin 04/03/2014. -// Changes: None. //-- class CMICmnLLDBDebugSessionInfo : public CMICmnBase, public MI::ISingleton { Index: lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h ===
[Lldb-commits] [PATCH] D11452: [lldb-mi] Remove unwanted comment blocks.
brucem created this revision. brucem added reviewers: abidh, ki.stfu, domipheus. brucem added a subscriber: lldb-commits. This removes Authors:, Gotchas:, Changes: and Copyright:. It leaves a couple of Gotcha: blocks that were not empty. http://reviews.llvm.org/D11452 Files: tools/lldb-mi/MICmdArgContext.h tools/lldb-mi/MICmdArgSet.h tools/lldb-mi/MICmdArgValBase.h tools/lldb-mi/MICmdArgValConsume.h tools/lldb-mi/MICmdArgValFile.h tools/lldb-mi/MICmdArgValListBase.h tools/lldb-mi/MICmdArgValListOfN.h tools/lldb-mi/MICmdArgValNumber.h tools/lldb-mi/MICmdArgValOptionLong.h tools/lldb-mi/MICmdArgValOptionShort.h tools/lldb-mi/MICmdArgValString.h tools/lldb-mi/MICmdArgValThreadGrp.h tools/lldb-mi/MICmdBase.h tools/lldb-mi/MICmdCmd.h tools/lldb-mi/MICmdCmdBreak.h tools/lldb-mi/MICmdCmdData.h tools/lldb-mi/MICmdCmdEnviro.h tools/lldb-mi/MICmdCmdExec.h tools/lldb-mi/MICmdCmdFile.h tools/lldb-mi/MICmdCmdGdbInfo.h tools/lldb-mi/MICmdCmdGdbSet.h tools/lldb-mi/MICmdCmdGdbThread.h tools/lldb-mi/MICmdCmdMiscellanous.h tools/lldb-mi/MICmdCmdStack.h tools/lldb-mi/MICmdCmdSupportInfo.h tools/lldb-mi/MICmdCmdSupportList.h tools/lldb-mi/MICmdCmdTarget.h tools/lldb-mi/MICmdCmdThread.h tools/lldb-mi/MICmdCmdTrace.h tools/lldb-mi/MICmdCmdVar.h tools/lldb-mi/MICmdCommands.h tools/lldb-mi/MICmdData.h tools/lldb-mi/MICmdFactory.h tools/lldb-mi/MICmdInterpreter.h tools/lldb-mi/MICmdInvoker.h tools/lldb-mi/MICmdMgr.h tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h tools/lldb-mi/MICmnBase.h tools/lldb-mi/MICmnLLDBBroadcaster.h tools/lldb-mi/MICmnLLDBDebugSessionInfo.h tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h tools/lldb-mi/MICmnLLDBDebugger.h tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h tools/lldb-mi/MICmnLLDBProxySBValue.h tools/lldb-mi/MICmnLLDBUtilSBValue.h tools/lldb-mi/MICmnLog.h tools/lldb-mi/MICmnLogMediumFile.h tools/lldb-mi/MICmnMIOutOfBandRecord.h tools/lldb-mi/MICmnMIResultRecord.h tools/lldb-mi/MICmnMIValue.h tools/lldb-mi/MICmnMIValueConst.h tools/lldb-mi/MICmnMIValueList.h tools/lldb-mi/MICmnMIValueResult.h tools/lldb-mi/MICmnMIValueTuple.h tools/lldb-mi/MICmnResources.h tools/lldb-mi/MICmnStreamStderr.h tools/lldb-mi/MICmnStreamStdin.h tools/lldb-mi/MICmnStreamStdout.h tools/lldb-mi/MICmnThreadMgrStd.h tools/lldb-mi/MIDriver.h tools/lldb-mi/MIDriverBase.h tools/lldb-mi/MIDriverMgr.h tools/lldb-mi/MIUtilDateTimeStd.h tools/lldb-mi/MIUtilDebug.h tools/lldb-mi/MIUtilFileStd.h tools/lldb-mi/MIUtilMapIdToVariant.h tools/lldb-mi/MIUtilSingletonBase.h tools/lldb-mi/MIUtilSingletonHelper.h tools/lldb-mi/MIUtilString.h tools/lldb-mi/MIUtilSystemLinux.h tools/lldb-mi/MIUtilSystemOsx.h tools/lldb-mi/MIUtilSystemWindows.h tools/lldb-mi/MIUtilThreadBaseStd.cpp tools/lldb-mi/MIUtilThreadBaseStd.h tools/lldb-mi/MIUtilVariant.cpp tools/lldb-mi/MIUtilVariant.h Index: tools/lldb-mi/MIUtilVariant.h === --- tools/lldb-mi/MIUtilVariant.h +++ tools/lldb-mi/MIUtilVariant.h @@ -6,8 +6,6 @@ // License. See LICENSE.TXT for details. // //===--===// -// Copyright: None. -//-- #pragma once @@ -20,9 +18,6 @@ // data object specified is made and stored in *this wrapper. When the // *this object is destroyed the data object hold within calls its // destructor should it have one. -// Gotchas: None. -// Authors: Illya Rudkin 18/06/2014. -// Changes: None. //-- class CMIUtilVariant { Index: tools/lldb-mi/MIUtilVariant.cpp === --- tools/lldb-mi/MIUtilVariant.cpp +++ tools/lldb-mi/MIUtilVariant.cpp @@ -6,8 +6,6 @@ // License. See LICENSE.TXT for details. // //===--===// -// Copyright: None. -//-- // In-house headers: #include "MIUtilVariant.h" Index: tools/lldb-mi/MIUtilThreadBaseStd.h === --- tools/lldb-mi/MIUtilThreadBaseStd.h +++ tools/lldb-mi/MIUtilThreadBaseStd.h @@ -6,9 +6,6 @@ // License. See LICENSE.TXT for details. // //===--===// -// -// Copyright: None. -//-- #pragma once @@ -26,9 +23,6 @@ //++ // Details: MI common code utility class. Handle thread mutual exclusion. // Embed Mutexes in your Active Object and then use them through Locks. -// Gotchas: None. -// Authors: Aidan Dodds 10/03/2014. -// Changes: None. //-- class CMIUtilThreadMutex { @@ -55,9 +49,6 @@ //++ // Details: MI common code utility class. Thread object. -// Gotchas: None. -// Authors: Aidan Dodds 10
[Lldb-commits] [PATCH] D11451: Add UNUSED_IF_ASSERT_DISABLED and apply it.
brucem created this revision. brucem added a reviewer: clayborg. brucem added a subscriber: lldb-commits. This replaces (void)x; usages where they x was subsequently involved in an assertion with this macro to make the intent more clear. http://reviews.llvm.org/D11451 Files: include/lldb/lldb-defines.h source/Host/posix/MainLoopPosix.cpp source/Interpreter/CommandInterpreter.cpp source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeEncodingParser.cpp source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp source/Symbol/ClangASTImporter.cpp source/Target/Process.cpp tools/debugserver/source/DNB.cpp tools/debugserver/source/DNBDefs.h tools/debugserver/source/MacOSX/MachProcess.mm tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp Index: tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp === --- tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp +++ tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp @@ -2089,7 +2089,7 @@ // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } @@ -2177,7 +2177,7 @@ // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); kern_return_t kret; Index: tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp === --- tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp +++ tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp @@ -1703,7 +1703,7 @@ // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } } @@ -1789,7 +1789,7 @@ // make sure we end up with exactly what we think we should have size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); kern_return_t kret; if ((kret = SetGPRState()) != KERN_SUCCESS) Index: tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp === --- tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp +++ tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp @@ -1995,7 +1995,7 @@ p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } DNBLogThreadedIf (LOG_THREAD, "DNBArchMachARM64::GetRegisterContext (buf = %p, len = %zu) => %zu", buf, buf_len, size); @@ -2028,7 +2028,7 @@ p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); SetGPRState(); SetVFPState(); Index: tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp === --- tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp +++ tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp @@ -2060,7 +2060,7 @@ p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); } @@ -2094,7 +2094,7 @@ p += sizeof(m_state.context.exc); size_t bytes_written = p - (uint8_t *)buf; -(void)bytes_written; +UNUSED_IF_ASSERT_DISABLED(bytes_written); assert (bytes_written == size); if (SetGPRState() | SetVFPState() | SetEXCState()) Index: tools/debugserver/source/MacOSX/MachProcess.mm === --- tools/debugserver/source/MacOSX/MachProcess.mm +++ tools/debugserver/source/MacOSX/MachProcess.mm @@ -1032,7 +1032,7 @@ DNBBreakpoint *bp = bps[i]; const bool intersects = bp->IntersectsRange(addr, size, &intersect_addr, &intersect_
Re: [Lldb-commits] [PATCH] D11450: Fix Mac OS X build, debugserver version handling.
brucem added a comment. Related to this are changes that were made by Todd Fiala last year to not use the version number as it might not be a valid float: https://github.com/llvm-mirror/lldb/commit/b55b00cb5dac8db75d77868175e2868301ecfd7f And some changes to support using a pre-processor define by Daniel Malea in 2013: https://github.com/llvm-mirror/lldb/commit/49dd98a03a868087ce1a292a201618e04cad5e8d It seems likely that something can be further simplified here. http://reviews.llvm.org/D11450 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11450: Fix Mac OS X build, debugserver version handling.
brucem created this revision. brucem added reviewers: clayborg, jasonmolenda. brucem added a subscriber: lldb-commits. No longer rely on cmake to set DEBUGSERVER_VERSION_STR, but now generate the _vers.c file like xcode does and include the generated file into the build on Mac OS X. This fixes the cmake Mac OS X build after an earlier change by Jason Molenda. http://reviews.llvm.org/D11450 Files: tools/debugserver/source/CMakeLists.txt tools/debugserver/source/MacOSX/CMakeLists.txt Index: tools/debugserver/source/MacOSX/CMakeLists.txt === --- tools/debugserver/source/MacOSX/CMakeLists.txt +++ tools/debugserver/source/MacOSX/CMakeLists.txt @@ -18,6 +18,14 @@ DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( Index: tools/debugserver/source/CMakeLists.txt === --- tools/debugserver/source/CMakeLists.txt +++ tools/debugserver/source/CMakeLists.txt @@ -34,9 +34,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( +-DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" +) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} Index: tools/debugserver/source/MacOSX/CMakeLists.txt === --- tools/debugserver/source/MacOSX/CMakeLists.txt +++ tools/debugserver/source/MacOSX/CMakeLists.txt @@ -18,6 +18,14 @@ DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( Index: tools/debugserver/source/CMakeLists.txt === --- tools/debugserver/source/CMakeLists.txt +++ tools/debugserver/source/CMakeLists.txt @@ -34,9 +34,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( +-DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" +) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11404: Fix warnings.
brucem added a comment. I saw your comment after I had done the merge and was doing the build + push. I'll revisit this soon with a comprehensive way to address this. Repository: rL LLVM http://reviews.llvm.org/D11404 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11404: Fix warnings.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242913: Fix warnings. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11404?vs=30315&id=30364#toc Repository: rL LLVM http://reviews.llvm.org/D11404 Files: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp lldb/trunk/source/Symbol/ClangASTImporter.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/DNB.cpp lldb/trunk/tools/debugserver/source/DNBArch.cpp lldb/trunk/tools/debugserver/source/DNBArch.h lldb/trunk/tools/debugserver/source/DNBDataRef.cpp lldb/trunk/tools/debugserver/source/DNBRegisterInfo.cpp lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm lldb/trunk/tools/debugserver/source/MacOSX/MachTask.mm lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h lldb/trunk/tools/debugserver/source/RNBRemote.cpp lldb/trunk/tools/debugserver/source/RNBRemote.h lldb/trunk/tools/debugserver/source/RNBServices.cpp lldb/trunk/tools/debugserver/source/RNBSocket.cpp lldb/trunk/tools/debugserver/source/libdebugserver.cpp Index: lldb/trunk/source/Symbol/ClangASTImporter.cpp === --- lldb/trunk/source/Symbol/ClangASTImporter.cpp +++ lldb/trunk/source/Symbol/ClangASTImporter.cpp @@ -623,6 +623,7 @@ m_decls_to_deport->erase(decl); DeclOrigin &origin = to_context_md->m_origins[decl]; +(void)origin; assert (origin.ctx == m_source_ctx);// otherwise we should never have added this // because it doesn't need to be deported Index: lldb/trunk/source/Target/Process.cpp === --- lldb/trunk/source/Target/Process.cpp +++ lldb/trunk/source/Target/Process.cpp @@ -2843,6 +2843,7 @@ size_t intersect_size; size_t opcode_offset; const bool intersects = bp->IntersectsRange(addr, size, &intersect_addr, &intersect_size, &opcode_offset); +(void)intersects; assert(intersects); assert(addr <= intersect_addr && intersect_addr < addr + size); assert(addr < intersect_addr + intersect_size && intersect_addr + intersect_size <= addr + size); Index: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp === --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp @@ -133,6 +133,7 @@ int platform_port; std::string platform_path; bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path); +(void)ok; assert(ok); Error error = StartDebugserverProcess ( platform_ip.c_str(), Index: lldb/trunk/tools/debugserver/source/DNBArch.h === --- lldb/trunk/tools/debugserver/source/DNBArch.h +++ lldb/trunk/tools/debugserver/source/DNBArch.h @@ -27,7 +27,7 @@ typedef DNBArchProtocol * (* DNBArchCallbackCreate)(MachThread *thread); typedef const DNBRegisterSetInfo * (* DNBArchCallbackGetRegisterSetInfo)(nub_size_t *num_reg_sets); -typedef const uint8_t * const (* DNBArchCallbackGetBreakpointOpcode)(nub_size_t byte_size); +typedef const uint8_t * (* DNBArchCallbackGetBreakpointOpcode)(nub_size_t byte_size); typedef struct DNBArchPluginInfoTag { @@ -49,7 +49,7 @@ static const DNBRegisterSetInfo * GetRegisterSetInfo (nub_size_t *num_reg_sets); -static const uint8_t * const +static const uint8_t * GetBreakpointOpcode (nub_size_t byte_size); static void @@ -94,7 +94,7 @@ virtual uint32_tEnableHardwareWatchpoint (nub_addr_t addr, nub_size_t size, bool read, bool write, bool also_
[Lldb-commits] [lldb] r242913 - Fix warnings.
Author: brucem Date: Wed Jul 22 12:31:44 2015 New Revision: 242913 URL: http://llvm.org/viewvc/llvm-project?rev=242913&view=rev Log: Fix warnings. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11404 Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp lldb/trunk/source/Symbol/ClangASTImporter.cpp lldb/trunk/source/Target/Process.cpp lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/DNB.cpp lldb/trunk/tools/debugserver/source/DNBArch.cpp lldb/trunk/tools/debugserver/source/DNBArch.h lldb/trunk/tools/debugserver/source/DNBDataRef.cpp lldb/trunk/tools/debugserver/source/DNBRegisterInfo.cpp lldb/trunk/tools/debugserver/source/MacOSX/MachProcess.mm lldb/trunk/tools/debugserver/source/MacOSX/MachTask.mm lldb/trunk/tools/debugserver/source/MacOSX/MachThread.cpp lldb/trunk/tools/debugserver/source/MacOSX/MachThread.h lldb/trunk/tools/debugserver/source/MacOSX/MachVMMemory.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm/DNBArchImpl.h lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp lldb/trunk/tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp lldb/trunk/tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp lldb/trunk/tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp lldb/trunk/tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h lldb/trunk/tools/debugserver/source/RNBRemote.cpp lldb/trunk/tools/debugserver/source/RNBRemote.h lldb/trunk/tools/debugserver/source/RNBServices.cpp lldb/trunk/tools/debugserver/source/RNBSocket.cpp lldb/trunk/tools/debugserver/source/libdebugserver.cpp Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp?rev=242913&r1=242912&r2=242913&view=diff == --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp (original) +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp Wed Jul 22 12:31:44 2015 @@ -133,6 +133,7 @@ GDBRemoteCommunicationServerPlatform::Ha int platform_port; std::string platform_path; bool ok = UriParser::Parse(GetConnection()->GetURI().c_str(), platform_scheme, platform_ip, platform_port, platform_path); +(void)ok; assert(ok); Error error = StartDebugserverProcess ( platform_ip.c_str(), Modified: lldb/trunk/source/Symbol/ClangASTImporter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTImporter.cpp?rev=242913&r1=242912&r2=242913&view=diff == --- lldb/trunk/source/Symbol/ClangASTImporter.cpp (original) +++ lldb/trunk/source/Symbol/ClangASTImporter.cpp Wed Jul 22 12:31:44 2015 @@ -623,6 +623,7 @@ ClangASTImporter::Minion::ExecuteDeportW m_decls_to_deport->erase(decl); DeclOrigin &origin = to_context_md->m_origins[decl]; +(void)origin; assert (origin.ctx == m_source_ctx);// otherwise we should never have added this // because it doesn't need to be deported Modified: lldb/trunk/source/Target/Process.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=242913&r1=242912&r2=242913&view=diff == --- lldb/trunk/source/Target/Process.cpp (original) +++ lldb/trunk/source/Target/Process.cpp Wed Jul 22 12:31:44 2015 @@ -2843,6 +2843,7 @@ Process::WriteMemory (addr_t addr, const size_t intersect_size; size_t opcode_offset; const bool intersects = bp->IntersectsRange(addr, size, &intersect_addr, &intersect_size, &opcode_offset); +(void)intersects; assert(intersects); assert(addr <= intersect_addr && intersect_addr < addr + size); assert(addr < intersect_addr + intersect_size && intersect_addr + intersect_size <= addr + size); Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=242913&r1=242912&r2=242913&view=diff == ---
[Lldb-commits] [lldb] r242911 - [lldb-mi] Remove unused bool results.
Author: brucem Date: Wed Jul 22 12:07:27 2015 New Revision: 242911 URL: http://llvm.org/viewvc/llvm-project?rev=242911&view=rev Log: [lldb-mi] Remove unused bool results. Summary: Many methods, in particular various 'Add' methods didn't have any actual failure scenarios that were being emitted. This meant that a lot of surrounding code could be simplified. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11412 Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp lldb/trunk/tools/lldb-mi/MICmdArgSet.h lldb/trunk/tools/lldb-mi/MICmdBase.cpp lldb/trunk/tools/lldb-mi/MICmdBase.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.cpp lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.cpp lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.cpp lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp lldb/trunk/tools/lldb-mi/MICmdCmdStack.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp lldb/trunk/tools/lldb-mi/MICmdCmdThread.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.cpp lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h lldb/trunk/tools/lldb-mi/MICmnMIValueList.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueList.h lldb/trunk/tools/lldb-mi/MICmnMIValueResult.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp?rev=242911&r1=242910&r2=242911&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp Wed Jul 22 12:07:27 2015 @@ -90,17 +90,14 @@ CMICmdArgSet::IsArgsPresentButNotHandled // Details: Add the list of command's arguments to parse and validate another one. // Type:Method. // Args:vArg- (R) A command argument object. -// Return: MIstatus::success - Functional succeeded. -// MIstatus::failure - Functional failed. +// Return: None. // Throws: None. //-- -bool +void CMICmdArgSet::Add(const CMICmdArgValBase &vArg) { CMICmdArgValBase *pArg = const_cast(&vArg); m_setCmdArgs.push_back(pArg); - -return MIstatus::success; } //++ Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.h?rev=242911&r1=242910&r2=242911&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h Wed Jul 22 12:07:27 2015 @@ -63,7 +63,7 @@ class CMICmdArgSet : public CMICmnBase public: /* ctor */ CMICmdArgSet(void); -bool Add(const CMICmdArgValBase &vArg); +void Add(const CMICmdArgValBase &vArg); bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; Modified: lldb/trunk/tools/lldb-mi/MICmdBase.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdBase.cpp?rev=242911&r1=242910&r2=242911&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdBase.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdBase.cpp Wed Jul 22 12:07:27 2015 @@ -83,16 +83,13 @@ CMICmdBase::GetMiCmd(void) const // provide data about its status or provide information to other objects. // Type:Overridden. // Args:None. -// Return: MIstatus::success - Functional succeeded. -// MIstatus::failure - Functional failed. +// Return: None. // Throws: None. //-- -bool +void CMICmdBase::SetCmdData(const SMICmdData &vCmdData) { m_cmdData = vCmdData; - -return MIstatus::success; } //++ -
Re: [Lldb-commits] [PATCH] D11412: [lldb-mi] Remove unused bool results.
brucem added inline comments. Comment at: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp:512 @@ -516,3 +511,3 @@ } -return bOk; +return MIstatus::success; } abidh wrote: > Does this function return false somewhere or this return type is also > redundant. That return type is also redundant. There are some of them remaining, especially in threading stuff. But I wanted to keep the current patch relatively self-contained. http://reviews.llvm.org/D11412 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r242900 - [lldb-mi tests] Fix typo of sensitive.
Author: brucem Date: Wed Jul 22 08:46:32 2015 New Revision: 242900 URL: http://llvm.org/viewvc/llvm-project?rev=242900&view=rev Log: [lldb-mi tests] Fix typo of sensitive. Modified: lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py Modified: lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py?rev=242900&r1=242899&r2=242900&view=diff == --- lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py (original) +++ lldb/trunk/test/tools/lldb-mi/control/TestMiExec.py Wed Jul 22 08:46:32 2015 @@ -154,7 +154,7 @@ class MiExecTestCase(lldbmi_testcase.MiT self.expect("\^running") self.expect("\*stopped,reason=\"breakpoint-hit\"") -# Warning: the following is sensative to the lines in the source +# Warning: the following is sensitive to the lines in the source # Test -exec-next self.runCmd("-exec-next --thread 1 --frame 0") @@ -208,7 +208,7 @@ class MiExecTestCase(lldbmi_testcase.MiT self.expect("\^running") self.expect("\*stopped,reason=\"breakpoint-hit\"") -# Warning: the following is sensative to the lines in the +# Warning: the following is sensitive to the lines in the # source and optimizations # Test -exec-next-instruction @@ -262,7 +262,7 @@ class MiExecTestCase(lldbmi_testcase.MiT self.expect("\^running") self.expect("\*stopped,reason=\"breakpoint-hit\"") -# Warning: the following is sensative to the lines in the source +# Warning: the following is sensitive to the lines in the source # Test that -exec-step steps into (or not) printf depending on debug info # Note that message is different in Darwin and Linux: @@ -324,7 +324,7 @@ class MiExecTestCase(lldbmi_testcase.MiT self.runCmd("-file-exec-and-symbols %s" % self.myexe) self.expect("\^done") -# Warning: the following is sensative to the lines in the +# Warning: the following is sensitive to the lines in the # source and optimizations # Run to main ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11404: Fix warnings.
brucem created this revision. brucem added a reviewer: clayborg. brucem added a subscriber: lldb-commits. http://reviews.llvm.org/D11404 Files: source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.cpp source/Symbol/ClangASTImporter.cpp source/Target/Process.cpp tools/debugserver/source/CMakeLists.txt tools/debugserver/source/DNB.cpp tools/debugserver/source/DNBArch.cpp tools/debugserver/source/DNBArch.h tools/debugserver/source/DNBDataRef.cpp tools/debugserver/source/DNBRegisterInfo.cpp tools/debugserver/source/MacOSX/MachProcess.mm tools/debugserver/source/MacOSX/MachTask.mm tools/debugserver/source/MacOSX/MachThread.cpp tools/debugserver/source/MacOSX/MachThread.h tools/debugserver/source/MacOSX/MachVMMemory.cpp tools/debugserver/source/MacOSX/arm/DNBArchImpl.cpp tools/debugserver/source/MacOSX/arm/DNBArchImpl.h tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.cpp tools/debugserver/source/MacOSX/arm64/DNBArchImplARM64.h tools/debugserver/source/MacOSX/i386/DNBArchImplI386.cpp tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h tools/debugserver/source/MacOSX/ppc/DNBArchImpl.cpp tools/debugserver/source/MacOSX/ppc/DNBArchImpl.h tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.cpp tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h tools/debugserver/source/RNBRemote.cpp tools/debugserver/source/RNBRemote.h tools/debugserver/source/RNBServices.cpp tools/debugserver/source/RNBSocket.cpp tools/debugserver/source/libdebugserver.cpp Index: tools/debugserver/source/libdebugserver.cpp === --- tools/debugserver/source/libdebugserver.cpp +++ tools/debugserver/source/libdebugserver.cpp @@ -189,18 +189,18 @@ if (ctx.GetProcessStopCount() == 1) { - DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %u (old %u)) Notify??? no, first stop...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); + DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %zu (old %zu)) Notify??? no, first stop...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); } else { - DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %u (old %u)) Notify??? YES!!!", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); + DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %zu (old %zu)) Notify??? YES!!!", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); remote->NotifyThatProcessStopped (); } } else { - DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %u (old %u)) Notify??? skipping...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); + DNBLogThreadedIf (LOG_RNB_MINIMAL, "%s (&remote, initialize=%i) pid_state = %s pid_stop_count %zu (old %zu)) Notify??? skipping...", __FUNCTION__, (int)initialize, DNBStateAsString (pid_state), ctx.GetProcessStopCount(), prev_pid_stop_count); } } return eRNBRunLoopModeInferiorExecuting; Index: tools/debugserver/source/RNBSocket.cpp === --- tools/debugserver/source/RNBSocket.cpp +++ tools/debugserver/source/RNBSocket.cpp @@ -395,7 +395,7 @@ if (bytessent < 0) return rnb_err; -if (bytessent != length) +if ((size_t)bytessent != length) return rnb_err; DNBLogThreadedIf(LOG_RNB_PACKETS, "putpkt: %*s", (int)length, (char *)buffer); // All data is string based in debugserver, so this is safe Index: tools/debugserver/source/RNBServices.cpp === --- tools/debugserver/source/RNBServices.cpp +++ tools/debugserver/source/RNBServices.cpp @@ -11,21 +11,21 @@ // //===--===// -#import "RNBServices.h" +#include "RNBServices.h" -#import +#include #include -#import +#include #include #include "CFString.h" #include -#import "DNBLog.h" +#include "DNBLog.h" #include "MacOSX/CFUtils.h" // For now only SpringBoard has a notion of "Applications" that it can list for us. // So we have to use the SpringBoard API's here. #if defined (WITH_SPRINGBOARD) || defined (WITH_BKS) -#import +#include #endif // From DNB.cpp Index: tools/debugserver/source/RNBRemote.h === --- tools/debugserver/source/RNBRemote.h +++ tools/debugserver/source/RNBRemote.h
Re: [Lldb-commits] [PATCH] D11396: [lldb-mi] Fix breakpoints on functions when C++ namespaces are used.
brucem added a comment. Could you please add a test for the file: + ::func case? Repository: rL LLVM http://reviews.llvm.org/D11396 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11386: Fix typos.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242856: Fix typos. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11386?vs=30244&id=30301#toc Repository: rL LLVM http://reviews.llvm.org/D11386 Files: lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp lldb/trunk/include/lldb/Core/Connection.h lldb/trunk/include/lldb/Core/Log.h lldb/trunk/include/lldb/Core/Timer.h lldb/trunk/include/lldb/Host/Mutex.h lldb/trunk/source/Core/FastDemangle.cpp lldb/trunk/source/Core/ModuleList.cpp lldb/trunk/source/Core/RegisterValue.cpp lldb/trunk/source/Host/common/XML.cpp lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp lldb/trunk/source/Host/windows/EditLineWin.cpp lldb/trunk/source/Interpreter/Args.cpp lldb/trunk/source/Interpreter/CommandObject.cpp lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.h lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/trunk/source/Symbol/ClangASTContext.cpp lldb/trunk/source/Symbol/CompactUnwindInfo.cpp lldb/trunk/source/Symbol/DWARFCallFrameInfo.cpp lldb/trunk/source/Symbol/LineTable.cpp lldb/trunk/source/Symbol/SymbolVendor.cpp lldb/trunk/source/Symbol/TypeList.cpp lldb/trunk/source/Target/ThreadList.cpp lldb/trunk/source/Utility/JSON.cpp lldb/trunk/source/Utility/SharingPtr.cpp lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py lldb/trunk/test/python_api/event/TestEvents.py lldb/trunk/www/cpp_reference/html/SBListener_8h_source.html Index: lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp === --- lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp +++ lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp @@ -649,17 +649,17 @@ bool PlatformDarwin::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info) { -bool sucess = false; +bool success = false; if (IsHost()) { -sucess = Platform::GetProcessInfo (pid, process_info); +success = Platform::GetProcessInfo (pid, process_info); } else { if (m_remote_platform_sp) -sucess = m_remote_platform_sp->GetProcessInfo (pid, process_info); +success = m_remote_platform_sp->GetProcessInfo (pid, process_info); } -return sucess; +return success; } uint32_t Index: lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.h === --- lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.h +++ lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.h @@ -10,7 +10,7 @@ // 2) The ELF file's PT_NOTE and PT_LOAD segments describes the program's // address space and thread contexts. // 3) PT_NOTE segment contains note entries which describes a thread context. -// 4) PT_LOAD segment describes a valid contigous range of process address +// 4) PT_LOAD segment describes a valid contiguous range of process address // space. //===--===// Index: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h === --- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -376,7 +376,7 @@ bool m_destroy_tried_resuming; lldb::CommandObjectSP m_command_sp; int64_t m_breakpoint_pc_offset; -lldb::tid_t m_initial_tid; // The inital thread ID, given by stub on attach +lldb::tid_t m_initial_tid; // The initial thread ID, given by stub on attach bool HandleNotifyPacket(StringExtractorGDBRemote &packet); Index: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp === --- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp +++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp @@ -782,7 +782,7 @@ Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS)); // In order to stop async notifications from being processed in the middle of the -// send/recieve sequence Hijack the broadcast. Then rebroadcast any events when we are done. +// send/receive sequence Hijack the broadcast. Then rebroadcast any events when we are done. static Listener hijack_listener("lldb.NotifyHijacker"); HijackBroadcaster(&hijack_listener, eBroadcastBi
[Lldb-commits] [lldb] r242856 - Fix typos.
Author: brucem Date: Tue Jul 21 19:16:02 2015 New Revision: 242856 URL: http://llvm.org/viewvc/llvm-project?rev=242856&view=rev Log: Fix typos. Summary: Fix a bunch of typos. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11386 Modified: lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp lldb/trunk/include/lldb/Core/Connection.h lldb/trunk/include/lldb/Core/Log.h lldb/trunk/include/lldb/Core/Timer.h lldb/trunk/include/lldb/Host/Mutex.h lldb/trunk/source/Core/FastDemangle.cpp lldb/trunk/source/Core/ModuleList.cpp lldb/trunk/source/Core/RegisterValue.cpp lldb/trunk/source/Host/common/XML.cpp lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp lldb/trunk/source/Host/windows/EditLineWin.cpp lldb/trunk/source/Interpreter/Args.cpp lldb/trunk/source/Interpreter/CommandObject.cpp lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp lldb/trunk/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.h lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/trunk/source/Symbol/ClangASTContext.cpp lldb/trunk/source/Symbol/CompactUnwindInfo.cpp lldb/trunk/source/Symbol/DWARFCallFrameInfo.cpp lldb/trunk/source/Symbol/LineTable.cpp lldb/trunk/source/Symbol/SymbolVendor.cpp lldb/trunk/source/Symbol/TypeList.cpp lldb/trunk/source/Target/ThreadList.cpp lldb/trunk/source/Utility/JSON.cpp lldb/trunk/source/Utility/SharingPtr.cpp lldb/trunk/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py lldb/trunk/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py lldb/trunk/test/python_api/event/TestEvents.py lldb/trunk/www/cpp_reference/html/SBListener_8h_source.html Modified: lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp?rev=242856&r1=242855&r2=242856&view=diff == --- lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp (original) +++ lldb/trunk/examples/darwin/heap_find/heap/heap_find.cpp Tue Jul 21 19:16:02 2015 @@ -144,7 +144,7 @@ range_info_callback (task_t task, uint64_t ptr_size); //-- -// Redefine private gloval variables prototypes from +// Redefine private global variables prototypes from // "/usr/local/include/stack_logging.h" //-- @@ -556,7 +556,7 @@ private: static int compare_bytes (const Entry *a, const Entry *b) { -// Reverse the comparisong to most bytes entries end up at top of list +// Reverse the comparison to most bytes entries end up at top of list if (a->bytes > b->bytes) return -1; if (a->bytes < b->bytes) return +1; return 0; @@ -565,7 +565,7 @@ private: static int compare_count (const Entry *a, const Entry *b) { -// Reverse the comparisong to most count entries end up at top of list +// Reverse the comparison to most count entries end up at top of list if (a->count > b->count) return -1; if (a->count < b->count) return +1; return 0; @@ -659,7 +659,7 @@ foreach_zone_in_this_process (range_call // dump_malloc_block_callback // // A simple callback that will dump each malloc block and all available -// info from the enumeration callback perpective. +// info from the enumeration callback perspective. //-- static void dump_malloc_block_callback (task_t task, void *baton, unsigned type, uint64_t ptr_addr, uint64_t ptr_size) Modified: lldb/trunk/include/lldb/Core/Connection.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Connection.h?rev=242856&r1=242855&r2=242856&view=diff == --- lldb/trunk/include/lldb/Core/Connection.h (original) +++ lldb/trunk/include/lldb/Core/Connection.h Tue Jul 21 19:16:02 2015 @@ -58,7 +58,7 @@ public: /// /// @param[out] error_ptr /// A pointer to an error object that should be given an -/// approriate error value if this method returns false. This +/// appropriate error value if this method returns false. This /// value can be NULL if the error value should be ignored. /// /// @return @@ -77,7 +77,7 @@ public: /// /// @param[out] error_ptr /// A pointer to an error object that should be given an -/// approriate error value if this method
[Lldb-commits] [lldb] r242781 - [lldb-mi] Correct file names in first line comments.
Author: brucem Date: Tue Jul 21 08:09:39 2015 New Revision: 242781 URL: http://llvm.org/viewvc/llvm-project?rev=242781&view=rev Log: [lldb-mi] Correct file names in first line comments. Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgValBase.h lldb/trunk/tools/lldb-mi/MICmdArgValConsume.cpp lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIValue.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueConst.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueList.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueResult.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MICmnStreamStdout.cpp lldb/trunk/tools/lldb-mi/MICmnThreadMgrStd.cpp Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- MICmnArgContext.cpp -*- C++ -*-===// +//===-- MICmdArgContext.cpp -*- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmdArgValBase.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValBase.h?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValBase.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValBase.h Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- CMICmdArgValBase.h --*- C++ -*-===// +//===-- MICmdArgValBase.h ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmdArgValConsume.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValConsume.cpp?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValConsume.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValConsume.cpp Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- MICmdArgValConsume.cpp -*- C++ -*-===// +//===-- MICmdArgValConsume.cpp --*- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- MICmdArgValConsume.h ---*- C++ -*-===// +//===-- MICmdArgValConsume.h *- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.cpp Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- MICmdCmdGdbInfo.cpp *- C++ -*-===// +//===-- MICmdCmdGdbInfo.cpp -*- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h?rev=242781&r1=242780&r2=242781&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h Tue Jul 21 08:09:39 2015 @@ -1,4 +1,4 @@ -//===-- MICmdCmdGdbInfo.h --*- C++ -*-===// +//===-- MICmdCmdGdbInfo.h ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // Modified: lldb/trunk/tools/lldb-mi/MICmnLL
[Lldb-commits] [lldb] r242778 - [lldb-mi] Fix Windows build, missing assert.h include.
Author: brucem Date: Tue Jul 21 07:39:58 2015 New Revision: 242778 URL: http://llvm.org/viewvc/llvm-project?rev=242778&view=rev Log: [lldb-mi] Fix Windows build, missing assert.h include. Reviewers: ki.stfu, abidh Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11387 Modified: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp Modified: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp?rev=242778&r1=242777&r2=242778&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp Tue Jul 21 07:39:58 2015 @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIResultRecord.h" #include "MICmnResources.h" ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11387: [lldb-mi] Fix Windows build, missing assert.h include.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242778: [lldb-mi] Fix Windows build, missing assert.h include. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11387?vs=30245&id=30248#toc Repository: rL LLVM http://reviews.llvm.org/D11387 Files: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp Index: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp === --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIResultRecord.h" #include "MICmnResources.h" Index: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp === --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIResultRecord.h" #include "MICmnResources.h" ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11387: [lldb-mi] Fix Windows build, missing assert.h include.
brucem created this revision. brucem added reviewers: ki.stfu, abidh. brucem added a subscriber: lldb-commits. http://reviews.llvm.org/D11387 Files: tools/lldb-mi/MICmnMIResultRecord.cpp Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIResultRecord.h" #include "MICmnResources.h" Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -7,6 +7,9 @@ // //===--===// +// Third Party Headers: +#include + // In-house headers: #include "MICmnMIResultRecord.h" #include "MICmnResources.h" ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11386: Fix typos.
brucem created this revision. brucem added a reviewer: clayborg. brucem added a subscriber: lldb-commits. Fix a bunch of typos. http://reviews.llvm.org/D11386 Files: examples/darwin/heap_find/heap/heap_find.cpp include/lldb/Core/Connection.h include/lldb/Core/Log.h include/lldb/Core/Timer.h include/lldb/Host/Mutex.h source/Core/FastDemangle.cpp source/Core/ModuleList.cpp source/Core/RegisterValue.cpp source/Host/common/XML.cpp source/Host/windows/ConnectionGenericFileWindows.cpp source/Host/windows/EditLineWin.cpp source/Interpreter/Args.cpp source/Interpreter/CommandObject.cpp source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp source/Plugins/Platform/MacOSX/PlatformDarwin.cpp source/Plugins/Process/elf-core/ProcessElfCore.h source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp source/Plugins/Process/gdb-remote/ProcessGDBRemote.h source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp source/Symbol/ClangASTContext.cpp source/Symbol/CompactUnwindInfo.cpp source/Symbol/DWARFCallFrameInfo.cpp source/Symbol/LineTable.cpp source/Symbol/SymbolVendor.cpp source/Symbol/TypeList.cpp source/Target/ThreadList.cpp source/Utility/JSON.cpp source/Utility/SharingPtr.cpp test/functionalities/thread/break_after_join/TestBreakAfterJoin.py test/functionalities/thread/exit_during_break/TestExitDuringBreak.py test/python_api/event/TestEvents.py www/cpp_reference/html/SBListener_8h_source.html Index: www/cpp_reference/html/SBListener_8h_source.html === --- www/cpp_reference/html/SBListener_8h_source.html +++ www/cpp_reference/html/SBListener_8h_source.html @@ -88,7 +88,7 @@ 55Â StopListeningForEvents (const lldb::SBBroadcaster& broadcaster, 56Â uint32_t event_mask); 57Â - 58Â // Returns true if an event was recieved, false if we timed out. + 58Â // Returns true if an event was received, false if we timed out. 59Â bool 60Â WaitForEvent (uint32_t num_seconds, 61Â lldb::SBEvent &event); Index: test/python_api/event/TestEvents.py === --- test/python_api/event/TestEvents.py +++ test/python_api/event/TestEvents.py @@ -249,7 +249,7 @@ # The finite state machine for our custom listening thread, with an -# initail state of None, which means no event has been received. +# initial state of None, which means no event has been received. # It changes to 'connected' after 'connected' event is received (for remote platforms) # It changes to 'running' after 'running' event is received (should happen only if the # currentstate is either 'None' or 'connected') Index: test/functionalities/thread/exit_during_break/TestExitDuringBreak.py === --- test/functionalities/thread/exit_during_break/TestExitDuringBreak.py +++ test/functionalities/thread/exit_during_break/TestExitDuringBreak.py @@ -59,7 +59,7 @@ target = self.dbg.GetSelectedTarget() process = target.GetProcess() -# The exit probably occured during breakpoint handling, but it isn't +# The exit probably occurred during breakpoint handling, but it isn't # guaranteed. The main thing we're testing here is that the debugger # handles this cleanly is some way. Index: test/functionalities/thread/break_after_join/TestBreakAfterJoin.py === --- test/functionalities/thread/break_after_join/TestBreakAfterJoin.py +++ test/functionalities/thread/break_after_join/TestBreakAfterJoin.py @@ -59,7 +59,7 @@ target = self.dbg.GetSelectedTarget() process = target.GetProcess() -# The exit probably occured during breakpoint handling, but it isn't +# The exit probably occurred during breakpoint handling, but it isn't # guaranteed. The main thing we're testing here is that the debugger # handles this cleanly is some way. Index: source/Utility/SharingPtr.cpp === --- source/Utility/SharingPtr.cpp +++ source/Utility/SharingPtr.cpp @@ -11,7 +11,7 @@ #if defined (ENABLE_SP_LOGGING) -// If ENABLE_SP_LOGGING is defined, then log all shared pointer assignements +// If ENABLE_SP_LOGGING is defined, then log all shared pointer assignments // and allow them to be queried using a pointer by a call to: #include #include Index: source/Utility/JSON.cpp === --- source/Utility/JSON.cpp +++ source/Utility/JSON.cpp @@ -392,7 +392,7 @@ case 'E': if (exp_index != 0) { -error.Printf("error: extra expenent character f
[Lldb-commits] [lldb] r242769 - [lldb-mi] Simplify MICmnMIResultRecord implementation.
Author: brucem Date: Tue Jul 21 06:30:39 2015 New Revision: 242769 URL: http://llvm.org/viewvc/llvm-project?rev=242769&view=rev Log: [lldb-mi] Simplify MICmnMIResultRecord implementation. Summary: * Remove extraneous members that were just storing temporary values. * ResultClass_e parameters don't need to be const as they are scalars. * Switch from a map with CMIUtilString values to using a mapping function. This uses a switch statement which will generate a warning if a new result class is added. * Make BuildRecordResult a static function rather than a private member function so that we can construct the result text correctly and avoid having extra stuff in the header. * Don't need (void) parameter lists in C++. Reviewers: abidh, ki.stfu, domipheus Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11052 Modified: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h Modified: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp?rev=242769&r1=242768&r2=242769&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp Tue Jul 21 06:30:39 2015 @@ -11,14 +11,46 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +//++ +// Details: Map a result class to the corresponding string. +// Args:veType - (R) A MI result class enumeration. +// Return: const char* - The string corresponding to the result class. +// Throws: None. +//-- +static const char* +MapResultClassToResultClassText(CMICmnMIResultRecord::ResultClass_e veType) +{ +switch (veType) +{ + case CMICmnMIResultRecord::eResultClass_Done: +return "done"; + case CMICmnMIResultRecord::eResultClass_Running: +return "running"; + case CMICmnMIResultRecord::eResultClass_Connected: +return "connected"; + case CMICmnMIResultRecord::eResultClass_Error: +return "error"; + case CMICmnMIResultRecord::eResultClass_Exit: +return "exit"; +} +assert(false && "unknown CMICmnMIResultRecord::ResultClass_e"); +return NULL; +} + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - (R) A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = MapResultClassToResultClassText(veType); +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ // Details: CMICmnMIResultRecord constructor. @@ -27,7 +59,7 @@ const CMIUtilString CMICmnMIResultRecord // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(void) +CMICmnMIResultRecord::CMICmnMIResultRecord() : m_strResultRecord(MIRSRC(IDS_CMD_ERR_CMD_RUN_BUT_NO_ACTION)) { } @@ -40,12 +72,9 @@ CMICmnMIResultRecord::CMICmnMIResultReco // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType) -: m_strResultRecordToken(vrToken) -, m_eResultRecordResultClass(veType) -, m_strResultRecord(MIRSRC(IDS_CMD_ERR_CMD_RUN_BUT_NO_ACTION)) +CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType) +: m_strResultRecord(BuildResultRecord(vrToken, veType)) { -BuildResultRecord(); } //++ @@ -57,14 +86,10 @@ CMICmnMIResultRecord::CMICmnMIResultReco // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue) -: m_strResultRecordToken
Re: [Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242769: [lldb-mi] Simplify MICmnMIResultRecord implementation. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11052?vs=30240&id=30243#toc Repository: rL LLVM http://reviews.llvm.org/D11052 Files: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h Index: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h === --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -56,39 +53,24 @@ eResultClass_Running, eResultClass_Connected, eResultClass_Error, -eResultClass_Exit, -eResultClass_count // Always the last one +eResultClass_Exit }; -// Typedefs: - public: -typedef std::map MapResultClassToResultClassText_t; - // Methods: public: -/* ctor */ CMICmnMIResultRecord(void); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue); +/* ctor */ CMICmnMIResultRecord(); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType, const CMICmnMIValueResult &vValue); // -const CMIUtilString &GetString(void) const; +const CMIUtilString &GetString() const; bool Add(const CMICmnMIValue &vMIValue); // Overridden: public: // From CMICmnBase -/* dtor */ ~CMICmnMIResultRecord(void) override; - -// Methods: - private: -bool BuildResultRecord(void); +/* dtor */ ~CMICmnMIResultRecord() override; // Attributes: private: -static const CMIUtilString ms_constStrResultRecordHat; -static MapResultClassToResultClassText_t ms_constMapResultClassToResultClassText; -// -CMIUtilString m_strResultRecordToken; -ResultClass_e m_eResultRecordResultClass; CMIUtilString m_strResultRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp === --- lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp +++ lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp @@ -11,23 +11,55 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +//++ +// Details: Map a result class to the corresponding string. +// Args:veType - (R) A MI result class enumeration. +// Return: const char* - The string corresponding to the result class. +// Throws: None. +//-- +static const char* +MapResultClassToResultClassText(CMICmnMIResultRecord::ResultClass_e veType) +{ +switch (veType) +{ + case CMICmnMIResultRecord::eResultClass_Done: +return "done"; + case CMICmnMIResultRecord::eResultClass_Running: +return "running"; + case CMICmnMIResultRecord::eResultClass_Connected: +return "connected"; + case CMICmnMIResultRecord::eResultClass_Error: +return "error"; + case CMICmnMIResultRecord::eResultClass_Exit: +return "exit"; +} +assert(false && "unknown CMICmnMIResultRecord::ResultClass_e"); +return NULL; +} + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - (R) A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = MapResultClassToResultClassText(veType); +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ -
[Lldb-commits] [lldb] r242768 - [lldb-mi] Remove unused portions of MIDataTypes.h.
Author: brucem Date: Tue Jul 21 06:27:40 2015 New Revision: 242768 URL: http://llvm.org/viewvc/llvm-project?rev=242768&view=rev Log: [lldb-mi] Remove unused portions of MIDataTypes.h. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11385 Modified: lldb/trunk/tools/lldb-mi/MIDataTypes.h Modified: lldb/trunk/tools/lldb-mi/MIDataTypes.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIDataTypes.h?rev=242768&r1=242767&r2=242768&view=diff == --- lldb/trunk/tools/lldb-mi/MIDataTypes.h (original) +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h Tue Jul 21 06:27:40 2015 @@ -39,15 +39,6 @@ const bool failure = false; // Use to avoid "unused parameter" compiler warnings: #define MIunused(x) (void) x; -#ifdef _WIN32 -#define MI_NO_INITIALIZE_VTABLE __declspec(novtable) -#define MI_FORCE_INLINE __forceinline -#else -#define MI_NO_INITIALIZE_VTABLE -#define MI_FORCE_INLINE inline -// __attribute__( ( always_inline ) ) -#endif // _WIN32 - // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; @@ -72,10 +63,3 @@ typedef unsigned int MIuint; // Fundamentals: typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. - -// using namespace std; // Better to put this or std:: at translation units scope. - -//-- -// Common routines: - -//-- ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11385: [lldb-mi] Remove unused portions of MIDataTypes.h.
This revision was automatically updated to reflect the committed changes. Closed by commit rL242768: [lldb-mi] Remove unused portions of MIDataTypes.h. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11385?vs=30241&id=30242#toc Repository: rL LLVM http://reviews.llvm.org/D11385 Files: lldb/trunk/tools/lldb-mi/MIDataTypes.h Index: lldb/trunk/tools/lldb-mi/MIDataTypes.h === --- lldb/trunk/tools/lldb-mi/MIDataTypes.h +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h @@ -39,15 +39,6 @@ // Use to avoid "unused parameter" compiler warnings: #define MIunused(x) (void) x; -#ifdef _WIN32 -#define MI_NO_INITIALIZE_VTABLE __declspec(novtable) -#define MI_FORCE_INLINE __forceinline -#else -#define MI_NO_INITIALIZE_VTABLE -#define MI_FORCE_INLINE inline -// __attribute__( ( always_inline ) ) -#endif // _WIN32 - // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; @@ -72,10 +63,3 @@ // Fundamentals: typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. - -// using namespace std; // Better to put this or std:: at translation units scope. - -//-- -// Common routines: - -//-- Index: lldb/trunk/tools/lldb-mi/MIDataTypes.h === --- lldb/trunk/tools/lldb-mi/MIDataTypes.h +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h @@ -39,15 +39,6 @@ // Use to avoid "unused parameter" compiler warnings: #define MIunused(x) (void) x; -#ifdef _WIN32 -#define MI_NO_INITIALIZE_VTABLE __declspec(novtable) -#define MI_FORCE_INLINE __forceinline -#else -#define MI_NO_INITIALIZE_VTABLE -#define MI_FORCE_INLINE inline -// __attribute__( ( always_inline ) ) -#endif // _WIN32 - // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; @@ -72,10 +63,3 @@ // Fundamentals: typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. - -// using namespace std; // Better to put this or std:: at translation units scope. - -//-- -// Common routines: - -//-- ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11385: [lldb-mi] Remove unused portions of MIDataTypes.h.
brucem created this revision. brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. http://reviews.llvm.org/D11385 Files: tools/lldb-mi/MIDataTypes.h Index: tools/lldb-mi/MIDataTypes.h === --- tools/lldb-mi/MIDataTypes.h +++ tools/lldb-mi/MIDataTypes.h @@ -39,15 +39,6 @@ // Use to avoid "unused parameter" compiler warnings: #define MIunused(x) (void) x; -#ifdef _WIN32 -#define MI_NO_INITIALIZE_VTABLE __declspec(novtable) -#define MI_FORCE_INLINE __forceinline -#else -#define MI_NO_INITIALIZE_VTABLE -#define MI_FORCE_INLINE inline -// __attribute__( ( always_inline ) ) -#endif // _WIN32 - // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; @@ -72,10 +63,3 @@ // Fundamentals: typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. - -// using namespace std; // Better to put this or std:: at translation units scope. - -//-- -// Common routines: - -//-- Index: tools/lldb-mi/MIDataTypes.h === --- tools/lldb-mi/MIDataTypes.h +++ tools/lldb-mi/MIDataTypes.h @@ -39,15 +39,6 @@ // Use to avoid "unused parameter" compiler warnings: #define MIunused(x) (void) x; -#ifdef _WIN32 -#define MI_NO_INITIALIZE_VTABLE __declspec(novtable) -#define MI_FORCE_INLINE __forceinline -#else -#define MI_NO_INITIALIZE_VTABLE -#define MI_FORCE_INLINE inline -// __attribute__( ( always_inline ) ) -#endif // _WIN32 - // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; @@ -72,10 +63,3 @@ // Fundamentals: typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. - -// using namespace std; // Better to put this or std:: at translation units scope. - -//-- -// Common routines: - -//-- ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.
brucem updated this revision to Diff 30240. brucem added a comment. Minor update for formatting and to change (void) parameter lists. http://reviews.llvm.org/D11052 Files: tools/lldb-mi/MICmnMIResultRecord.cpp tools/lldb-mi/MICmnMIResultRecord.h Index: tools/lldb-mi/MICmnMIResultRecord.h === --- tools/lldb-mi/MICmnMIResultRecord.h +++ tools/lldb-mi/MICmnMIResultRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -56,39 +53,24 @@ eResultClass_Running, eResultClass_Connected, eResultClass_Error, -eResultClass_Exit, -eResultClass_count // Always the last one +eResultClass_Exit }; -// Typedefs: - public: -typedef std::map MapResultClassToResultClassText_t; - // Methods: public: -/* ctor */ CMICmnMIResultRecord(void); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue); +/* ctor */ CMICmnMIResultRecord(); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType, const CMICmnMIValueResult &vValue); // -const CMIUtilString &GetString(void) const; +const CMIUtilString &GetString() const; bool Add(const CMICmnMIValue &vMIValue); // Overridden: public: // From CMICmnBase -/* dtor */ ~CMICmnMIResultRecord(void) override; - -// Methods: - private: -bool BuildResultRecord(void); +/* dtor */ ~CMICmnMIResultRecord() override; // Attributes: private: -static const CMIUtilString ms_constStrResultRecordHat; -static MapResultClassToResultClassText_t ms_constMapResultClassToResultClassText; -// -CMIUtilString m_strResultRecordToken; -ResultClass_e m_eResultRecordResultClass; CMIUtilString m_strResultRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -11,23 +11,55 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +//++ +// Details: Map a result class to the corresponding string. +// Args:veType - (R) A MI result class enumeration. +// Return: const char* - The string corresponding to the result class. +// Throws: None. +//-- +static const char* +MapResultClassToResultClassText(CMICmnMIResultRecord::ResultClass_e veType) +{ +switch (veType) +{ + case CMICmnMIResultRecord::eResultClass_Done: +return "done"; + case CMICmnMIResultRecord::eResultClass_Running: +return "running"; + case CMICmnMIResultRecord::eResultClass_Connected: +return "connected"; + case CMICmnMIResultRecord::eResultClass_Error: +return "error"; + case CMICmnMIResultRecord::eResultClass_Exit: +return "exit"; +} +assert(false && "unknown CMICmnMIResultRecord::ResultClass_e"); +return NULL; +} + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - (R) A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = MapResultClassToResultClassText(veType); +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ // Details: CMICmnMIResultRecord constructor. // Type:Method. // Args:None. // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(
Re: [Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.
brucem updated this revision to Diff 30238. brucem added a comment. Updated per review comment. http://reviews.llvm.org/D11052 Files: tools/lldb-mi/MICmnMIResultRecord.cpp tools/lldb-mi/MICmnMIResultRecord.h Index: tools/lldb-mi/MICmnMIResultRecord.h === --- tools/lldb-mi/MICmnMIResultRecord.h +++ tools/lldb-mi/MICmnMIResultRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -56,19 +53,14 @@ eResultClass_Running, eResultClass_Connected, eResultClass_Error, -eResultClass_Exit, -eResultClass_count // Always the last one +eResultClass_Exit }; -// Typedefs: - public: -typedef std::map MapResultClassToResultClassText_t; - // Methods: public: /* ctor */ CMICmnMIResultRecord(void); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType, const CMICmnMIValueResult &vValue); // const CMIUtilString &GetString(void) const; bool Add(const CMICmnMIValue &vMIValue); @@ -78,17 +70,7 @@ // From CMICmnBase /* dtor */ ~CMICmnMIResultRecord(void) override; -// Methods: - private: -bool BuildResultRecord(void); - // Attributes: private: -static const CMIUtilString ms_constStrResultRecordHat; -static MapResultClassToResultClassText_t ms_constMapResultClassToResultClassText; -// -CMIUtilString m_strResultRecordToken; -ResultClass_e m_eResultRecordResultClass; CMIUtilString m_strResultRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -11,14 +11,45 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +//++ +// Details: Map a result class to the corresponding string. +// Args:veType - (R) A MI result class enumeration. +// Return: const char* - The string corresponding to the result class. +// Throws: None. +//-- +static const char* +MapResultClassToResultClassText(CMICmnMIResultRecord::ResultClass_e veType) +{ +switch (veType) { + case CMICmnMIResultRecord::eResultClass_Done: +return "done"; + case CMICmnMIResultRecord::eResultClass_Running: +return "running"; + case CMICmnMIResultRecord::eResultClass_Connected: +return "connected"; + case CMICmnMIResultRecord::eResultClass_Error: +return "error"; + case CMICmnMIResultRecord::eResultClass_Exit: +return "exit"; +} +assert(false && "unknown CMICmnMIResultRecord::ResultClass_e"); +return NULL; +} + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - (R) A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = MapResultClassToResultClassText(veType); +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ // Details: CMICmnMIResultRecord constructor. @@ -40,12 +71,9 @@ // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType) -: m_strResultRecordToken(vrToken) -, m_eResultRecordResultClass(veType) -, m_strResultRecord(MIRSRC(IDS_CMD_ERR_CMD_RUN_BUT_NO_ACTION)) +CMICm
Re: [Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.
brucem updated this revision to Diff 30235. brucem added a comment. This restores the (R) to some comments and handles the mapping of the result class to a string in a better way that will generate compiler warnings if a new result class is added. The const qualifiers haven't been re-added after the discussion on http://reviews.llvm.org/D11049. http://reviews.llvm.org/D11052 Files: tools/lldb-mi/MICmnMIResultRecord.cpp tools/lldb-mi/MICmnMIResultRecord.h Index: tools/lldb-mi/MICmnMIResultRecord.h === --- tools/lldb-mi/MICmnMIResultRecord.h +++ tools/lldb-mi/MICmnMIResultRecord.h @@ -9,9 +9,6 @@ #pragma once -// Third party headers: -#include - // In-house headers: #include "MICmnBase.h" #include "MIUtilString.h" @@ -56,19 +53,14 @@ eResultClass_Running, eResultClass_Connected, eResultClass_Error, -eResultClass_Exit, -eResultClass_count // Always the last one +eResultClass_Exit }; -// Typedefs: - public: -typedef std::map MapResultClassToResultClassText_t; - // Methods: public: /* ctor */ CMICmnMIResultRecord(void); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType, const CMICmnMIValueResult &vValue); // const CMIUtilString &GetString(void) const; bool Add(const CMICmnMIValue &vMIValue); @@ -78,17 +70,7 @@ // From CMICmnBase /* dtor */ ~CMICmnMIResultRecord(void) override; -// Methods: - private: -bool BuildResultRecord(void); - // Attributes: private: -static const CMIUtilString ms_constStrResultRecordHat; -static MapResultClassToResultClassText_t ms_constMapResultClassToResultClassText; -// -CMIUtilString m_strResultRecordToken; -ResultClass_e m_eResultRecordResultClass; CMIUtilString m_strResultRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -11,14 +11,43 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +//++ +// Details: Map a result class to the corresponding string. +// Args:veType - (R) A MI result class enumeration. +// Return: const char* - The string corresponding to the result class. +// Throws: None. +//-- +static const char* +MapResultClassToResultClassText(CMICmnMIResultRecord::ResultClass_e veType) +{ +switch (veType) { + case CMICmnMIResultRecord::eResultClass_Done: +return "done"; + case CMICmnMIResultRecord::eResultClass_Running: +return "running"; + case CMICmnMIResultRecord::eResultClass_Connected: +return "connected"; + case CMICmnMIResultRecord::eResultClass_Error: +return "error"; + case CMICmnMIResultRecord::eResultClass_Exit: +return "exit"; +} +} + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - (R) A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = MapResultClassToResultClassText(veType); +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ // Details: CMICmnMIResultRecord constructor. @@ -40,12 +69,9 @@ // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_
[Lldb-commits] [lldb] r242762 - [lldb-mi] size_t rather than MIuint for arg counts.
Author: brucem Date: Tue Jul 21 03:07:27 2015 New Revision: 242762 URL: http://llvm.org/viewvc/llvm-project?rev=242762&view=rev Log: [lldb-mi] size_t rather than MIuint for arg counts. Summary: [lldb-mi] size_t rather than MIuint for arg counts. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11049 Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp lldb/trunk/tools/lldb-mi/MICmdArgSet.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp?rev=242762&r1=242761&r2=242762&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp Tue Jul 21 03:07:27 2015 @@ -149,9 +149,9 @@ CMICmdArgContext::RemoveArg(const CMIUti // Throws: None. //-- bool -CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex) +CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex) { -MIuint nWordIndex = 0; +size_t nWordIndex = 0; CMIUtilString strBuildContextUp; const CMIUtilString::VecString_t vecWords(GetArgs()); const bool bSpaceRequired(GetNumberArgsPresent() > 2); @@ -202,10 +202,10 @@ CMICmdArgContext::RemoveArgAtPos(const C // Details: Retrieve number of arguments or options present in the command's option text. // Type:Method. // Args:None. -// Return: MIuint - 0 to n arguments present. +// Return: size_t - 0 to n arguments present. // Throws: None. //-- -MIuint +size_t CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.h?rev=242762&r1=242761&r2=242762&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h Tue Jul 21 03:07:27 2015 @@ -28,11 +28,11 @@ class CMICmdArgContext /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw); // const CMIUtilString &GetArgsLeftToParse(void) const; -MIuint GetNumberArgsPresent(void) const; +size_t GetNumberArgsPresent(void) const; CMIUtilString::VecString_t GetArgs(void) const; bool IsEmpty(void) const; bool RemoveArg(const CMIUtilString &vArg); -bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex); +bool RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex); // CMICmdArgContext &operator=(const CMICmdArgContext &vOther); Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp?rev=242762&r1=242761&r2=242762&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp Tue Jul 21 03:07:27 2015 @@ -335,10 +335,10 @@ CMICmdArgSet::IsArgContextEmpty(void) co // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.h?rev=242762&r1=242761&r2=242762&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h Tue Jul 21 03:07:27 2015 @@ -67,7 +67,7 @@ class CMICmdArgSet : public CMICmnBase bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11049: [lldb-mi] size_t rather than MIuint for arg counts.
This revision was automatically updated to reflect the committed changes. brucem marked an inline comment as done. Closed by commit rL242762: [lldb-mi] size_t rather than MIuint for arg counts. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11049?vs=29304&id=30233#toc Repository: rL LLVM http://reviews.llvm.org/D11049 Files: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp lldb/trunk/tools/lldb-mi/MICmdArgSet.h Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp @@ -149,9 +149,9 @@ // Throws: None. //-- bool -CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex) +CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex) { -MIuint nWordIndex = 0; +size_t nWordIndex = 0; CMIUtilString strBuildContextUp; const CMIUtilString::VecString_t vecWords(GetArgs()); const bool bSpaceRequired(GetNumberArgsPresent() > 2); @@ -202,10 +202,10 @@ // Details: Retrieve number of arguments or options present in the command's option text. // Type:Method. // Args:None. -// Return: MIuint - 0 to n arguments present. +// Return: size_t - 0 to n arguments present. // Throws: None. //-- -MIuint +size_t CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.h === --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.h === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h @@ -28,11 +28,11 @@ /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw); // const CMIUtilString &GetArgsLeftToParse(void) const; -MIuint GetNumberArgsPresent(void) const; +size_t GetNumberArgsPresent(void) const; CMIUtilString::VecString_t GetArgs(void) const; bool IsEmpty(void) const; bool RemoveArg(const CMIUtilString &vArg); -bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex); +bool RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex); // CMICmdArgContext &operator=(const CMICmdArgContext &vOther); Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.cpp @@ -335,10 +335,10 @@ // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp @@ -149,9 +149,9 @@ // Throws: None. //-- bool -CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex) +CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex) { -MIuint nWordIndex = 0; +size_t nWordIndex = 0; CMIUtilString strBuildContextUp; const CMIUtilString::VecString_t vecWords(GetArgs()); const bool bSpaceRequired(GetNumberArgsPresent() > 2); @@ -202,10 +202,10 @@ // Details: Retrieve number of arguments or options present in the command's option text. // Type:Method. // Args:None. -// Return: MIuint - 0 to n arguments present. +// Return: size_t - 0 to n arguments present. // Throws: None. //-- -MIuint +size_t CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; Index: lldb/trunk/tools/lldb-mi/MICmdArgSet.h === --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const;
Re: [Lldb-commits] [PATCH] D11049: [lldb-mi] size_t rather than MIuint for arg counts.
brucem added a comment. I don't think other code within LLDB really uses const scalar parameters and they don't provide much protection against anything. (They don't do anything for the caller and they only provide a minor restriction for the callee.) Some const were removed in the MIuint to size_t patch as well, but if we decide to keep this, I can sort through and add them back. The value of these const annotations isn't clear though. http://reviews.llvm.org/D11049 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.* Remove extraneous members that were just storing temporary values.* Correct some comments to not say that veT
brucem added a comment. This is an example of what I'd like to do more widely. In this case, the generated code is about half the size (not that it really matters, but just a demonstration of the bloat removed). http://reviews.llvm.org/D11052 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11052: [lldb-mi] Simplify MICmnMIResultRecord implementation.* Remove extraneous members that were just storing temporary values.* Correct some comments to not say that veType
brucem created this revision. brucem added reviewers: abidh, ki.stfu, domipheus. brucem added a subscriber: lldb-commits. ...they are scalars. * Switch from a map with CMIUtilString values to an indexable array of const char*. * Make BuildRecordResult a static function rather than a private member function so that we can construct the result text correctly and avoid having extra stuff in the header. [lldb-mi] Simplify MICmnMIResultRecord implementation. http://reviews.llvm.org/D11052 Files: tools/lldb-mi/MICmnMIResultRecord.cpp tools/lldb-mi/MICmnMIResultRecord.h Index: tools/lldb-mi/MICmnMIResultRecord.h === --- tools/lldb-mi/MICmnMIResultRecord.h +++ tools/lldb-mi/MICmnMIResultRecord.h @@ -60,15 +60,11 @@ eResultClass_count // Always the last one }; -// Typedefs: - public: -typedef std::map MapResultClassToResultClassText_t; - // Methods: public: /* ctor */ CMICmnMIResultRecord(void); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType); -/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType, const CMICmnMIValueResult &vValue); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType); +/* ctor */ CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType, const CMICmnMIValueResult &vValue); // const CMIUtilString &GetString(void) const; bool Add(const CMICmnMIValue &vMIValue); @@ -78,17 +74,7 @@ // From CMICmnBase /* dtor */ ~CMICmnMIResultRecord(void) override; -// Methods: - private: -bool BuildResultRecord(void); - // Attributes: private: -static const CMIUtilString ms_constStrResultRecordHat; -static MapResultClassToResultClassText_t ms_constMapResultClassToResultClassText; -// -CMIUtilString m_strResultRecordToken; -ResultClass_e m_eResultRecordResultClass; CMIUtilString m_strResultRecord; // Holds the text version of the result record to date -CMICmnMIValueResult m_partResult; }; Index: tools/lldb-mi/MICmnMIResultRecord.cpp === --- tools/lldb-mi/MICmnMIResultRecord.cpp +++ tools/lldb-mi/MICmnMIResultRecord.cpp @@ -11,14 +11,29 @@ #include "MICmnMIResultRecord.h" #include "MICmnResources.h" -// Instantiations: -CMICmnMIResultRecord::MapResultClassToResultClassText_t ms_MapResultClassToResultClassText = { -{CMICmnMIResultRecord::eResultClass_Done, "done"}, -{CMICmnMIResultRecord::eResultClass_Running, "running"}, -{CMICmnMIResultRecord::eResultClass_Connected, "connected"}, -{CMICmnMIResultRecord::eResultClass_Error, "error"}, -{CMICmnMIResultRecord::eResultClass_Exit, "exit"}}; -const CMIUtilString CMICmnMIResultRecord::ms_constStrResultRecordHat("^"); +const char* s_MapResultClassToResultClassText[] = { +"done", +"running", +"connected", +"error", +"exit" +}; + +//++ +// Details: Build the result record's mandatory data part. The part up to the first +// (additional) result i.e. result-record ==> [ token ] "^" result-class. +// Type:Method. +// Args:vrToken - (R) The command's transaction ID or token. +// veType - A MI result class enumeration. +// Return: CMIUtilString & - MI result record mandatory data +// Throws: None. +//-- +static const CMIUtilString +BuildResultRecord(const CMIUtilString &vrToken, CMICmnMIResultRecord::ResultClass_e veType) +{ +const char *pStrResultRecord = s_MapResultClassToResultClassText[veType]; +return CMIUtilString::Format("%s^%s", vrToken.c_str(), pStrResultRecord); +} //++ // Details: CMICmnMIResultRecord constructor. @@ -36,35 +51,28 @@ // Details: CMICmnMIResultRecord constructor. // Type:Method. // Args:vrToken - (R) The command's transaction ID or token. -// veType - (R) A MI result class enumeration. +// veType - A MI result class enumeration. // Return: None. // Throws: None. //-- -CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, const ResultClass_e veType) -: m_strResultRecordToken(vrToken) -, m_eResultRecordResultClass(veType) -, m_strResultRecord(MIRSRC(IDS_CMD_ERR_CMD_RUN_BUT_NO_ACTION)) +CMICmnMIResultRecord::CMICmnMIResultRecord(const CMIUtilString &vrToken, ResultClass_e veType) +: m_strResultRecord(BuildResultRecord(vrToken, veType)) { -BuildResultRecord(); } //++ // Details: CMICmnMIResultRecord constructor. // Type:Method. // Args:vrToken - (R) The command's transaction ID or token. -// veType - (R) A MI result class
Re: [Lldb-commits] [PATCH] D11049: [lldb-mi] size_t rather than MIuint for arg counts.
brucem updated this revision to Diff 29304. brucem added a comment. Update per review. Removing const from header where it isn't needed. http://reviews.llvm.org/D11049 Files: tools/lldb-mi/MICmdArgContext.cpp tools/lldb-mi/MICmdArgContext.h tools/lldb-mi/MICmdArgSet.cpp tools/lldb-mi/MICmdArgSet.h Index: tools/lldb-mi/MICmdArgSet.h === --- tools/lldb-mi/MICmdArgSet.h +++ tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); Index: tools/lldb-mi/MICmdArgSet.cpp === --- tools/lldb-mi/MICmdArgSet.cpp +++ tools/lldb-mi/MICmdArgSet.cpp @@ -335,10 +335,10 @@ // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -28,11 +28,11 @@ /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw); // const CMIUtilString &GetArgsLeftToParse(void) const; -MIuint GetNumberArgsPresent(void) const; +size_t GetNumberArgsPresent(void) const; CMIUtilString::VecString_t GetArgs(void) const; bool IsEmpty(void) const; bool RemoveArg(const CMIUtilString &vArg); -bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex); +bool RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex); // CMICmdArgContext &operator=(const CMICmdArgContext &vOther); Index: tools/lldb-mi/MICmdArgContext.cpp === --- tools/lldb-mi/MICmdArgContext.cpp +++ tools/lldb-mi/MICmdArgContext.cpp @@ -143,15 +143,15 @@ // context string. // Type:Method. // Args:vArg- (R) The name of the argument. -// nArgIndex - (R) The word count position to which to remove the vArg word. +// nArgIndex - The word count position to which to remove the vArg word. // Return: MIstatus::success - Functional succeeded. // MIstatus::failure - Functional failed. // Throws: None. //-- bool -CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex) +CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex) { -MIuint nWordIndex = 0; +size_t nWordIndex = 0; CMIUtilString strBuildContextUp; const CMIUtilString::VecString_t vecWords(GetArgs()); const bool bSpaceRequired(GetNumberArgsPresent() > 2); @@ -202,10 +202,10 @@ // Details: Retrieve number of arguments or options present in the command's option text. // Type:Method. // Args:None. -// Return: MIuint - 0 to n arguments present. +// Return: size_t - 0 to n arguments present. // Throws: None. //-- -MIuint +size_t CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; Index: tools/lldb-mi/MICmdArgSet.h === --- tools/lldb-mi/MICmdArgSet.h +++ tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); Index: tools/lldb-mi/MICmdArgSet.cpp === --- tools/lldb-mi/MICmdArgSet.cpp +++ tools/lldb-mi/MICmdArgSet.cpp @@ -335,10 +335,10 @@ // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -28,11 +28,11 @@ /* ctor */ CMICmdArgContext(con
Re: [Lldb-commits] [PATCH] D11050: [lldb-mi] Remove unused typedefs.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241791: [lldb-mi] Remove unused typedefs. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11050?vs=29300&id=29303#toc Repository: rL LLVM http://reviews.llvm.org/D11050 Files: lldb/trunk/tools/lldb-mi/MIDataTypes.h Index: lldb/trunk/tools/lldb-mi/MIDataTypes.h === --- lldb/trunk/tools/lldb-mi/MIDataTypes.h +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h @@ -51,18 +51,14 @@ // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; -typedef unsigned __int64 PointerToInteger_t; typedef __int64 MIint; typedef unsigned __int64 MIuint; #else #ifdef _WIN32 typedef unsigned int size_t; -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; #else -// typedef long unsigned int size_t; // size_t already defined -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; @@ -74,8 +70,6 @@ // Common types: // Fundamentals: -typedef float MIflt; -typedef double MIdbl; typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. Index: lldb/trunk/tools/lldb-mi/MIDataTypes.h === --- lldb/trunk/tools/lldb-mi/MIDataTypes.h +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h @@ -51,18 +51,14 @@ // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; -typedef unsigned __int64 PointerToInteger_t; typedef __int64 MIint; typedef unsigned __int64 MIuint; #else #ifdef _WIN32 typedef unsigned int size_t; -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; #else -// typedef long unsigned int size_t; // size_t already defined -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; @@ -74,8 +70,6 @@ // Common types: // Fundamentals: -typedef float MIflt; -typedef double MIdbl; typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241791 - [lldb-mi] Remove unused typedefs.
Author: brucem Date: Thu Jul 9 03:45:26 2015 New Revision: 241791 URL: http://llvm.org/viewvc/llvm-project?rev=241791&view=rev Log: [lldb-mi] Remove unused typedefs. Summary: [lldb-mi] Remove unused typedefs. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11050 Modified: lldb/trunk/tools/lldb-mi/MIDataTypes.h Modified: lldb/trunk/tools/lldb-mi/MIDataTypes.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIDataTypes.h?rev=241791&r1=241790&r2=241791&view=diff == --- lldb/trunk/tools/lldb-mi/MIDataTypes.h (original) +++ lldb/trunk/tools/lldb-mi/MIDataTypes.h Thu Jul 9 03:45:26 2015 @@ -51,18 +51,14 @@ const bool failure = false; // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; -typedef unsigned __int64 PointerToInteger_t; typedef __int64 MIint; typedef unsigned __int64 MIuint; #else #ifdef _WIN32 typedef unsigned int size_t; -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; #else -// typedef long unsigned int size_t; // size_t already defined -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; @@ -74,8 +70,6 @@ typedef unsigned int MIuint; // Common types: // Fundamentals: -typedef float MIflt; -typedef double MIdbl; typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11050: [lldb-mi] Remove unused typedefs.
brucem created this revision. brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. [lldb-mi] Remove unused typedefs. http://reviews.llvm.org/D11050 Files: tools/lldb-mi/MIDataTypes.h Index: tools/lldb-mi/MIDataTypes.h === --- tools/lldb-mi/MIDataTypes.h +++ tools/lldb-mi/MIDataTypes.h @@ -51,18 +51,14 @@ // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; -typedef unsigned __int64 PointerToInteger_t; typedef __int64 MIint; typedef unsigned __int64 MIuint; #else #ifdef _WIN32 typedef unsigned int size_t; -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; #else -// typedef long unsigned int size_t; // size_t already defined -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; @@ -74,8 +70,6 @@ // Common types: // Fundamentals: -typedef float MIflt; -typedef double MIdbl; typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. Index: tools/lldb-mi/MIDataTypes.h === --- tools/lldb-mi/MIDataTypes.h +++ tools/lldb-mi/MIDataTypes.h @@ -51,18 +51,14 @@ // Portability issues #ifdef _WIN64 typedef unsigned __int64 size_t; -typedef unsigned __int64 PointerToInteger_t; typedef __int64 MIint; typedef unsigned __int64 MIuint; #else #ifdef _WIN32 typedef unsigned int size_t; -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; #else -// typedef long unsigned int size_t; // size_t already defined -typedef unsigned int PointerToInteger_t; typedef int MIint; typedef unsigned int MIuint; @@ -74,8 +70,6 @@ // Common types: // Fundamentals: -typedef float MIflt; -typedef double MIdbl; typedef long long MIint64; // 64bit signed integer. typedef unsigned long long MIuint64; // 64bit unsigned integer. ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11049: [lldb-mi] size_t rather than MIuint for arg counts.
brucem created this revision. brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. [lldb-mi] size_t rather than MIuint for arg counts. http://reviews.llvm.org/D11049 Files: tools/lldb-mi/MICmdArgContext.cpp tools/lldb-mi/MICmdArgContext.h tools/lldb-mi/MICmdArgSet.cpp tools/lldb-mi/MICmdArgSet.h Index: tools/lldb-mi/MICmdArgSet.h === --- tools/lldb-mi/MICmdArgSet.h +++ tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); Index: tools/lldb-mi/MICmdArgSet.cpp === --- tools/lldb-mi/MICmdArgSet.cpp +++ tools/lldb-mi/MICmdArgSet.cpp @@ -335,10 +335,10 @@ // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -28,11 +28,11 @@ /* ctor */ CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw); // const CMIUtilString &GetArgsLeftToParse(void) const; -MIuint GetNumberArgsPresent(void) const; +size_t GetNumberArgsPresent(void) const; CMIUtilString::VecString_t GetArgs(void) const; bool IsEmpty(void) const; bool RemoveArg(const CMIUtilString &vArg); -bool RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex); +bool RemoveArgAtPos(const CMIUtilString &vArg, const size_t nArgIndex); // CMICmdArgContext &operator=(const CMICmdArgContext &vOther); Index: tools/lldb-mi/MICmdArgContext.cpp === --- tools/lldb-mi/MICmdArgContext.cpp +++ tools/lldb-mi/MICmdArgContext.cpp @@ -143,15 +143,15 @@ // context string. // Type:Method. // Args:vArg- (R) The name of the argument. -// nArgIndex - (R) The word count position to which to remove the vArg word. +// nArgIndex - The word count position to which to remove the vArg word. // Return: MIstatus::success - Functional succeeded. // MIstatus::failure - Functional failed. // Throws: None. //-- bool -CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, const MIuint nArgIndex) +CMICmdArgContext::RemoveArgAtPos(const CMIUtilString &vArg, size_t nArgIndex) { -MIuint nWordIndex = 0; +size_t nWordIndex = 0; CMIUtilString strBuildContextUp; const CMIUtilString::VecString_t vecWords(GetArgs()); const bool bSpaceRequired(GetNumberArgsPresent() > 2); @@ -202,10 +202,10 @@ // Details: Retrieve number of arguments or options present in the command's option text. // Type:Method. // Args:None. -// Return: MIuint - 0 to n arguments present. +// Return: size_t - 0 to n arguments present. // Throws: None. //-- -MIuint +size_t CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; Index: tools/lldb-mi/MICmdArgSet.h === --- tools/lldb-mi/MICmdArgSet.h +++ tools/lldb-mi/MICmdArgSet.h @@ -67,7 +67,7 @@ bool GetArg(const CMIUtilString &vArgName, CMICmdArgValBase *&vpArg) const; const SetCmdArgs_t &GetArgsThatAreMissing(void) const; const SetCmdArgs_t &GetArgsThatInvalid(void) const; -MIuint GetCount(void) const; +size_t GetCount(void) const; bool IsArgContextEmpty(void) const; bool IsArgsPresentButNotHandledByCmd(void) const; void WarningArgsNotHandledbyCmdLogFile(const CMIUtilString &vrCmdName); Index: tools/lldb-mi/MICmdArgSet.cpp === --- tools/lldb-mi/MICmdArgSet.cpp +++ tools/lldb-mi/MICmdArgSet.cpp @@ -335,10 +335,10 @@ // Details: Retrieve the number of arguments that are being used for the command. // Type:Method. // Args:None. -// Return: MIuint - Argument count. +// Return: size_t - Argument count. // Throws: None. //-- -MIuint +size_t CMICmdArgSet::GetCount(void) const { return m_setCmdArgs.size(); Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -28,11 +28,11 @@
Re: [Lldb-commits] [PATCH] D11018: Move ProcessKDP's StringExtractor include.This can be in the cpp file rather than the header file, so movingit there.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241649: Move ProcessKDP's StringExtractor include. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D11018?vs=29223&id=29224#toc Repository: rL LLVM http://reviews.llvm.org/D11018 Files: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -25,7 +25,6 @@ #include "lldb/Core/StringList.h" #include "lldb/Core/ThreadSafeValue.h" #include "lldb/Host/HostThread.h" -#include "lldb/Utility/StringExtractor.h" #include "lldb/Target/Process.h" #include "lldb/Target/Thread.h" Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -37,6 +37,7 @@ #include "lldb/Target/RegisterContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/StringExtractor.h" #define USEC_PER_SEC 100 Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -25,7 +25,6 @@ #include "lldb/Core/StringList.h" #include "lldb/Core/ThreadSafeValue.h" #include "lldb/Host/HostThread.h" -#include "lldb/Utility/StringExtractor.h" #include "lldb/Target/Process.h" #include "lldb/Target/Thread.h" Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -37,6 +37,7 @@ #include "lldb/Target/RegisterContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/StringExtractor.h" #define USEC_PER_SEC 100 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241649 - Move ProcessKDP's StringExtractor include.
Author: brucem Date: Tue Jul 7 18:59:01 2015 New Revision: 241649 URL: http://llvm.org/viewvc/llvm-project?rev=241649&view=rev Log: Move ProcessKDP's StringExtractor include. This can be in the cpp file rather than the header file, so moving it there. Summary: Move ProcessKDP's StringExtractor include. Reviewers: clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D11018 Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=241649&r1=241648&r2=241649&view=diff == --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original) +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Tue Jul 7 18:59:01 2015 @@ -37,6 +37,7 @@ #include "lldb/Target/RegisterContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/StringExtractor.h" #define USEC_PER_SEC 100 Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h?rev=241649&r1=241648&r2=241649&view=diff == --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h (original) +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h Tue Jul 7 18:59:01 2015 @@ -25,7 +25,6 @@ #include "lldb/Core/StringList.h" #include "lldb/Core/ThreadSafeValue.h" #include "lldb/Host/HostThread.h" -#include "lldb/Utility/StringExtractor.h" #include "lldb/Target/Process.h" #include "lldb/Target/Thread.h" ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D11018: Move ProcessKDP's StringExtractor include.This can be in the cpp file rather than the header file, so movingit there.
brucem added a reviewer: clayborg. brucem added a subscriber: lldb-commits. Move ProcessKDP's StringExtractor include. http://reviews.llvm.org/D11018 Files: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -25,7 +25,6 @@ #include "lldb/Core/StringList.h" #include "lldb/Core/ThreadSafeValue.h" #include "lldb/Host/HostThread.h" -#include "lldb/Utility/StringExtractor.h" #include "lldb/Target/Process.h" #include "lldb/Target/Thread.h" Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -37,6 +37,7 @@ #include "lldb/Target/RegisterContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/StringExtractor.h" #define USEC_PER_SEC 100 Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -25,7 +25,6 @@ #include "lldb/Core/StringList.h" #include "lldb/Core/ThreadSafeValue.h" #include "lldb/Host/HostThread.h" -#include "lldb/Utility/StringExtractor.h" #include "lldb/Target/Process.h" #include "lldb/Target/Thread.h" Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -37,6 +37,7 @@ #include "lldb/Target/RegisterContext.h" #include "lldb/Target/Target.h" #include "lldb/Target/Thread.h" +#include "lldb/Utility/StringExtractor.h" #define USEC_PER_SEC 100 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] LLGS Android target support
On Tue, Jul 7, 2015 at 11:25 PM, Nico Weber wrote: > On Tue, Apr 28, 2015 at 1:55 PM, Nico Weber wrote: > >> >> Comment at: cmake/LLDBDependencies.cmake:100 >> @@ +99,3 @@ >> +if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) >> + set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c) >> + add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE} >> >> thakis wrote: >> > This doesn't look correct. Now every file that includes >> LLDBDependencies will have a custom command that builds >> tools/lldb/source/LLDB_vers.c. With ninja, this causes "ninja: warning: >> multiple rules generate tools/lldb/source/LLDB_vers.c. builds involving >> this target will not be correct; continuing anyway" for example (since >> there's more than one CMakeLists.txt that includes LLDBDependencies.txt). >> > >> > Maybe this rule could stay where it was? >> Ping? This is still broken 4 months later. >> > > One last ping. If I don't hear back I'll try to fix it myself. > I think the right fix is to use add_custom_target for this file rather than add_custom_command. - Bruce ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10995: Fix StringExtractor.h issues.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241596: Fix StringExtractor.h issues. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10995?vs=29180&id=29182#toc Repository: rL LLVM http://reviews.llvm.org/D10995 Files: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/trunk/unittests/Utility/StringExtractorTest.cpp Index: lldb/trunk/unittests/Utility/StringExtractorTest.cpp === --- lldb/trunk/unittests/Utility/StringExtractorTest.cpp +++ lldb/trunk/unittests/Utility/StringExtractorTest.cpp @@ -1,7 +1,7 @@ #include #include "gtest/gtest.h" -#include "Utility/StringExtractor.h" +#include "lldb/Utility/StringExtractor.h" namespace { Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -46,7 +46,6 @@ #include "ThreadKDP.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Utility/StringExtractor.h" using namespace lldb; using namespace lldb_private; Index: lldb/trunk/unittests/Utility/StringExtractorTest.cpp === --- lldb/trunk/unittests/Utility/StringExtractorTest.cpp +++ lldb/trunk/unittests/Utility/StringExtractorTest.cpp @@ -1,7 +1,7 @@ #include #include "gtest/gtest.h" -#include "Utility/StringExtractor.h" +#include "lldb/Utility/StringExtractor.h" namespace { Index: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -46,7 +46,6 @@ #include "ThreadKDP.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Utility/StringExtractor.h" using namespace lldb; using namespace lldb_private; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241596 - Fix StringExtractor.h issues.
Author: brucem Date: Tue Jul 7 10:19:03 2015 New Revision: 241596 URL: http://llvm.org/viewvc/llvm-project?rev=241596&view=rev Log: Fix StringExtractor.h issues. Summary: Fix StringExtractor.h issues. * source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (#include "Utility/StringExtractor.h): Not needed, this is already included by ProcessKDP.h * unittests/Utility/StringExtractorTest.cpp (#include "Utility/StringExtractor.h): Update include path to the new location. Reviewers: labath, clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10995 Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp lldb/trunk/unittests/Utility/StringExtractorTest.cpp Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=241596&r1=241595&r2=241596&view=diff == --- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original) +++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Tue Jul 7 10:19:03 2015 @@ -46,7 +46,6 @@ #include "ThreadKDP.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Utility/StringExtractor.h" using namespace lldb; using namespace lldb_private; Modified: lldb/trunk/unittests/Utility/StringExtractorTest.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/StringExtractorTest.cpp?rev=241596&r1=241595&r2=241596&view=diff == --- lldb/trunk/unittests/Utility/StringExtractorTest.cpp (original) +++ lldb/trunk/unittests/Utility/StringExtractorTest.cpp Tue Jul 7 10:19:03 2015 @@ -1,7 +1,7 @@ #include #include "gtest/gtest.h" -#include "Utility/StringExtractor.h" +#include "lldb/Utility/StringExtractor.h" namespace { ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10995: Fix StringExtractor.h issues.
This doesn't address the issue with debugserver which may be a more controversial fix. http://reviews.llvm.org/D10995 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10995: Fix StringExtractor.h issues.
brucem added reviewers: labath, clayborg. brucem added a subscriber: lldb-commits. Fix StringExtractor.h issues. * source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (#include "Utility/StringExtractor.h): Not needed, this is already included by ProcessKDP.h * unittests/Utility/StringExtractorTest.cpp (#include "Utility/StringExtractor.h): Update include path to the new location. http://reviews.llvm.org/D10995 Files: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp unittests/Utility/StringExtractorTest.cpp Index: unittests/Utility/StringExtractorTest.cpp === --- unittests/Utility/StringExtractorTest.cpp +++ unittests/Utility/StringExtractorTest.cpp @@ -1,7 +1,7 @@ #include #include "gtest/gtest.h" -#include "Utility/StringExtractor.h" +#include "lldb/Utility/StringExtractor.h" namespace { Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -46,7 +46,6 @@ #include "ThreadKDP.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Utility/StringExtractor.h" using namespace lldb; using namespace lldb_private; Index: unittests/Utility/StringExtractorTest.cpp === --- unittests/Utility/StringExtractorTest.cpp +++ unittests/Utility/StringExtractorTest.cpp @@ -1,7 +1,7 @@ #include #include "gtest/gtest.h" -#include "Utility/StringExtractor.h" +#include "lldb/Utility/StringExtractor.h" namespace { Index: source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp === --- source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -46,7 +46,6 @@ #include "ThreadKDP.h" #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h" #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h" -#include "Utility/StringExtractor.h" using namespace lldb; using namespace lldb_private; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10994: cmake no longer needs to deal with -std=c++11 checks.LLVM requires and handles this now and has the correct compilerversion checks. This block of code for cmake in L
This revision was automatically updated to reflect the committed changes. Closed by commit rL241590: cmake no longer needs to deal with -std=c++11 checks. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10994?vs=29174&id=29177#toc Repository: rL LLVM http://reviews.llvm.org/D10994 Files: lldb/trunk/cmake/modules/LLDBConfig.cmake Index: lldb/trunk/cmake/modules/LLDBConfig.cmake === --- lldb/trunk/cmake/modules/LLDBConfig.cmake +++ lldb/trunk/cmake/modules/LLDBConfig.cmake @@ -88,32 +88,6 @@ include_directories(../clang/include) include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") -# lldb requires c++11 to build. Make sure that we have a compiler and standard -# library combination that can do that. -if (NOT MSVC) - # gcc and clang require the -std=c++0x or -std=c++11 flag. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") -if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11")) - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() - else() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -endif() - endif() -elseif (MSVC_VERSION LESS 1700) - message(FATAL_ERROR "The selected compiler does not support c++11 which is " - "required to build lldb.") -endif() - # Disable GCC warnings check_cxx_compiler_flag("-Wno-deprecated-declarations" CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) Index: lldb/trunk/cmake/modules/LLDBConfig.cmake === --- lldb/trunk/cmake/modules/LLDBConfig.cmake +++ lldb/trunk/cmake/modules/LLDBConfig.cmake @@ -88,32 +88,6 @@ include_directories(../clang/include) include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") -# lldb requires c++11 to build. Make sure that we have a compiler and standard -# library combination that can do that. -if (NOT MSVC) - # gcc and clang require the -std=c++0x or -std=c++11 flag. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") -if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11")) - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() - else() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -endif() - endif() -elseif (MSVC_VERSION LESS 1700) - message(FATAL_ERROR "The selected compiler does not support c++11 which is " - "required to build lldb.") -endif() - # Disable GCC warnings check_cxx_compiler_flag("-Wno-deprecated-declarations" CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241590 - cmake no longer needs to deal with -std=c++11 checks.
Author: brucem Date: Tue Jul 7 09:52:59 2015 New Revision: 241590 URL: http://llvm.org/viewvc/llvm-project?rev=241590&view=rev Log: cmake no longer needs to deal with -std=c++11 checks. LLVM requires and handles this now and has the correct compiler version checks. This block of code for cmake in LLDB is no longer needed. Summary: cmake no longer needs to deal with -std=c++11 checks. Reviewers: labath Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10994 Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=241590&r1=241589&r2=241590&view=diff == --- lldb/trunk/cmake/modules/LLDBConfig.cmake (original) +++ lldb/trunk/cmake/modules/LLDBConfig.cmake Tue Jul 7 09:52:59 2015 @@ -88,32 +88,6 @@ endif() include_directories(../clang/include) include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") -# lldb requires c++11 to build. Make sure that we have a compiler and standard -# library combination that can do that. -if (NOT MSVC) - # gcc and clang require the -std=c++0x or -std=c++11 flag. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") -if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11")) - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() - else() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -endif() - endif() -elseif (MSVC_VERSION LESS 1700) - message(FATAL_ERROR "The selected compiler does not support c++11 which is " - "required to build lldb.") -endif() - # Disable GCC warnings check_cxx_compiler_flag("-Wno-deprecated-declarations" CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241591 - [lldb-mi] Spell resource string name correctly.
Author: brucem Date: Tue Jul 7 09:54:07 2015 New Revision: 241591 URL: http://llvm.org/viewvc/llvm-project?rev=241591&view=rev Log: [lldb-mi] Spell resource string name correctly. Broardcaster -> Broadcaster Summary: [lldb-mi] Spell resource string name correctly. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10993 Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp lldb/trunk/tools/lldb-mi/MICmnResources.cpp lldb/trunk/tools/lldb-mi/MICmnResources.h Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp?rev=241591&r1=241590&r2=241591&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp Tue Jul 7 09:54:07 2015 @@ -423,13 +423,13 @@ CMICmnLLDBDebugger::RegisterForEvent(con const char *pBroadcasterName = vBroadcaster.GetName(); if (pBroadcasterName == nullptr) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); return MIstatus::failure; } CMIUtilString broadcasterName(pBroadcasterName); if (broadcasterName.length() == 0) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); return MIstatus::failure; } Modified: lldb/trunk/tools/lldb-mi/MICmnResources.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnResources.cpp?rev=241591&r1=241590&r2=241591&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnResources.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnResources.cpp Tue Jul 7 09:54:07 2015 @@ -129,7 +129,7 @@ const CMICmnResources::SRsrcTextData CMI {IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, "LLDB Debugger. Invalid client name '%s' "}, {IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, "LLDB Debugger. Client name '%s' not registered for listening events"}, {IDS_LLDBDEBUGGER_ERR_STOPLISTENER, "LLDB Debugger. Failure occurred stopping event for client '%s' SBBroadcaster '%s'"}, -{IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, +{IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, {IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, "LLDB Debugger. Unhandled event '%s'"}, {IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, "LLDB Out-of-band. Handling event for '%s', an event enumeration '%d' not recognised"}, {IDS_LLDBOUTOFBAND_ERR_PROCESS_INVALID, "LLDB Out-of-band. Invalid '%s' in '%s'"}, Modified: lldb/trunk/tools/lldb-mi/MICmnResources.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnResources.h?rev=241591&r1=241590&r2=241591&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnResources.h (original) +++ lldb/trunk/tools/lldb-mi/MICmnResources.h Tue Jul 7 09:54:07 2015 @@ -140,7 +140,7 @@ enum IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, IDS_LLDBDEBUGGER_ERR_STOPLISTENER, -IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, +IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10993: [lldb-mi] Spell resource string name correctly.Broardcaster -> Broadcaster
This revision was automatically updated to reflect the committed changes. Closed by commit rL241591: [lldb-mi] Spell resource string name correctly. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10993?vs=29173&id=29178#toc Repository: rL LLVM http://reviews.llvm.org/D10993 Files: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp lldb/trunk/tools/lldb-mi/MICmnResources.cpp lldb/trunk/tools/lldb-mi/MICmnResources.h Index: lldb/trunk/tools/lldb-mi/MICmnResources.h === --- lldb/trunk/tools/lldb-mi/MICmnResources.h +++ lldb/trunk/tools/lldb-mi/MICmnResources.h @@ -140,7 +140,7 @@ IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, IDS_LLDBDEBUGGER_ERR_STOPLISTENER, -IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, +IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp @@ -423,13 +423,13 @@ const char *pBroadcasterName = vBroadcaster.GetName(); if (pBroadcasterName == nullptr) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); return MIstatus::failure; } CMIUtilString broadcasterName(pBroadcasterName); if (broadcasterName.length() == 0) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); return MIstatus::failure; } Index: lldb/trunk/tools/lldb-mi/MICmnResources.cpp === --- lldb/trunk/tools/lldb-mi/MICmnResources.cpp +++ lldb/trunk/tools/lldb-mi/MICmnResources.cpp @@ -129,7 +129,7 @@ {IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, "LLDB Debugger. Invalid client name '%s' "}, {IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, "LLDB Debugger. Client name '%s' not registered for listening events"}, {IDS_LLDBDEBUGGER_ERR_STOPLISTENER, "LLDB Debugger. Failure occurred stopping event for client '%s' SBBroadcaster '%s'"}, -{IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, +{IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, {IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, "LLDB Debugger. Unhandled event '%s'"}, {IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, "LLDB Out-of-band. Handling event for '%s', an event enumeration '%d' not recognised"}, {IDS_LLDBOUTOFBAND_ERR_PROCESS_INVALID, "LLDB Out-of-band. Invalid '%s' in '%s'"}, Index: lldb/trunk/tools/lldb-mi/MICmnResources.h === --- lldb/trunk/tools/lldb-mi/MICmnResources.h +++ lldb/trunk/tools/lldb-mi/MICmnResources.h @@ -140,7 +140,7 @@ IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, IDS_LLDBDEBUGGER_ERR_STOPLISTENER, -IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, +IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp @@ -423,13 +423,13 @@ const char *pBroadcasterName = vBroadcaster.GetName(); if (pBroadcasterName == nullptr) { -SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); +SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); return MIstatus::failure; } CMIUtilString broadcasterName(pBroadcasterName); if (broadcasterName.length() == 0) { -SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); +SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); return MIstatus::failure; } Index: lldb/trunk/tools/lldb-mi/MICmnResources.cpp === --- lldb/trunk/tools/lldb-mi/MICmnResources.cpp +++ lldb/trunk/tools/lldb-mi/MICmnResources.cpp @@ -129,7 +129,7 @@ {I
[Lldb-commits] [PATCH] D10994: cmake no longer needs to deal with -std=c++11 checks.LLVM requires and handles this now and has the correct compilerversion checks. This block of code for cmake in LLDB
brucem added a reviewer: labath. brucem added a subscriber: lldb-commits. cmake no longer needs to deal with -std=c++11 checks. http://reviews.llvm.org/D10994 Files: cmake/modules/LLDBConfig.cmake Index: cmake/modules/LLDBConfig.cmake === --- cmake/modules/LLDBConfig.cmake +++ cmake/modules/LLDBConfig.cmake @@ -88,32 +88,6 @@ include_directories(../clang/include) include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") -# lldb requires c++11 to build. Make sure that we have a compiler and standard -# library combination that can do that. -if (NOT MSVC) - # gcc and clang require the -std=c++0x or -std=c++11 flag. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") -if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11")) - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() - else() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -endif() - endif() -elseif (MSVC_VERSION LESS 1700) - message(FATAL_ERROR "The selected compiler does not support c++11 which is " - "required to build lldb.") -endif() - # Disable GCC warnings check_cxx_compiler_flag("-Wno-deprecated-declarations" CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) Index: cmake/modules/LLDBConfig.cmake === --- cmake/modules/LLDBConfig.cmake +++ cmake/modules/LLDBConfig.cmake @@ -88,32 +88,6 @@ include_directories(../clang/include) include_directories("${CMAKE_CURRENT_BINARY_DIR}/../clang/include") -# lldb requires c++11 to build. Make sure that we have a compiler and standard -# library combination that can do that. -if (NOT MSVC) - # gcc and clang require the -std=c++0x or -std=c++11 flag. - if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") -if (NOT ("${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+0x" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=c\\+\\+11" OR - "${CMAKE_CXX_FLAGS}" MATCHES "-std=gnu\\+\\+11")) - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -endif() - else() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -endif() - endif() -elseif (MSVC_VERSION LESS 1700) - message(FATAL_ERROR "The selected compiler does not support c++11 which is " - "required to build lldb.") -endif() - # Disable GCC warnings check_cxx_compiler_flag("-Wno-deprecated-declarations" CXX_SUPPORTS_NO_DEPRECATED_DECLARATIONS) ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10993: [lldb-mi] Spell resource string name correctly.Broardcaster -> Broadcaster
brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. [lldb-mi] Spell resource string name correctly. http://reviews.llvm.org/D10993 Files: tools/lldb-mi/MICmnLLDBDebugger.cpp tools/lldb-mi/MICmnResources.cpp tools/lldb-mi/MICmnResources.h Index: tools/lldb-mi/MICmnResources.h === --- tools/lldb-mi/MICmnResources.h +++ tools/lldb-mi/MICmnResources.h @@ -140,7 +140,7 @@ IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, IDS_LLDBDEBUGGER_ERR_STOPLISTENER, -IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, +IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, Index: tools/lldb-mi/MICmnResources.cpp === --- tools/lldb-mi/MICmnResources.cpp +++ tools/lldb-mi/MICmnResources.cpp @@ -129,7 +129,7 @@ {IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, "LLDB Debugger. Invalid client name '%s' "}, {IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, "LLDB Debugger. Client name '%s' not registered for listening events"}, {IDS_LLDBDEBUGGER_ERR_STOPLISTENER, "LLDB Debugger. Failure occurred stopping event for client '%s' SBBroadcaster '%s'"}, -{IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, +{IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, {IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, "LLDB Debugger. Unhandled event '%s'"}, {IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, "LLDB Out-of-band. Handling event for '%s', an event enumeration '%d' not recognised"}, {IDS_LLDBOUTOFBAND_ERR_PROCESS_INVALID, "LLDB Out-of-band. Invalid '%s' in '%s'"}, Index: tools/lldb-mi/MICmnLLDBDebugger.cpp === --- tools/lldb-mi/MICmnLLDBDebugger.cpp +++ tools/lldb-mi/MICmnLLDBDebugger.cpp @@ -423,13 +423,13 @@ const char *pBroadcasterName = vBroadcaster.GetName(); if (pBroadcasterName == nullptr) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); return MIstatus::failure; } CMIUtilString broadcasterName(pBroadcasterName); if (broadcasterName.length() == 0) { - SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); + SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDEMPTY))); return MIstatus::failure; } Index: tools/lldb-mi/MICmnResources.h === --- tools/lldb-mi/MICmnResources.h +++ tools/lldb-mi/MICmnResources.h @@ -140,7 +140,7 @@ IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, IDS_LLDBDEBUGGER_ERR_STOPLISTENER, -IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, +IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, Index: tools/lldb-mi/MICmnResources.cpp === --- tools/lldb-mi/MICmnResources.cpp +++ tools/lldb-mi/MICmnResources.cpp @@ -129,7 +129,7 @@ {IDS_LLDBDEBUGGER_ERR_INVALIDCLIENTNAME, "LLDB Debugger. Invalid client name '%s' "}, {IDS_LLDBDEBUGGER_ERR_CLIENTNOTREGISTERED, "LLDB Debugger. Client name '%s' not registered for listening events"}, {IDS_LLDBDEBUGGER_ERR_STOPLISTENER, "LLDB Debugger. Failure occurred stopping event for client '%s' SBBroadcaster '%s'"}, -{IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, +{IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME, "LLDB Debugger. Broadcaster's name '%s' is not valid"}, {IDS_LLDBDEBUGGER_WRN_UNKNOWN_EVENT, "LLDB Debugger. Unhandled event '%s'"}, {IDS_LLDBOUTOFBAND_ERR_UNKNOWN_EVENT, "LLDB Out-of-band. Handling event for '%s', an event enumeration '%d' not recognised"}, {IDS_LLDBOUTOFBAND_ERR_PROCESS_INVALID, "LLDB Out-of-band. Invalid '%s' in '%s'"}, Index: tools/lldb-mi/MICmnLLDBDebugger.cpp === --- tools/lldb-mi/MICmnLLDBDebugger.cpp +++ tools/lldb-mi/MICmnLLDBDebugger.cpp @@ -423,13 +423,13 @@ const char *pBroadcasterName = vBroadcaster.GetName(); if (pBroadcasterName == nullptr) { -SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROARDCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNULLPTR))); +SetErrorDescription(CMIUtilString::Format(MIRSRC(IDS_LLDBDEBUGGER_ERR_BROADCASTER_NAME), MIRSRC(IDS_WORD_INVALIDNUL
Re: [Lldb-commits] [PATCH] D10992: [lldb-mi] Fix typo in variable name.Seperated -> Separated.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241586: [lldb-mi] Fix typo in variable name. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10992?vs=29170&id=29171#toc Repository: rL LLVM http://reviews.llvm.org/D10992 Files: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -231,20 +231,20 @@ // MI print // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"}, // ..." -CMIUtilString strListCommaSeperated; +CMIUtilString strListCommaSeparated; for (MIuint nLevel = 0; nLevel < nFrames; nLevel++) { CMICmnMIValueTuple miValueTuple; if (!MIResponseFormFrameInfo(thread, nLevel, veFrameInfoFormat, miValueTuple)) return MIstatus::failure; const CMICmnMIValueResult miValueResult2("frame", miValueTuple); if (nLevel != 0) -strListCommaSeperated += ","; -strListCommaSeperated += miValueResult2.GetString(); +strListCommaSeparated += ","; +strListCommaSeparated += miValueResult2.GetString(); } -vwrThreadFrames = strListCommaSeperated; +vwrThreadFrames = strListCommaSeparated; return MIstatus::success; } Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -231,20 +231,20 @@ // MI print // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"}, // ..." -CMIUtilString strListCommaSeperated; +CMIUtilString strListCommaSeparated; for (MIuint nLevel = 0; nLevel < nFrames; nLevel++) { CMICmnMIValueTuple miValueTuple; if (!MIResponseFormFrameInfo(thread, nLevel, veFrameInfoFormat, miValueTuple)) return MIstatus::failure; const CMICmnMIValueResult miValueResult2("frame", miValueTuple); if (nLevel != 0) -strListCommaSeperated += ","; -strListCommaSeperated += miValueResult2.GetString(); +strListCommaSeparated += ","; +strListCommaSeparated += miValueResult2.GetString(); } -vwrThreadFrames = strListCommaSeperated; +vwrThreadFrames = strListCommaSeparated; return MIstatus::success; } ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241586 - [lldb-mi] Fix typo in variable name.
Author: brucem Date: Tue Jul 7 09:26:28 2015 New Revision: 241586 URL: http://llvm.org/viewvc/llvm-project?rev=241586&view=rev Log: [lldb-mi] Fix typo in variable name. Seperated -> Separated. Summary: [lldb-mi] Fix typo in variable name. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10992 Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp?rev=241586&r1=241585&r2=241586&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp Tue Jul 7 09:26:28 2015 @@ -231,7 +231,7 @@ CMICmnLLDBDebugSessionInfo::GetThreadFra // MI print // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"}, // ..." -CMIUtilString strListCommaSeperated; +CMIUtilString strListCommaSeparated; for (MIuint nLevel = 0; nLevel < nFrames; nLevel++) { CMICmnMIValueTuple miValueTuple; @@ -240,11 +240,11 @@ CMICmnLLDBDebugSessionInfo::GetThreadFra const CMICmnMIValueResult miValueResult2("frame", miValueTuple); if (nLevel != 0) -strListCommaSeperated += ","; -strListCommaSeperated += miValueResult2.GetString(); +strListCommaSeparated += ","; +strListCommaSeparated += miValueResult2.GetString(); } -vwrThreadFrames = strListCommaSeperated; +vwrThreadFrames = strListCommaSeparated; return MIstatus::success; } ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10992: [lldb-mi] Fix typo in variable name.Seperated -> Separated.
brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. [lldb-mi] Fix typo in variable name. http://reviews.llvm.org/D10992 Files: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp Index: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -231,20 +231,20 @@ // MI print // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"}, // ..." -CMIUtilString strListCommaSeperated; +CMIUtilString strListCommaSeparated; for (MIuint nLevel = 0; nLevel < nFrames; nLevel++) { CMICmnMIValueTuple miValueTuple; if (!MIResponseFormFrameInfo(thread, nLevel, veFrameInfoFormat, miValueTuple)) return MIstatus::failure; const CMICmnMIValueResult miValueResult2("frame", miValueTuple); if (nLevel != 0) -strListCommaSeperated += ","; -strListCommaSeperated += miValueResult2.GetString(); +strListCommaSeparated += ","; +strListCommaSeparated += miValueResult2.GetString(); } -vwrThreadFrames = strListCommaSeperated; +vwrThreadFrames = strListCommaSeparated; return MIstatus::success; } Index: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -231,20 +231,20 @@ // MI print // "frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"},frame={level=\"%d\",addr=\"0x%016" PRIx64 "\",func=\"%s\",args=[%s],file=\"%s\",fullname=\"%s\",line=\"%d\"}, // ..." -CMIUtilString strListCommaSeperated; +CMIUtilString strListCommaSeparated; for (MIuint nLevel = 0; nLevel < nFrames; nLevel++) { CMICmnMIValueTuple miValueTuple; if (!MIResponseFormFrameInfo(thread, nLevel, veFrameInfoFormat, miValueTuple)) return MIstatus::failure; const CMICmnMIValueResult miValueResult2("frame", miValueTuple); if (nLevel != 0) -strListCommaSeperated += ","; -strListCommaSeperated += miValueResult2.GetString(); +strListCommaSeparated += ","; +strListCommaSeparated += miValueResult2.GetString(); } -vwrThreadFrames = strListCommaSeperated; +vwrThreadFrames = strListCommaSeparated; return MIstatus::success; } ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241585 - [lldb-mi] Fix typos
Author: brucem Date: Tue Jul 7 09:04:40 2015 New Revision: 241585 URL: http://llvm.org/viewvc/llvm-project?rev=241585&view=rev Log: [lldb-mi] Fix typos Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.h lldb/trunk/tools/lldb-mi/MICmdBase.cpp lldb/trunk/tools/lldb-mi/MICmdBase.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.cpp lldb/trunk/tools/lldb-mi/MICmdCmdFile.h lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInvoker.cpp lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmdMgr.cpp lldb/trunk/tools/lldb-mi/MICmnBase.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.h lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueList.cpp lldb/trunk/tools/lldb-mi/MICmnResources.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStderr.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStdout.cpp lldb/trunk/tools/lldb-mi/MIDriver.cpp lldb/trunk/tools/lldb-mi/MIDriverBase.cpp lldb/trunk/tools/lldb-mi/MIDriverMain.cpp lldb/trunk/tools/lldb-mi/MIUtilMapIdToVariant.h lldb/trunk/tools/lldb-mi/MIUtilSingletonHelper.h lldb/trunk/tools/lldb-mi/MIUtilString.h lldb/trunk/tools/lldb-mi/MIUtilSystemLinux.cpp lldb/trunk/tools/lldb-mi/MIUtilSystemOsx.cpp lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.cpp lldb/trunk/tools/lldb-mi/MIUtilThreadBaseStd.cpp Modified: lldb/trunk/tools/lldb-mi/MICmdArgSet.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgSet.h?rev=241585&r1=241584&r2=241585&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgSet.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgSet.h Tue Jul 7 09:04:40 2015 @@ -28,7 +28,7 @@ class CMICmdArgValBase; // Argument objects added to *this container are owned by this container // and are deleted when this container goes out of scope. Allocate argument // objects on the heap. -// It is assummed the arguments to be parsed are read from left to right in +// It is assumed the arguments to be parsed are read from left to right in // order. The order added to *this container is the order they will parsed. // Gotchas: None. // Authors: Illya Rudkin 14/04/2014. Modified: lldb/trunk/tools/lldb-mi/MICmdBase.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdBase.cpp?rev=241585&r1=241584&r2=241585&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdBase.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdBase.cpp Tue Jul 7 09:04:40 2015 @@ -69,7 +69,7 @@ CMICmdBase::GetErrorDescription(void) co // options description string. // Type:Overridden. // Args:None. -// Return: CMIUtilString & - Command decription. +// Return: CMIUtilString & - Command description. // Throws: None. //-- const CMIUtilString & @@ -141,7 +141,7 @@ CMICmdBase::GetMIResultRecord(void) cons //++ // Details: Retrieve from the command additional MI result to its 1 line response. -// Because of using LLDB addtional 'fake'/hack output is sometimes required to +// Because of using LLDB additional 'fake'/hack output is sometimes required to // help the driver client operate i.e. Eclipse. // Type:Overridden. // Args:None. @@ -156,7 +156,7 @@ CMICmdBase::GetMIResultRecordExtra(void) //++ // Details: Hss *this command got additional MI result to its 1 line response. -// Because of using LLDB addtional 'fake'/hack output is sometimes required to +// Because of using LLDB additional 'fake'/hack output is sometimes required to // help the driver client operate i.e. Eclipse. // Type:Overridden. // Args:None. Modified: lldb/trunk/tools/lldb-mi/MICmdBase.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdBase.h?rev=241585&r1=241584&r2=241585&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdBase.h (original) +++ lldb/trunk/tools/lld
Re: [Lldb-commits] [PATCH] D10959: [lldb-mi] Use 'override' on overridden virtual methods.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241457: [lldb-mi] Use 'override' on overridden virtual methods. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10959?vs=29086&id=29092#toc Repository: rL LLVM http://reviews.llvm.org/D10959 Files: lldb/trunk/tools/lldb-mi/MICmdArgValBase.h lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.h lldb/trunk/tools/lldb-mi/MICmdArgValListBase.h lldb/trunk/tools/lldb-mi/MICmdArgValListOfN.h lldb/trunk/tools/lldb-mi/MICmdArgValNumber.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.h lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.h lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MICmdArgValThreadGrp.h lldb/trunk/tools/lldb-mi/MICmdCmd.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.h lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.h lldb/trunk/tools/lldb-mi/MICmdCmdFile.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbThread.h lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.h lldb/trunk/tools/lldb-mi/MICmdCmdStack.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportList.h lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.h lldb/trunk/tools/lldb-mi/MICmdCmdTarget.h lldb/trunk/tools/lldb-mi/MICmdCmdThread.h lldb/trunk/tools/lldb-mi/MICmdCmdTrace.h lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdFactory.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.h lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmdMgr.h lldb/trunk/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h lldb/trunk/tools/lldb-mi/MICmnLog.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h lldb/trunk/tools/lldb-mi/MICmnMIValue.h lldb/trunk/tools/lldb-mi/MICmnMIValueConst.h lldb/trunk/tools/lldb-mi/MICmnMIValueList.h lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.h lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStderr.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MICmnStreamStdout.h lldb/trunk/tools/lldb-mi/MICmnThreadMgrStd.h lldb/trunk/tools/lldb-mi/MIDriver.h lldb/trunk/tools/lldb-mi/MIDriverMgr.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilMapIdToVariant.h lldb/trunk/tools/lldb-mi/MIUtilSingletonBase.h lldb/trunk/tools/lldb-mi/MIUtilVariant.h Index: lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.h === --- lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.h +++ lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.h @@ -52,11 +52,11 @@ // Overridden: public: // From CMICmdInvoker::ICmd -virtual bool Execute(void); -virtual bool Acknowledge(void); -virtual bool ParseArgs(void); +bool Execute(void) override; +bool Acknowledge(void) override; +bool ParseArgs(void) override; // From CMICmnBase -/* dtor */ virtual ~CMICmdCmdGdbShow(void); +/* dtor */ ~CMICmdCmdGdbShow(void) override; // Typedefs: private: Index: lldb/trunk/tools/lldb-mi/MICmnMIValue.h === --- lldb/trunk/tools/lldb-mi/MICmnMIValue.h +++ lldb/trunk/tools/lldb-mi/MICmnMIValue.h @@ -43,7 +43,7 @@ // Overridden: public: // From CMICmnBase -/* dtor */ virtual ~CMICmnMIValue(void); +/* dtor */ ~CMICmnMIValue(void) override; // Attributes: protected: Index: lldb/trunk/tools/lldb-mi/MICmdFactory.h === --- lldb/trunk/tools/lldb-mi/MICmdFactory.h +++ lldb/trunk/tools/lldb-mi/MICmdFactory.h @@ -55,8 +55,8 @@ // Methods: public: -bool Initialize(void); -bool Shutdown(void); +bool Initialize(void) override; +bool Shutdown(void) override; bool CmdRegister(const CMIUtilString &vMiCmd, CmdCreatorFnPtr vCmdCreateFn); bool CmdCreate(const CMIUtilString &vMiCmd, const SMICmdData &vCmdData, CMICmdBase *&vpNewCmd); bool CmdExist(const CMIUtilString &vMiCmd) const; @@ -73,7 +73,7 @@ // Overridden: private: // From CMICmnBase -/* dtor */ virtual ~CMICmdFactory(void); +/* dtor */ ~CMICmdFactory(void) override; // Typedefs: private: Index: lldb/trunk/tools/lldb-mi/MIDriver.h ==
[Lldb-commits] [lldb] r241457 - [lldb-mi] Use 'override' on overridden virtual methods.
Author: brucem Date: Mon Jul 6 10:48:55 2015 New Revision: 241457 URL: http://llvm.org/viewvc/llvm-project?rev=241457&view=rev Log: [lldb-mi] Use 'override' on overridden virtual methods. Summary: [lldb-mi] Use 'override' on overridden virtual methods. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10959 Modified: lldb/trunk/tools/lldb-mi/MICmdArgValBase.h lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.h lldb/trunk/tools/lldb-mi/MICmdArgValListBase.h lldb/trunk/tools/lldb-mi/MICmdArgValListOfN.h lldb/trunk/tools/lldb-mi/MICmdArgValNumber.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.h lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.h lldb/trunk/tools/lldb-mi/MICmdArgValPrintValues.h lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MICmdArgValThreadGrp.h lldb/trunk/tools/lldb-mi/MICmdCmd.h lldb/trunk/tools/lldb-mi/MICmdCmdBreak.h lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdEnviro.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.h lldb/trunk/tools/lldb-mi/MICmdCmdFile.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbSet.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbShow.h lldb/trunk/tools/lldb-mi/MICmdCmdGdbThread.h lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.h lldb/trunk/tools/lldb-mi/MICmdCmdStack.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportInfo.h lldb/trunk/tools/lldb-mi/MICmdCmdSupportList.h lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.h lldb/trunk/tools/lldb-mi/MICmdCmdTarget.h lldb/trunk/tools/lldb-mi/MICmdCmdThread.h lldb/trunk/tools/lldb-mi/MICmdCmdTrace.h lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdFactory.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.h lldb/trunk/tools/lldb-mi/MICmdInvoker.h lldb/trunk/tools/lldb-mi/MICmdMgr.h lldb/trunk/tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h lldb/trunk/tools/lldb-mi/MICmnLLDBBroadcaster.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h lldb/trunk/tools/lldb-mi/MICmnLog.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.h lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.h lldb/trunk/tools/lldb-mi/MICmnMIValue.h lldb/trunk/tools/lldb-mi/MICmnMIValueConst.h lldb/trunk/tools/lldb-mi/MICmnMIValueList.h lldb/trunk/tools/lldb-mi/MICmnMIValueResult.h lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.h lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStderr.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MICmnStreamStdout.h lldb/trunk/tools/lldb-mi/MICmnThreadMgrStd.h lldb/trunk/tools/lldb-mi/MIDriver.h lldb/trunk/tools/lldb-mi/MIDriverMgr.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilMapIdToVariant.h lldb/trunk/tools/lldb-mi/MIUtilSingletonBase.h lldb/trunk/tools/lldb-mi/MIUtilVariant.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgValBase.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValBase.h?rev=241457&r1=241456&r2=241457&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValBase.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValBase.h Mon Jul 6 10:48:55 2015 @@ -43,18 +43,18 @@ class CMICmdArgValBase : public CMICmdAr // Overrideable: public: -/* dtor */ virtual ~CMICmdArgValBase(void); +/* dtor */ ~CMICmdArgValBase(void) override; // Overridden: public: // From CMICmdArgSet::IArg -virtual bool GetFound(void) const; -virtual bool GetIsHandledByCmd(void) const; -virtual bool GetIsMandatory(void) const; -virtual bool GetIsMissingOptions(void) const; -virtual const CMIUtilString &GetName(void) const; -virtual bool GetValid(void) const; -virtual bool Validate(CMICmdArgContext &vwArgContext); +bool GetFound(void) const override; +bool GetIsHandledByCmd(void) const override; +bool GetIsMandatory(void) const override; +bool GetIsMissingOptions(void) const override; +const CMIUtilString &GetName(void) const override; +bool GetValid(void) const override; +bool Validate(CMICmdArgContext &vwArgContext) override; // Attributes: protected: Modified: lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h?rev=241457&r1=241456&r2=241457&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValConsume.h Mon Jul 6 10:48:55 2015 @@ -45,7
[Lldb-commits] [lldb] r241448 - [lldb-mi] Fix misc. typos in comments.
Author: brucem Date: Mon Jul 6 09:37:53 2015 New Revision: 241448 URL: http://llvm.org/viewvc/llvm-project?rev=241448&view=rev Log: [lldb-mi] Fix misc. typos in comments. Modified: lldb/trunk/tools/lldb-mi/MICmdMgr.h lldb/trunk/tools/lldb-mi/MICmnLog.h lldb/trunk/tools/lldb-mi/MIDriver.h lldb/trunk/tools/lldb-mi/MIDriverMgr.h Modified: lldb/trunk/tools/lldb-mi/MICmdMgr.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdMgr.h?rev=241448&r1=241447&r2=241448&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdMgr.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdMgr.h Mon Jul 6 09:37:53 2015 @@ -27,7 +27,7 @@ class CMICmdBase; //++ // Details: MI command manager. Oversees command operations, controls command // production and the running of commands. -// Command Invoker, Command Factory and Command Monitor while independant +// Command Invoker, Command Factory and Command Monitor while independent // units are overseen/managed by *this manager. // A singleton class. // Gotchas: None. Modified: lldb/trunk/tools/lldb-mi/MICmnLog.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLog.h?rev=241448&r1=241447&r2=241448&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLog.h (original) +++ lldb/trunk/tools/lldb-mi/MICmnLog.h Mon Jul 6 09:37:53 2015 @@ -20,7 +20,7 @@ //++ // Details: MI common code implementation class. Handle application trace // activity logging. Medium objects derived from the Medium abstract -/// class are registered with this loggor. The function Write is called +/// class are registered with this logger. The function Write is called // by a client callee to log information. That information is given to // registered relevant mediums. The medium file is registered during // *this logs initialization so it will always have a file log for the @@ -37,14 +37,14 @@ class CMICmnLog : public MI::ISingleton< // Enumeration: public: //++ -// Description: Data given to the Logger can be of serveral types. The Logger can be +// Description: Data given to the Logger can be of several types. The Logger can be // set at levels of verbosity. Can determine how data is sent to one or // mediums. //-- enum ELogVerbosity { // Descriptions of what 'may' occur, depends ultimately on the medium itself. See the medium. eLogVerbosity_FnTrace = 0x0004, // Debug function stack call tracing -eLogVerbosity_DbgOp = 0x0008, // Send a string to the debugguer for display (not implemented) +eLogVerbosity_DbgOp = 0x0008, // Send a string to the debugger for display (not implemented) eLogVerbosity_ClientMsg = 0x0010, // A client using MI can insert messages into the log (not implemented) eLogVerbosity_Log = 0x0020// Send to only the Log file. }; Modified: lldb/trunk/tools/lldb-mi/MIDriver.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIDriver.h?rev=241448&r1=241447&r2=241448&view=diff == --- lldb/trunk/tools/lldb-mi/MIDriver.h (original) +++ lldb/trunk/tools/lldb-mi/MIDriver.h Mon Jul 6 09:37:53 2015 @@ -46,7 +46,7 @@ class CMIDriver : public CMICmnBase, // Enumerations: public: //++ -- -// Details: The MI Driver has a running state which is used to help determin +// Details: The MI Driver has a running state which is used to help determine // which specific action(s) it should take or not allow. // The driver when operational and not shutting down alternates // between eDriverState_RunningNotDebugging and Modified: lldb/trunk/tools/lldb-mi/MIDriverMgr.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIDriverMgr.h?rev=241448&r1=241447&r2=241448&view=diff == --- lldb/trunk/tools/lldb-mi/MIDriverMgr.h (original) +++ lldb/trunk/tools/lldb-mi/MIDriverMgr.h Mon Jul 6 09:37:53 2015 @@ -32,7 +32,7 @@ // those objects (modules/components) to support it's own functionality). // The Driver manager is the first object instantiated as part of the // MI code base. It is also the first thing to interpret the command -// line arguments passed to the executeable. Bases on options it +// line argume
[Lldb-commits] [PATCH] D10959: [lldb-mi] Use 'override' on overridden virtual methods.
brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. [lldb-mi] Use 'override' on overridden virtual methods. http://reviews.llvm.org/D10959 Files: tools/lldb-mi/MICmdArgValBase.h tools/lldb-mi/MICmdArgValConsume.h tools/lldb-mi/MICmdArgValFile.h tools/lldb-mi/MICmdArgValListBase.h tools/lldb-mi/MICmdArgValListOfN.h tools/lldb-mi/MICmdArgValNumber.h tools/lldb-mi/MICmdArgValOptionLong.h tools/lldb-mi/MICmdArgValOptionShort.h tools/lldb-mi/MICmdArgValPrintValues.h tools/lldb-mi/MICmdArgValString.h tools/lldb-mi/MICmdArgValThreadGrp.h tools/lldb-mi/MICmdCmd.h tools/lldb-mi/MICmdCmdBreak.h tools/lldb-mi/MICmdCmdData.h tools/lldb-mi/MICmdCmdEnviro.h tools/lldb-mi/MICmdCmdExec.h tools/lldb-mi/MICmdCmdFile.h tools/lldb-mi/MICmdCmdGdbInfo.h tools/lldb-mi/MICmdCmdGdbSet.h tools/lldb-mi/MICmdCmdGdbShow.h tools/lldb-mi/MICmdCmdGdbThread.h tools/lldb-mi/MICmdCmdMiscellanous.h tools/lldb-mi/MICmdCmdStack.h tools/lldb-mi/MICmdCmdSupportInfo.h tools/lldb-mi/MICmdCmdSupportList.h tools/lldb-mi/MICmdCmdSymbol.h tools/lldb-mi/MICmdCmdTarget.h tools/lldb-mi/MICmdCmdThread.h tools/lldb-mi/MICmdCmdTrace.h tools/lldb-mi/MICmdCmdVar.h tools/lldb-mi/MICmdFactory.h tools/lldb-mi/MICmdInterpreter.h tools/lldb-mi/MICmdInvoker.h tools/lldb-mi/MICmdMgr.h tools/lldb-mi/MICmdMgrSetCmdDeleteCallback.h tools/lldb-mi/MICmnLLDBBroadcaster.h tools/lldb-mi/MICmnLLDBDebugSessionInfo.h tools/lldb-mi/MICmnLLDBDebugger.h tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.h tools/lldb-mi/MICmnLog.h tools/lldb-mi/MICmnLogMediumFile.h tools/lldb-mi/MICmnMIOutOfBandRecord.h tools/lldb-mi/MICmnMIResultRecord.h tools/lldb-mi/MICmnMIValue.h tools/lldb-mi/MICmnMIValueConst.h tools/lldb-mi/MICmnMIValueList.h tools/lldb-mi/MICmnMIValueResult.h tools/lldb-mi/MICmnMIValueTuple.h tools/lldb-mi/MICmnResources.h tools/lldb-mi/MICmnStreamStderr.h tools/lldb-mi/MICmnStreamStdin.h tools/lldb-mi/MICmnStreamStdout.h tools/lldb-mi/MICmnThreadMgrStd.h tools/lldb-mi/MIDriver.h tools/lldb-mi/MIDriverMgr.h tools/lldb-mi/MIUtilFileStd.h tools/lldb-mi/MIUtilMapIdToVariant.h tools/lldb-mi/MIUtilSingletonBase.h tools/lldb-mi/MIUtilVariant.h Index: tools/lldb-mi/MIUtilVariant.h === --- tools/lldb-mi/MIUtilVariant.h +++ tools/lldb-mi/MIUtilVariant.h @@ -95,18 +95,18 @@ // Overridden: public: // From CDataObjectBase -virtual ~CDataObject(void); -virtual CDataObjectBase *CreateCopyOfSelf(void); -virtual bool GetIsDerivedClass(void) const; +~CDataObject(void) override; +CDataObjectBase *CreateCopyOfSelf(void) override; +bool GetIsDerivedClass(void) const override; // Overrideable: private: virtual void Duplicate(const CDataObject &vrOther); // Overridden: private: // From CDataObjectBase -virtual void Destroy(void); +void Destroy(void) override; // Attributes: private: Index: tools/lldb-mi/MIUtilSingletonBase.h === --- tools/lldb-mi/MIUtilSingletonBase.h +++ tools/lldb-mi/MIUtilSingletonBase.h @@ -22,8 +22,8 @@ // // Overridden: // public: // // From MI::ISingleton -// virtual bool Initialize( void ); -// virtual bool Shutdown( void ); +// bool Initialize(void) override; +// bool Shutdown(void) override; // }; //++ Index: tools/lldb-mi/MIUtilMapIdToVariant.h === --- tools/lldb-mi/MIUtilMapIdToVariant.h +++ tools/lldb-mi/MIUtilMapIdToVariant.h @@ -42,7 +42,7 @@ // Overridden: public: // From CMICmnBase -/* dtor */ virtual ~CMIUtilMapIdToVariant(void); +/* dtor */ ~CMIUtilMapIdToVariant(void) override; // Typdefs: private: Index: tools/lldb-mi/MIUtilFileStd.h === --- tools/lldb-mi/MIUtilFileStd.h +++ tools/lldb-mi/MIUtilFileStd.h @@ -41,7 +41,7 @@ // Overridden: public: // From CMICmnBase -/* dtor */ virtual ~CMIUtilFileStd(void); +/* dtor */ ~CMIUtilFileStd(void) override; // Attributes: private: Index: tools/lldb-mi/MIDriverMgr.h === --- tools/lldb-mi/MIDriverMgr.h +++ tools/lldb-mi/MIDriverMgr.h @@ -75,8 +75,8 @@ // Methods: public: // MI system -bool Initialize(void); -bool Shutdown(void); +bool Initialize(void) override; +bool Shutdown(void) override; // CMIUtilString GetAppVersion(void) const; bool RegisterDriver(const IDriver &vrADriver, const CMIUtilString &vrDriverID); @@ -115,7 +115,7 @@ // Overridden: private: // From CMICm
Re: [Lldb-commits] [PATCH] D10943: Use string::find(char) for single character strings.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241390: Use string::find(char) for single character strings. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10943?vs=29045&id=29046#toc Repository: rL LLVM http://reviews.llvm.org/D10943 Files: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp Index: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp === --- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp @@ -1750,17 +1750,17 @@ // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- start address -const size_t nStartAddressStartPos = rLine.find("["); -const size_t nStartAddressEndPos = rLine.find("-"); +const size_t nStartAddressStartPos = rLine.find('['); +const size_t nStartAddressEndPos = rLine.find('-'); const size_t nStartAddressLen = nStartAddressEndPos - nStartAddressStartPos - 1; const CMIUtilString strStartAddress(rLine.substr(nStartAddressStartPos + 1, nStartAddressLen).c_str()); const CMICmnMIValueConst miValueConst(strStartAddress); const CMICmnMIValueResult miValueResult("start", miValueConst); CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult); // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- end address -const size_t nEndAddressEndPos = rLine.find(")"); +const size_t nEndAddressEndPos = rLine.find(')'); const size_t nEndAddressLen = nEndAddressEndPos - nStartAddressEndPos - 1; const CMIUtilString strEndAddress(rLine.substr(nStartAddressEndPos + 1, nEndAddressLen).c_str()); const CMICmnMIValueConst miValueConst2(strEndAddress); Index: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp @@ -231,11 +231,11 @@ return false; // Look for -f type short options, if found reject -if ((0 == vrTxt.find("-")) && (vrTxt.length() == 2)) +if ((0 == vrTxt.find('-')) && (vrTxt.length() == 2)) return false; // Look for thread group i1 i2 i3, if found reject -if ((vrTxt.find("i") == 0) && ::isdigit(vrTxt[1])) +if ((vrTxt.find('i') == 0) && ::isdigit(vrTxt[1])) return false; // Look for numbers, if found reject Index: lldb/trunk/tools/lldb-mi/MICmdFactory.cpp === --- lldb/trunk/tools/lldb-mi/MICmdFactory.cpp +++ lldb/trunk/tools/lldb-mi/MICmdFactory.cpp @@ -159,7 +159,7 @@ return false; } -const size_t nPos = vMiCmd.find(" "); +const size_t nPos = vMiCmd.find(' '); if (nPos != std::string::npos) bValid = false; Index: lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp @@ -80,7 +80,7 @@ return false; // Look for -f short option -nPos = vrTxt.find("-"); +nPos = vrTxt.find('-'); if (nPos != 0) return false; Index: lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp === --- lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp +++ lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp @@ -153,7 +153,7 @@ CMICmdInterpreter::MiHasCmdTokenEndingHyphen(const CMIUtilString &vTextLine) { // The hyphen is mandatory -const size_t nPos = vTextLine.find("-", 0); +const size_t nPos = vTextLine.find('-', 0); if ((nPos == std::string::npos)) return false; @@ -215,7 +215,7 @@ bool CMICmdInterpreter::MiHasCmdTokenPresent(const CMIUtilString &vTextLine) { -const size_t nPos = vTextLine.find("-", 0); +const size_t nPos = vTextLine.find('-', 0); return (nPos > 0); } @@ -246,12 +246,12 @@ } else { -nPos = vTextLine.find("-", 0); +nPos = vTextLine.find('-', 0); } bool bFoundCmd = false; const size_t nLen = vTextLine.length(); -const size_t nPos2 = vTextLine.find(" ", nPos); +const size_t nPos2 = vTextLine.find(' ', nPos); if (nPos2 != std::string::npos) { if (nPos2 == nLen) In
[Lldb-commits] [lldb] r241390 - Use string::find(char) for single character strings.
Author: brucem Date: Sat Jul 4 00:16:58 2015 New Revision: 241390 URL: http://llvm.org/viewvc/llvm-project?rev=241390&view=rev Log: Use string::find(char) for single character strings. Summary: Use string::find(char) for single character strings. Reviewers: abidh, ki.stfu, clayborg Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10943 Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=241390&r1=241389&r2=241390&view=diff == --- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original) +++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Sat Jul 4 00:16:58 2015 @@ -1558,7 +1558,7 @@ ObjectFileELF::GetSegmentDataByIndex(lld std::string ObjectFileELF::StripLinkerSymbolAnnotations(llvm::StringRef symbol_name) const { -size_t pos = symbol_name.find("@"); +size_t pos = symbol_name.find('@'); return symbol_name.substr(0, pos).str(); } Modified: lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp?rev=241390&r1=241389&r2=241390&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValOptionShort.cpp Sat Jul 4 00:16:58 2015 @@ -80,7 +80,7 @@ CMICmdArgValOptionShort::IsArgShortOptio return false; // Look for -f short option -nPos = vrTxt.find("-"); +nPos = vrTxt.find('-'); if (nPos != 0) return false; Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp?rev=241390&r1=241389&r2=241390&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp Sat Jul 4 00:16:58 2015 @@ -231,11 +231,11 @@ CMICmdArgValString::IsStringArgSingleTex return false; // Look for -f type short options, if found reject -if ((0 == vrTxt.find("-")) && (vrTxt.length() == 2)) +if ((0 == vrTxt.find('-')) && (vrTxt.length() == 2)) return false; // Look for thread group i1 i2 i3, if found reject -if ((vrTxt.find("i") == 0) && ::isdigit(vrTxt[1])) +if ((vrTxt.find('i') == 0) && ::isdigit(vrTxt[1])) return false; // Look for numbers, if found reject Modified: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp?rev=241390&r1=241389&r2=241390&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp Sat Jul 4 00:16:58 2015 @@ -1750,8 +1750,8 @@ CMICmdCmdDataInfoLine::Acknowledge(void) // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- start address -const size_t nStartAddressStartPos = rLine.find("["); -const size_t nStartAddressEndPos = rLine.find("-"); +const size_t nStartAddressStartPos = rLine.find('['); +const size_t nStartAddressEndPos = rLine.find('-'); const size_t nStartAddressLen = nStartAddressEndPos - nStartAddressStartPos - 1; const CMIUtilString strStartAddress(rLine.substr(nStartAddressStartPos + 1, nStartAddressLen).c_str()); const CMICmnMIValueConst miValueConst(strStartAddress); @@ -1760,7 +1760,7 @@ CMICmdCmdDataInfoLine::Acknowledge(void) // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- end address -const size_t nEndAddressEndPos = rLine.find(")"); +const size_t nEndAddressEndPos = rLine.find(')'); const size_t nEndAddressLen = nEndAddressEndPos - nStartAddressEndPos - 1; const CMIUtilString strEndAddress(rLine.substr(nStartAddressEndPos + 1, nEndAddressLen).c_str()); const CMICmnMIValueConst miValueConst2(strEndAddress); Modified: lldb/trunk/tools/lldb-mi/MICmdFactory.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdFactory.cpp?rev=241390&r1=241389&r2=241390&view=diff ==
[Lldb-commits] [PATCH] D10943: Use string::find(char) for single character strings.
brucem created this revision. brucem added reviewers: abidh, ki.stfu, clayborg. brucem added a subscriber: lldb-commits. Use string::find(char) for single character strings. http://reviews.llvm.org/D10943 Files: source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp tools/lldb-mi/MICmdArgValOptionShort.cpp tools/lldb-mi/MICmdArgValString.cpp tools/lldb-mi/MICmdCmdData.cpp tools/lldb-mi/MICmdFactory.cpp tools/lldb-mi/MICmdInterpreter.cpp Index: tools/lldb-mi/MICmdInterpreter.cpp === --- tools/lldb-mi/MICmdInterpreter.cpp +++ tools/lldb-mi/MICmdInterpreter.cpp @@ -153,7 +153,7 @@ CMICmdInterpreter::MiHasCmdTokenEndingHyphen(const CMIUtilString &vTextLine) { // The hyphen is mandatory -const size_t nPos = vTextLine.find("-", 0); +const size_t nPos = vTextLine.find('-', 0); if ((nPos == std::string::npos)) return false; @@ -215,7 +215,7 @@ bool CMICmdInterpreter::MiHasCmdTokenPresent(const CMIUtilString &vTextLine) { -const size_t nPos = vTextLine.find("-", 0); +const size_t nPos = vTextLine.find('-', 0); return (nPos > 0); } @@ -246,12 +246,12 @@ } else { -nPos = vTextLine.find("-", 0); +nPos = vTextLine.find('-', 0); } bool bFoundCmd = false; const size_t nLen = vTextLine.length(); -const size_t nPos2 = vTextLine.find(" ", nPos); +const size_t nPos2 = vTextLine.find(' ', nPos); if (nPos2 != std::string::npos) { if (nPos2 == nLen) Index: tools/lldb-mi/MICmdFactory.cpp === --- tools/lldb-mi/MICmdFactory.cpp +++ tools/lldb-mi/MICmdFactory.cpp @@ -159,7 +159,7 @@ return false; } -const size_t nPos = vMiCmd.find(" "); +const size_t nPos = vMiCmd.find(' '); if (nPos != std::string::npos) bValid = false; Index: tools/lldb-mi/MICmdCmdData.cpp === --- tools/lldb-mi/MICmdCmdData.cpp +++ tools/lldb-mi/MICmdCmdData.cpp @@ -1750,17 +1750,17 @@ // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- start address -const size_t nStartAddressStartPos = rLine.find("["); -const size_t nStartAddressEndPos = rLine.find("-"); +const size_t nStartAddressStartPos = rLine.find('['); +const size_t nStartAddressEndPos = rLine.find('-'); const size_t nStartAddressLen = nStartAddressEndPos - nStartAddressStartPos - 1; const CMIUtilString strStartAddress(rLine.substr(nStartAddressStartPos + 1, nStartAddressLen).c_str()); const CMICmnMIValueConst miValueConst(strStartAddress); const CMICmnMIValueResult miValueResult("start", miValueConst); CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done, miValueResult); // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^^ -- end address -const size_t nEndAddressEndPos = rLine.find(")"); +const size_t nEndAddressEndPos = rLine.find(')'); const size_t nEndAddressLen = nEndAddressEndPos - nStartAddressEndPos - 1; const CMIUtilString strEndAddress(rLine.substr(nStartAddressEndPos + 1, nEndAddressLen).c_str()); const CMICmnMIValueConst miValueConst2(strEndAddress); Index: tools/lldb-mi/MICmdArgValString.cpp === --- tools/lldb-mi/MICmdArgValString.cpp +++ tools/lldb-mi/MICmdArgValString.cpp @@ -231,11 +231,11 @@ return false; // Look for -f type short options, if found reject -if ((0 == vrTxt.find("-")) && (vrTxt.length() == 2)) +if ((0 == vrTxt.find('-')) && (vrTxt.length() == 2)) return false; // Look for thread group i1 i2 i3, if found reject -if ((vrTxt.find("i") == 0) && ::isdigit(vrTxt[1])) +if ((vrTxt.find('i') == 0) && ::isdigit(vrTxt[1])) return false; // Look for numbers, if found reject Index: tools/lldb-mi/MICmdArgValOptionShort.cpp === --- tools/lldb-mi/MICmdArgValOptionShort.cpp +++ tools/lldb-mi/MICmdArgValOptionShort.cpp @@ -80,7 +80,7 @@ return false; // Look for -f short option -nPos = vrTxt.find("-"); +nPos = vrTxt.find('-'); if (nPos != 0) return false; Index: source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp === --- source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -1558,7 +1558,7 @@ std::string ObjectFileELF::StripLinkerSymbolAnnotations(llvm::StringRef symbol_name) con
[Lldb-commits] [lldb] r241360 - [lldb-mi] Use size_t where appropriate.
Author: brucem Date: Fri Jul 3 10:40:44 2015 New Revision: 241360 URL: http://llvm.org/viewvc/llvm-project?rev=241360&view=rev Log: [lldb-mi] Use size_t where appropriate. Summary: Many places should have been using size_t rather than MIuint or MIint. This is particularly true for code that uses std::string::find(), std::string::rfind(), std::string::size(), and related methods. Reviewers: abidh, ki.stfu, domipheus Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10931 Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.cpp lldb/trunk/tools/lldb-mi/MIDriver.cpp lldb/trunk/tools/lldb-mi/MIDriverMgr.cpp lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp?rev=241360&r1=241359&r2=241360&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp Fri Jul 3 10:40:44 2015 @@ -85,16 +85,16 @@ CMICmdArgContext::RemoveArg(const CMIUti if (vArg.empty()) return MIstatus::success; -const MIuint nLen = vArg.length(); -const MIuint nLenCntxt = m_strCmdArgsAndOptions.length(); +const size_t nLen = vArg.length(); +const size_t nLenCntxt = m_strCmdArgsAndOptions.length(); if (nLen > nLenCntxt) return MIstatus::failure; -MIuint nExtraSpace = 0; -MIint nPos = m_strCmdArgsAndOptions.find(vArg); +size_t nExtraSpace = 0; +size_t nPos = m_strCmdArgsAndOptions.find(vArg); while (1) { -if (nPos == (MIint)std::string::npos) +if (nPos == std::string::npos) return MIstatus::success; bool bPass1 = false; @@ -106,7 +106,7 @@ CMICmdArgContext::RemoveArg(const CMIUti else bPass1 = true; -const MIuint nEnd = nPos + nLen; +const size_t nEnd = nPos + nLen; if (bPass1) { @@ -129,7 +129,7 @@ CMICmdArgContext::RemoveArg(const CMIUti nPos = m_strCmdArgsAndOptions.find(vArg, nEnd); } -const MIuint nPosEnd = nLen + nExtraSpace; +const size_t nPosEnd = nLen + nExtraSpace; m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.replace(nPos, nPosEnd, "").c_str(); m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.Trim(); Modified: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp?rev=241360&r1=241359&r2=241360&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp Fri Jul 3 10:40:44 2015 @@ -122,8 +122,8 @@ CMICmdArgValFile::GetFileNamePath(const // Look for a space in the path const char cSpace = ' '; -const MIint nPos = fileNamePath.find(cSpace); -if (nPos != (MIint)std::string::npos) +const size_t nPos = fileNamePath.find(cSpace); +if (nPos != std::string::npos) fileNamePath = CMIUtilString::Format("\"%s\"", fileNamePath.c_str()); return fileNamePath; @@ -146,7 +146,7 @@ CMICmdArgValFile::IsFilePath(const CMIUt const bool bHaveBckSlash = (vrFileNamePath.find_first_of("\\") != std::string::npos); // Look for --someLongOption -MIint nPos = vrFileNamePath.find_first_of("--"); +size_t nPos = vrFileNamePath.find_first_of("--"); const bool bLong = (nPos == 0); if (bLong) return false; Modified: lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp?rev=241360&r1=241359&r2=241360&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp Fri Jul 3 10:40:44 2015 @@ -254,7 +254,7 @@ CMICmdArgValOptionLong::IsArgLongOption( if (bHavePosSlash || bHaveBckSlash) return false; -const MIint nPos = vrTxt.find_first_of("--"); +const size_t nPos = vrTxt.find_first_of("--"); if (nPos != 0) return false; Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp?rev=241360&r1=241359&r2=241360&view=diff
Re: [Lldb-commits] [PATCH] D10931: [lldb-mi] Use size_t where appropriate.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241360: [lldb-mi] Use size_t where appropriate. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10931?vs=29024&id=29030#toc Repository: rL LLVM http://reviews.llvm.org/D10931 Files: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp lldb/trunk/tools/lldb-mi/MICmdFactory.cpp lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.cpp lldb/trunk/tools/lldb-mi/MIDriver.cpp lldb/trunk/tools/lldb-mi/MIDriverMgr.cpp lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Index: lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp === --- lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp +++ lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp @@ -256,9 +256,9 @@ CMIUtilString CMIUtilFileStd::StripOffFileName(const CMIUtilString &vDirectoryPath) { -const MIint nPos = vDirectoryPath.rfind('\\'); -MIint nPos2 = vDirectoryPath.rfind('/'); -if ((nPos == (MIint)std::string::npos) && (nPos2 == (MIint)std::string::npos)) +const size_t nPos = vDirectoryPath.rfind('\\'); +size_t nPos2 = vDirectoryPath.rfind('/'); +if ((nPos == std::string::npos) && (nPos2 == std::string::npos)) return vDirectoryPath; if (nPos > nPos2) Index: lldb/trunk/tools/lldb-mi/MIDriver.cpp === --- lldb/trunk/tools/lldb-mi/MIDriver.cpp +++ lldb/trunk/tools/lldb-mi/MIDriver.cpp @@ -862,7 +862,7 @@ // Also possible case when command not found: // 001 //^ -- i.e. only tokens are present (or empty string at all) -const MIuint nCommandOffset = vTextLine.find_first_not_of(digits); +const size_t nCommandOffset = vTextLine.find_first_not_of(digits); // 2. Check if command is empty // For example: @@ -872,7 +872,7 @@ // or: // 001 //^ -- command wasn't found -const bool bIsEmptyCommand = (nCommandOffset == (MIuint)CMIUtilString::npos); +const bool bIsEmptyCommand = (nCommandOffset == CMIUtilString::npos); // 3. Check and exit if it isn't a CLI command // For example: Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp @@ -85,16 +85,16 @@ if (vArg.empty()) return MIstatus::success; -const MIuint nLen = vArg.length(); -const MIuint nLenCntxt = m_strCmdArgsAndOptions.length(); +const size_t nLen = vArg.length(); +const size_t nLenCntxt = m_strCmdArgsAndOptions.length(); if (nLen > nLenCntxt) return MIstatus::failure; -MIuint nExtraSpace = 0; -MIint nPos = m_strCmdArgsAndOptions.find(vArg); +size_t nExtraSpace = 0; +size_t nPos = m_strCmdArgsAndOptions.find(vArg); while (1) { -if (nPos == (MIint)std::string::npos) +if (nPos == std::string::npos) return MIstatus::success; bool bPass1 = false; @@ -106,7 +106,7 @@ else bPass1 = true; -const MIuint nEnd = nPos + nLen; +const size_t nEnd = nPos + nLen; if (bPass1) { @@ -129,7 +129,7 @@ nPos = m_strCmdArgsAndOptions.find(vArg, nEnd); } -const MIuint nPosEnd = nLen + nExtraSpace; +const size_t nPosEnd = nLen + nExtraSpace; m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.replace(nPos, nPosEnd, "").c_str(); m_strCmdArgsAndOptions = m_strCmdArgsAndOptions.Trim(); Index: lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp === --- lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp +++ lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp @@ -1681,8 +1681,8 @@ } else { -const MIuint nLineStartPos = strLocation.rfind(':'); -if ((nLineStartPos == (MIuint)std::string::npos) || (nLineStartPos == 0) || (nLineStartPos == strLocation.length() - 1)) +const size_t nLineStartPos = strLocation.rfind(':'); +if ((nLineStartPos == std::string::npos) || (nLineStartPos == 0) || (nLineStartPos == strLocation.length() - 1)) { SetError(CMIUtilString::Format(MIRSRC(IDS_CMD_ERR_INVALID_LOCATION_FORMAT), m_cmdData.strMiCmd.c_str(), strLocation.c_str()) .c_str()); @@ -1739,29 +1739,29 @@ // LineEntry: \[0x00010f37-0x00010f45\): /path/to/file:3[:1] // ^ -- property -const MIuint nPropertyStartPos = rLin
[Lldb-commits] [lldb] r241357 - [lldb-mi] Remove unnecessary members from MICmdArgContext.
Author: brucem Date: Fri Jul 3 10:30:38 2015 New Revision: 241357 URL: http://llvm.org/viewvc/llvm-project?rev=241357&view=rev Log: [lldb-mi] Remove unnecessary members from MICmdArgContext. Summary: Remove unnecessary members from MICmdArgContext. We don't need constants for these value stored in every instance of the class. Reviewers: ki.stfu, abidh Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10926 Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgContext.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp?rev=241357&r1=241356&r2=241357&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp Fri Jul 3 10:30:38 2015 @@ -18,8 +18,6 @@ // Throws: None. //-- CMICmdArgContext::CMICmdArgContext(void) -: m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -32,8 +30,6 @@ CMICmdArgContext::CMICmdArgContext(void) //-- CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw) : m_strCmdArgsAndOptions(vrCmdLineArgsRaw) -, m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -104,7 +100,7 @@ CMICmdArgContext::RemoveArg(const CMIUti bool bPass1 = false; if (nPos != 0) { -if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nPos - 1] == ' ') bPass1 = true; } else @@ -117,7 +113,7 @@ CMICmdArgContext::RemoveArg(const CMIUti bool bPass2 = false; if (nEnd < nLenCntxt) { -if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nEnd] == ' ') { bPass2 = true; nExtraSpace = 1; @@ -170,7 +166,7 @@ CMICmdArgContext::RemoveArgAtPos(const C // Single words strBuildContextUp += rWord; if (bSpaceRequired) -strBuildContextUp += m_constStrSpace; +strBuildContextUp += " "; } else { @@ -181,7 +177,7 @@ CMICmdArgContext::RemoveArgAtPos(const C while (vArg != words) { if (bSpaceRequired) -words += m_constStrSpace; +words += " "; words += *it; if (++it == itEnd) break; @@ -213,7 +209,7 @@ MIuint CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; -return m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +return m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); } //++ @@ -227,7 +223,7 @@ CMIUtilString::VecString_t CMICmdArgContext::GetArgs(void) const { CMIUtilString::VecString_t vecOptions; -m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); return vecOptions; } Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.h?rev=241357&r1=241356&r2=241357&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h Fri Jul 3 10:30:38 2015 @@ -44,6 +44,4 @@ class CMICmdArgContext // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const char m_constCharSpace; -const CMIUtilString m_constStrSpace; }; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10928: Remove unnecessary const_cast.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241359: [lldb-mi] Remove unnecessary const_cast. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10928?vs=29020&id=29028#toc Repository: rL LLVM http://reviews.llvm.org/D10928 Files: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp Index: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp @@ -182,7 +182,7 @@ CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const char *pPtr = const_cast(vrText.c_str()); +const char *pPtr = vrText.c_str(); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const char c = *pPtr; Index: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp @@ -182,7 +182,7 @@ CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const char *pPtr = const_cast(vrText.c_str()); +const char *pPtr = vrText.c_str(); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const char c = *pPtr; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241359 - [lldb-mi] Remove unnecessary const_cast.
Author: brucem Date: Fri Jul 3 10:31:32 2015 New Revision: 241359 URL: http://llvm.org/viewvc/llvm-project?rev=241359&view=rev Log: [lldb-mi] Remove unnecessary const_cast. Summary: Remove unnecessary const_cast. Reviewers: abidh, ki.stfu Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10928 Modified: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp Modified: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp?rev=241359&r1=241358&r2=241359&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp Fri Jul 3 10:31:32 2015 @@ -182,7 +182,7 @@ bool CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const char *pPtr = const_cast(vrText.c_str()); +const char *pPtr = vrText.c_str(); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const char c = *pPtr; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10927: GetVarFormatForChar needn't pass a char by const ref.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241358: [lldb-mi] GetVarFormatForChar needn't pass a char by const ref. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10927?vs=29019&id=29027#toc Repository: rL LLVM http://reviews.llvm.org/D10927 Files: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h @@ -57,7 +57,7 @@ // Statics: public: static varFormat_e GetVarFormatForString(const CMIUtilString &vrStrFormat); -static varFormat_e GetVarFormatForChar(const char &vrcFormat); +static varFormat_e GetVarFormatForChar(char vcFormat); static CMIUtilString GetValueStringFormatted(const lldb::SBValue &vrValue, const varFormat_e veVarFormat); static void VarObjAdd(const CMICmnLLDBDebugSessionInfoVarObj &vrVarObj); static void VarObjDelete(const CMIUtilString &vrVarName); Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp @@ -234,22 +234,22 @@ //++ // Details: Retrieve the var format enumeration for the specified character. // Type:Static method. -// Args:vrcFormat - (R) Character representing the var format. +// Args:vcFormat- Character representing the var format. // Return: varFormat_e - Var format enumeration. // - No match found return eVarFormat_Invalid. // Throws: None. //-- CMICmnLLDBDebugSessionInfoVarObj::varFormat_e -CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(const char &vrcFormat) +CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(char vcFormat) { -if ('r' == vrcFormat) +if ('r' == vcFormat) return eVarFormat_Hex; // CODETAG_SESSIONINFO_VARFORMAT_ENUM for (MIuint i = 0; i < eVarFormat_count; i++) { const char *pVarFormatChar = ms_aVarFormatChars[i]; -if (*pVarFormatChar == vrcFormat) +if (*pVarFormatChar == vcFormat) return static_cast(i); } Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h @@ -57,7 +57,7 @@ // Statics: public: static varFormat_e GetVarFormatForString(const CMIUtilString &vrStrFormat); -static varFormat_e GetVarFormatForChar(const char &vrcFormat); +static varFormat_e GetVarFormatForChar(char vcFormat); static CMIUtilString GetValueStringFormatted(const lldb::SBValue &vrValue, const varFormat_e veVarFormat); static void VarObjAdd(const CMICmnLLDBDebugSessionInfoVarObj &vrVarObj); static void VarObjDelete(const CMIUtilString &vrVarName); Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp @@ -234,22 +234,22 @@ //++ // Details: Retrieve the var format enumeration for the specified character. // Type:Static method. -// Args:vrcFormat - (R) Character representing the var format. +// Args:vcFormat- Character representing the var format. // Return: varFormat_e - Var format enumeration. // - No match found return eVarFormat_Invalid. // Throws: None. //-- CMICmnLLDBDebugSessionInfoVarObj::varFormat_e -CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(const char &vrcFormat) +CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(char vcFormat) { -if ('r' == vrcFormat) +if ('r' == vcFormat) return eVarFormat_Hex; // CODETAG_SESSIONINFO_VARFORMAT_ENUM for (MIuint i = 0; i < eVarFormat_count; i++) { const char *pVarFormatChar = ms_aVarFormatChars[i]; -if (*pVarFormatChar == vrcFormat) +if (*pVarFormatChar == vcFormat) return static_cast(i); } ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] r241358 - [lldb-mi] GetVarFormatForChar needn't pass a char by const ref.
Author: brucem Date: Fri Jul 3 10:30:48 2015 New Revision: 241358 URL: http://llvm.org/viewvc/llvm-project?rev=241358&view=rev Log: [lldb-mi] GetVarFormatForChar needn't pass a char by const ref. Summary: GetVarFormatForChar needn't pass a char by const ref. Reviewers: ki.stfu, abidh Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10927 Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp?rev=241358&r1=241357&r2=241358&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp Fri Jul 3 10:30:48 2015 @@ -234,22 +234,22 @@ CMICmnLLDBDebugSessionInfoVarObj::GetVar //++ // Details: Retrieve the var format enumeration for the specified character. // Type:Static method. -// Args:vrcFormat - (R) Character representing the var format. +// Args:vcFormat- Character representing the var format. // Return: varFormat_e - Var format enumeration. // - No match found return eVarFormat_Invalid. // Throws: None. //-- CMICmnLLDBDebugSessionInfoVarObj::varFormat_e -CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(const char &vrcFormat) +CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(char vcFormat) { -if ('r' == vrcFormat) +if ('r' == vcFormat) return eVarFormat_Hex; // CODETAG_SESSIONINFO_VARFORMAT_ENUM for (MIuint i = 0; i < eVarFormat_count; i++) { const char *pVarFormatChar = ms_aVarFormatChars[i]; -if (*pVarFormatChar == vrcFormat) +if (*pVarFormatChar == vcFormat) return static_cast(i); } Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h?rev=241358&r1=241357&r2=241358&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h (original) +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h Fri Jul 3 10:30:48 2015 @@ -57,7 +57,7 @@ class CMICmnLLDBDebugSessionInfoVarObj // Statics: public: static varFormat_e GetVarFormatForString(const CMIUtilString &vrStrFormat); -static varFormat_e GetVarFormatForChar(const char &vrcFormat); +static varFormat_e GetVarFormatForChar(char vcFormat); static CMIUtilString GetValueStringFormatted(const lldb::SBValue &vrValue, const varFormat_e veVarFormat); static void VarObjAdd(const CMICmnLLDBDebugSessionInfoVarObj &vrVarObj); static void VarObjDelete(const CMIUtilString &vrVarName); ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10926: Remove unnecessary members from MICmdArgContext.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241357: [lldb-mi] Remove unnecessary members from MICmdArgContext. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10926?vs=29018&id=29026#toc Repository: rL LLVM http://reviews.llvm.org/D10926 Files: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp lldb/trunk/tools/lldb-mi/MICmdArgContext.h Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.h === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h @@ -44,6 +44,4 @@ // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const char m_constCharSpace; -const CMIUtilString m_constStrSpace; }; Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp @@ -18,8 +18,6 @@ // Throws: None. //-- CMICmdArgContext::CMICmdArgContext(void) -: m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -32,8 +30,6 @@ //-- CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw) : m_strCmdArgsAndOptions(vrCmdLineArgsRaw) -, m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -104,7 +100,7 @@ bool bPass1 = false; if (nPos != 0) { -if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nPos - 1] == ' ') bPass1 = true; } else @@ -117,7 +113,7 @@ bool bPass2 = false; if (nEnd < nLenCntxt) { -if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nEnd] == ' ') { bPass2 = true; nExtraSpace = 1; @@ -170,7 +166,7 @@ // Single words strBuildContextUp += rWord; if (bSpaceRequired) -strBuildContextUp += m_constStrSpace; +strBuildContextUp += " "; } else { @@ -181,7 +177,7 @@ while (vArg != words) { if (bSpaceRequired) -words += m_constStrSpace; +words += " "; words += *it; if (++it == itEnd) break; @@ -213,7 +209,7 @@ CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; -return m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +return m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); } //++ @@ -227,7 +223,7 @@ CMICmdArgContext::GetArgs(void) const { CMIUtilString::VecString_t vecOptions; -m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); return vecOptions; } Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.h === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h @@ -44,6 +44,4 @@ // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const char m_constCharSpace; -const CMIUtilString m_constStrSpace; }; Index: lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.cpp @@ -18,8 +18,6 @@ // Throws: None. //-- CMICmdArgContext::CMICmdArgContext(void) -: m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -32,8 +30,6 @@ //-- CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw) : m_strCmdArgsAndOptions(vrCmdLineArgsRaw) -, m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -104,7 +100,7 @@ bool bPass1 = false; if (nPos != 0) { -if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nPos - 1] == ' ') bPass1 = true; } else @@ -117,7 +113,7 @@ bool bPass2 = false; if (nEnd < nLenCntxt) { -if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nEnd] == ' ') { bPass2 = true; nExtraSpace = 1; @@ -170,7 +166,7 @@ // Single words strBuildContextUp += rWord; if (bSpaceRequired) -strBuildContextUp += m_constStrSpace; +strBuildContextUp += " ";
[Lldb-commits] [PATCH] D10931: [lldb-mi] Use size_t where appropriate.
brucem created this revision. brucem added reviewers: abidh, ki.stfu, domipheus. brucem added a subscriber: lldb-commits. Many places should have been using size_t rather than MIuint or MIint. This is particularly true for code that uses std::string::find(), std::string::rfind(), std::string::size(), and related methods. http://reviews.llvm.org/D10931 Files: tools/lldb-mi/MICmdArgContext.cpp tools/lldb-mi/MICmdArgValFile.cpp tools/lldb-mi/MICmdArgValOptionLong.cpp tools/lldb-mi/MICmdArgValString.cpp tools/lldb-mi/MICmdCmdData.cpp tools/lldb-mi/MICmdCmdSymbol.cpp tools/lldb-mi/MICmdFactory.cpp tools/lldb-mi/MICmdInterpreter.cpp tools/lldb-mi/MICmnLogMediumFile.cpp tools/lldb-mi/MIDriver.cpp tools/lldb-mi/MIDriverMgr.cpp tools/lldb-mi/MIUtilFileStd.cpp tools/lldb-mi/MIUtilString.cpp tools/lldb-mi/MIUtilString.h Index: tools/lldb-mi/MIUtilString.h === --- tools/lldb-mi/MIUtilString.h +++ tools/lldb-mi/MIUtilString.h @@ -53,18 +53,18 @@ bool IsHexadecimalNumber(void) const; bool IsQuoted(void) const; CMIUtilString RemoveRepeatedCharacters(const char vChar); -MIuint Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; -MIuint SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; -MIuint SplitLines(VecString_t &vwVecSplits) const; +size_t Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; +size_t SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; +size_t SplitLines(VecString_t &vwVecSplits) const; CMIUtilString StripCREndOfLine(void) const; CMIUtilString StripCRAll(void) const; CMIUtilString Trim(void) const; CMIUtilString Trim(const char vChar) const; -MIuint FindFirst(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; -MIuint FindFirst(const CMIUtilString &vrPattern, const bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote, - const MIuint vnPos = 0) const; -MIuint FindFirstNot(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; -CMIUtilString Escape(const bool vbEscapeQuotes = false) const; +size_t FindFirst(const CMIUtilString &vrPattern, size_t vnPos = 0) const; +size_t FindFirst(const CMIUtilString &vrPattern, bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote, + size_t vnPos = 0) const; +size_t FindFirstNot(const CMIUtilString &vrPattern, size_t vnPos = 0) const; +CMIUtilString Escape(bool vbEscapeQuotes = false) const; CMIUtilString AddSlashes(void) const; CMIUtilString StripSlashes(void) const; // @@ -82,6 +82,6 @@ // Methods: private: bool ExtractNumberFromHexadecimal(MIint64 &vwrNumber) const; -CMIUtilString RemoveRepeatedCharacters(const MIint vnPos, const char vChar); -MIuint FindFirstQuote(const MIuint vnPos) const; +CMIUtilString RemoveRepeatedCharacters(size_t vnPos, const char vChar); +size_t FindFirstQuote(size_t vnPos) const; }; Index: tools/lldb-mi/MIUtilString.cpp === --- tools/lldb-mi/MIUtilString.cpp +++ tools/lldb-mi/MIUtilString.cpp @@ -202,33 +202,33 @@ // Args:vData - (R) String data to be split up. // vDelimiter - (R) Delimiter char or text. // vwVecSplits - (W) Container of splits found in string data. -// Return: MIuint - Number of splits found in the string data. +// Return: size_t - Number of splits found in the string data. // Throws: None. //-- -MIuint +size_t CMIUtilString::Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const { vwVecSplits.clear(); if (this->empty() || vDelimiter.empty()) return 0; -const MIuint nLen(length()); -MIuint nOffset(0); +const size_t nLen(length()); +size_t nOffset(0); do { // Find first occurrence which doesn't match to the delimiter -const MIuint nSectionPos(FindFirstNot(vDelimiter, nOffset)); -if (nSectionPos == (MIuint)std::string::npos) +const size_t nSectionPos(FindFirstNot(vDelimiter, nOffset)); +if (nSectionPos == std::string::npos) break; // Find next occurrence of the delimiter after section -MIuint nNextDelimiterPos(FindFirst(vDelimiter, nSectionPos)); -if (nNextDelimiterPos == (MIuint)std::string::npos) +size_t nNextDelimiterPos(FindFirst(vDelimiter, nSectionPos)); +if (nNextDelimiterPos == std::string::npos) nNextDelimiterPos = nLen; // Extract string between delimiters -const MIuint nSectionLen(nNextDelimiterPos - nSectionPos); +const size_t nSectionLen(nNextDelimiterPos - nSectionPos); const std::string strSection(substr(nSectionPos, nSectionLen)); vwVecSplits.push_back(strSection.c_str()); @@ -251,40 +251,40 @@ // A
[Lldb-commits] [lldb] r241351 - [lldb-mi] Typo fixes
Author: brucem Date: Fri Jul 3 09:09:56 2015 New Revision: 241351 URL: http://llvm.org/viewvc/llvm-project?rev=241351&view=rev Log: [lldb-mi] Typo fixes Summary: Some more typo fixes in LLDB-MI. Reviewers: ki.stfu, abidh Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10925 Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp?rev=241351&r1=241350&r2=241351&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp Fri Jul 3 09:09:56 2015 @@ -44,7 +44,7 @@ CMICmdArgValString::CMICmdArgValString(c //++ // Details: CMICmdArgValString constructor. // Type:Method. -// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised // as string types. @@ -67,7 +67,7 @@ CMICmdArgValString::CMICmdArgValString(c // Args:vrArgName - (R) Argument's name to search by. // vbMandatory - (R) True = Yes must be present, false = optional argument. // vbHandleByCmd - (R) True = Command processes *this option, false = not handled. -// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. (Dflt = false) // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised as // string types. (Dflt = false) @@ -323,7 +323,7 @@ CMICmdArgValString::IsStringArgQuotedTex if (nPos2 == (MIint)std::string::npos) return false; -// Make sure not same back slash, need two slashs +// Make sure not same back slash, need two slashes if (nPos == nPos2) return MIstatus::failure; Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValString.h?rev=241351&r1=241350&r2=241351&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValString.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.h Fri Jul 3 09:09:56 2015 @@ -58,7 +58,7 @@ class CMICmdArgValString : public CMICmd // Attribute: private: -bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to next +bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to next // delimiting space character bool m_bAcceptNumbers; // True = Parse a string and accept as a number if number, false = numbers not recognised as string types bool m_bHandleDirPaths; // True = Parse a string and accept directory file style string if present, false = directory file path not Modified: lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp?rev=241351&r1=241350&r2=241351&view=diff == --- lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp (original) +++ lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp Fri Jul 3 09:09:56 2015 @@ -269,7 +269,7 @@ CMIUtilFileStd::StripOffFileName(const C } //++ -// Details: Return either backslash or forward slash appropriate to the OS this applilcation +// Details: Return either backslash or forward slash appropriate to the OS this application // is running on. // Type:Static method. // Args:None. ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
Re: [Lldb-commits] [PATCH] D10925: Typo fixes
This revision was automatically updated to reflect the committed changes. Closed by commit rL241351: [lldb-mi] Typo fixes (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10925?vs=29015&id=29021#toc Repository: rL LLVM http://reviews.llvm.org/D10925 Files: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp Index: lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp === --- lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp +++ lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp @@ -269,7 +269,7 @@ } //++ -// Details: Return either backslash or forward slash appropriate to the OS this applilcation +// Details: Return either backslash or forward slash appropriate to the OS this application // is running on. // Type:Static method. // Args:None. Index: lldb/trunk/tools/lldb-mi/MICmdArgValString.h === --- lldb/trunk/tools/lldb-mi/MICmdArgValString.h +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.h @@ -58,7 +58,7 @@ // Attribute: private: -bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to next +bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to next // delimiting space character bool m_bAcceptNumbers; // True = Parse a string and accept as a number if number, false = numbers not recognised as string types bool m_bHandleDirPaths; // True = Parse a string and accept directory file style string if present, false = directory file path not Index: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp === --- lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp @@ -44,7 +44,7 @@ //++ // Details: CMICmdArgValString constructor. // Type:Method. -// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised // as string types. @@ -67,7 +67,7 @@ // Args:vrArgName - (R) Argument's name to search by. // vbMandatory - (R) True = Yes must be present, false = optional argument. // vbHandleByCmd - (R) True = Command processes *this option, false = not handled. -// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. (Dflt = false) // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised as // string types. (Dflt = false) @@ -323,7 +323,7 @@ if (nPos2 == (MIint)std::string::npos) return false; -// Make sure not same back slash, need two slashs +// Make sure not same back slash, need two slashes if (nPos == nPos2) return MIstatus::failure; Index: lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp === --- lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp +++ lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp @@ -269,7 +269,7 @@ } //++ -// Details: Return either backslash or forward slash appropriate to the OS this applilcation +// Details: Return either backslash or forward slash appropriate to the OS this application // is running on. // Type:Static method. // Args:None. Index: lldb/trunk/tools/lldb-mi/MICmdArgValString.h === --- lldb/trunk/tools/lldb-mi/MICmdArgValString.h +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.h @@ -58,7 +58,7 @@ // Attribute: private: -bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to next +bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to next // delimiting space character bool m_bAcceptNumbers; // True
[Lldb-commits] [PATCH] D10928: Remove unnecessary const_cast.
brucem created this revision. brucem added reviewers: abidh, ki.stfu. brucem added a subscriber: lldb-commits. Remove unnecessary const_cast. http://reviews.llvm.org/D10928 Files: tools/lldb-mi/MICmdArgValFile.cpp Index: tools/lldb-mi/MICmdArgValFile.cpp === --- tools/lldb-mi/MICmdArgValFile.cpp +++ tools/lldb-mi/MICmdArgValFile.cpp @@ -182,7 +182,7 @@ CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const char *pPtr = const_cast(vrText.c_str()); +const char *pPtr = vrText.c_str(); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const char c = *pPtr; Index: tools/lldb-mi/MICmdArgValFile.cpp === --- tools/lldb-mi/MICmdArgValFile.cpp +++ tools/lldb-mi/MICmdArgValFile.cpp @@ -182,7 +182,7 @@ CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const char *pPtr = const_cast(vrText.c_str()); +const char *pPtr = vrText.c_str(); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { const char c = *pPtr; ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10927: GetVarFormatForChar needn't pass a char by const ref.
brucem created this revision. brucem added reviewers: ki.stfu, abidh. brucem added a subscriber: lldb-commits. GetVarFormatForChar needn't pass a char by const ref. http://reviews.llvm.org/D10927 Files: tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h Index: tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h === --- tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h +++ tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h @@ -57,7 +57,7 @@ // Statics: public: static varFormat_e GetVarFormatForString(const CMIUtilString &vrStrFormat); -static varFormat_e GetVarFormatForChar(const char &vrcFormat); +static varFormat_e GetVarFormatForChar(char vcFormat); static CMIUtilString GetValueStringFormatted(const lldb::SBValue &vrValue, const varFormat_e veVarFormat); static void VarObjAdd(const CMICmnLLDBDebugSessionInfoVarObj &vrVarObj); static void VarObjDelete(const CMIUtilString &vrVarName); Index: tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp === --- tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp +++ tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp @@ -234,22 +234,22 @@ //++ // Details: Retrieve the var format enumeration for the specified character. // Type:Static method. -// Args:vrcFormat - (R) Character representing the var format. +// Args:vcFormat- Character representing the var format. // Return: varFormat_e - Var format enumeration. // - No match found return eVarFormat_Invalid. // Throws: None. //-- CMICmnLLDBDebugSessionInfoVarObj::varFormat_e -CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(const char &vrcFormat) +CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(char vcFormat) { -if ('r' == vrcFormat) +if ('r' == vcFormat) return eVarFormat_Hex; // CODETAG_SESSIONINFO_VARFORMAT_ENUM for (MIuint i = 0; i < eVarFormat_count; i++) { const char *pVarFormatChar = ms_aVarFormatChars[i]; -if (*pVarFormatChar == vrcFormat) +if (*pVarFormatChar == vcFormat) return static_cast(i); } Index: tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h === --- tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h +++ tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h @@ -57,7 +57,7 @@ // Statics: public: static varFormat_e GetVarFormatForString(const CMIUtilString &vrStrFormat); -static varFormat_e GetVarFormatForChar(const char &vrcFormat); +static varFormat_e GetVarFormatForChar(char vcFormat); static CMIUtilString GetValueStringFormatted(const lldb::SBValue &vrValue, const varFormat_e veVarFormat); static void VarObjAdd(const CMICmnLLDBDebugSessionInfoVarObj &vrVarObj); static void VarObjDelete(const CMIUtilString &vrVarName); Index: tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp === --- tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp +++ tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp @@ -234,22 +234,22 @@ //++ // Details: Retrieve the var format enumeration for the specified character. // Type:Static method. -// Args:vrcFormat - (R) Character representing the var format. +// Args:vcFormat- Character representing the var format. // Return: varFormat_e - Var format enumeration. // - No match found return eVarFormat_Invalid. // Throws: None. //-- CMICmnLLDBDebugSessionInfoVarObj::varFormat_e -CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(const char &vrcFormat) +CMICmnLLDBDebugSessionInfoVarObj::GetVarFormatForChar(char vcFormat) { -if ('r' == vrcFormat) +if ('r' == vcFormat) return eVarFormat_Hex; // CODETAG_SESSIONINFO_VARFORMAT_ENUM for (MIuint i = 0; i < eVarFormat_count; i++) { const char *pVarFormatChar = ms_aVarFormatChars[i]; -if (*pVarFormatChar == vrcFormat) +if (*pVarFormatChar == vcFormat) return static_cast(i); } ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10926: Remove unnecessary members from MICmdArgContext.
brucem created this revision. brucem added reviewers: ki.stfu, abidh. brucem added a subscriber: lldb-commits. Remove unnecessary members from MICmdArgContext. We don't need constants for these value stored in every instance of the class. http://reviews.llvm.org/D10926 Files: tools/lldb-mi/MICmdArgContext.cpp tools/lldb-mi/MICmdArgContext.h Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -44,6 +44,4 @@ // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const char m_constCharSpace; -const CMIUtilString m_constStrSpace; }; Index: tools/lldb-mi/MICmdArgContext.cpp === --- tools/lldb-mi/MICmdArgContext.cpp +++ tools/lldb-mi/MICmdArgContext.cpp @@ -18,8 +18,6 @@ // Throws: None. //-- CMICmdArgContext::CMICmdArgContext(void) -: m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -32,8 +30,6 @@ //-- CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw) : m_strCmdArgsAndOptions(vrCmdLineArgsRaw) -, m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -104,7 +100,7 @@ bool bPass1 = false; if (nPos != 0) { -if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nPos - 1] == ' ') bPass1 = true; } else @@ -117,7 +113,7 @@ bool bPass2 = false; if (nEnd < nLenCntxt) { -if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nEnd] == ' ') { bPass2 = true; nExtraSpace = 1; @@ -170,7 +166,7 @@ // Single words strBuildContextUp += rWord; if (bSpaceRequired) -strBuildContextUp += m_constStrSpace; +strBuildContextUp += " "; } else { @@ -181,7 +177,7 @@ while (vArg != words) { if (bSpaceRequired) -words += m_constStrSpace; +words += " "; words += *it; if (++it == itEnd) break; @@ -213,7 +209,7 @@ CMICmdArgContext::GetNumberArgsPresent(void) const { CMIUtilString::VecString_t vecOptions; -return m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +return m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); } //++ @@ -227,7 +223,7 @@ CMICmdArgContext::GetArgs(void) const { CMIUtilString::VecString_t vecOptions; -m_strCmdArgsAndOptions.SplitConsiderQuotes(m_constStrSpace, vecOptions); +m_strCmdArgsAndOptions.SplitConsiderQuotes(" ", vecOptions); return vecOptions; } Index: tools/lldb-mi/MICmdArgContext.h === --- tools/lldb-mi/MICmdArgContext.h +++ tools/lldb-mi/MICmdArgContext.h @@ -44,6 +44,4 @@ // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const char m_constCharSpace; -const CMIUtilString m_constStrSpace; }; Index: tools/lldb-mi/MICmdArgContext.cpp === --- tools/lldb-mi/MICmdArgContext.cpp +++ tools/lldb-mi/MICmdArgContext.cpp @@ -18,8 +18,6 @@ // Throws: None. //-- CMICmdArgContext::CMICmdArgContext(void) -: m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -32,8 +30,6 @@ //-- CMICmdArgContext::CMICmdArgContext(const CMIUtilString &vrCmdLineArgsRaw) : m_strCmdArgsAndOptions(vrCmdLineArgsRaw) -, m_constCharSpace(' ') -, m_constStrSpace(" ") { } @@ -104,7 +100,7 @@ bool bPass1 = false; if (nPos != 0) { -if (m_strCmdArgsAndOptions[nPos - 1] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nPos - 1] == ' ') bPass1 = true; } else @@ -117,7 +113,7 @@ bool bPass2 = false; if (nEnd < nLenCntxt) { -if (m_strCmdArgsAndOptions[nEnd] == m_constCharSpace) +if (m_strCmdArgsAndOptions[nEnd] == ' ') { bPass2 = true; nExtraSpace = 1; @@ -170,7 +166,7 @@ // Single words strBuildContextUp += rWord; if (bSpaceRequired) -strBuildContextUp += m_constStrSpace; +strBuildContextUp += " "; } else { @@ -181,7 +177,7 @@ while (vArg != words) { if (bSpaceRequired) -words += m_constStrSpace;
[Lldb-commits] [PATCH] D10925: Typo fixes
brucem created this revision. brucem added reviewers: ki.stfu, abidh. brucem added a subscriber: lldb-commits. Some more typo fixes in LLDB-MI. http://reviews.llvm.org/D10925 Files: tools/lldb-mi/MICmdArgValString.cpp tools/lldb-mi/MICmdArgValString.h tools/lldb-mi/MIUtilFileStd.cpp Index: tools/lldb-mi/MIUtilFileStd.cpp === --- tools/lldb-mi/MIUtilFileStd.cpp +++ tools/lldb-mi/MIUtilFileStd.cpp @@ -269,7 +269,7 @@ } //++ -// Details: Return either backslash or forward slash appropriate to the OS this applilcation +// Details: Return either backslash or forward slash appropriate to the OS this application // is running on. // Type:Static method. // Args:None. Index: tools/lldb-mi/MICmdArgValString.h === --- tools/lldb-mi/MICmdArgValString.h +++ tools/lldb-mi/MICmdArgValString.h @@ -58,7 +58,7 @@ // Attribute: private: -bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to next +bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to next // delimiting space character bool m_bAcceptNumbers; // True = Parse a string and accept as a number if number, false = numbers not recognised as string types bool m_bHandleDirPaths; // True = Parse a string and accept directory file style string if present, false = directory file path not Index: tools/lldb-mi/MICmdArgValString.cpp === --- tools/lldb-mi/MICmdArgValString.cpp +++ tools/lldb-mi/MICmdArgValString.cpp @@ -44,7 +44,7 @@ //++ // Details: CMICmdArgValString constructor. // Type:Method. -// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// Args:vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised // as string types. @@ -67,7 +67,7 @@ // Args:vrArgName - (R) Argument's name to search by. // vbMandatory - (R) True = Yes must be present, false = optional argument. // vbHandleByCmd - (R) True = Command processes *this option, false = not handled. -// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to +// vbHandleQuotes - (R) True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to // next delimiting space character. (Dflt = false) // vbAcceptNumbers - (R) True = Parse a string and accept as a number if number, false = numbers not recognised as // string types. (Dflt = false) @@ -323,7 +323,7 @@ if (nPos2 == (MIint)std::string::npos) return false; -// Make sure not same back slash, need two slashs +// Make sure not same back slash, need two slashes if (nPos == nPos2) return MIstatus::failure; Index: tools/lldb-mi/MIUtilFileStd.cpp === --- tools/lldb-mi/MIUtilFileStd.cpp +++ tools/lldb-mi/MIUtilFileStd.cpp @@ -269,7 +269,7 @@ } //++ -// Details: Return either backslash or forward slash appropriate to the OS this applilcation +// Details: Return either backslash or forward slash appropriate to the OS this application // is running on. // Type:Static method. // Args:None. Index: tools/lldb-mi/MICmdArgValString.h === --- tools/lldb-mi/MICmdArgValString.h +++ tools/lldb-mi/MICmdArgValString.h @@ -58,7 +58,7 @@ // Attribute: private: -bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimitors, false = only text up to next +bool m_bHandleQuotedString; // True = Parse a string surrounded by quotes spaces are not delimiters, false = only text up to next // delimiting space character bool m_bAcceptNumbers; // True = Parse a string and accept as a number if number, false = numbers not recognised as string types bool m_bHandleDirPaths; // True = Parse a string and accept directory file style string if present, false = directory file path not Index: tools/lldb-mi/MICmdArgValString.cpp ===
Re: [Lldb-commits] [PATCH] D10917: Remove typedefs for MIchar, MIschar, MIuchar.
This revision was automatically updated to reflect the committed changes. Closed by commit rL241349: Remove typedefs for MIchar, MIschar, MIuchar. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10917?vs=29003&id=29013#toc Repository: rL LLVM http://reviews.llvm.org/D10917 Files: lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.cpp lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueConst.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueList.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueResult.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.cpp lldb/trunk/tools/lldb-mi/MICmnResources.cpp lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MIDataTypes.h lldb/trunk/tools/lldb-mi/MIDriver.cpp lldb/trunk/tools/lldb-mi/MIDriverMgr.cpp lldb/trunk/tools/lldb-mi/MIUtilDateTimeStd.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Index: lldb/trunk/tools/lldb-mi/MIUtilString.h === --- lldb/trunk/tools/lldb-mi/MIUtilString.h +++ lldb/trunk/tools/lldb-mi/MIUtilString.h @@ -35,40 +35,40 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); +static bool IsAllValidAlphaAndNumeric(const char *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); static CMIUtilString ConvertToPrintableASCII(const char32_t vChar32); // Methods: public: /* ctor */ CMIUtilString(void); -/* ctor */ CMIUtilString(const MIchar *vpData); -/* ctor */ CMIUtilString(const MIchar *const *vpData); +/* ctor */ CMIUtilString(const char *vpData); +/* ctor */ CMIUtilString(const char *const *vpData); // bool ExtractNumber(MIint64 &vwrNumber) const; CMIUtilString FindAndReplace(const CMIUtilString &vFind, const CMIUtilString &vReplaceWith) const; bool IsNumber(void) const; bool IsHexadecimalNumber(void) const; bool IsQuoted(void) const; -CMIUtilString RemoveRepeatedCharacters(const MIchar vChar); +CMIUtilString RemoveRepeatedCharacters(const char vChar); MIuint Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; MIuint SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; MIuint SplitLines(VecString_t &vwVecSplits) const; CMIUtilString StripCREndOfLine(void) const; CMIUtilString StripCRAll(void) const; CMIUtilString Trim(void) const; -CMIUtilString Trim(const MIchar vChar) const; +CMIUtilString Trim(const char vChar) const; MIuint FindFirst(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; MIuint FindFirst(const CMIUtilString &vrPattern, const bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote, const MIuint vnPos = 0) const; MIuint FindFirstNot(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; CMIUtilString Escape(const bool vbEscapeQuotes = false) const; CMIUtilString AddSlashes(void) const; CMIUtilString StripSlashes(void) const; // -CMIUtilString &operator=(const MIchar *vpRhs); +CMIUtilString &operator=(const char *vpRhs); CMIUtilString &operator=(const std::string &vrRhs); // Overrideable
[Lldb-commits] [lldb] r241349 - Remove typedefs for MIchar, MIschar, MIuchar.
Author: brucem Date: Fri Jul 3 08:45:34 2015 New Revision: 241349 URL: http://llvm.org/viewvc/llvm-project?rev=241349&view=rev Log: Remove typedefs for MIchar, MIschar, MIuchar. Summary: This is a start on bringing lldb-mi more in line with the typical LLDB coding style. This just removes the usage of the typedefs and doesn't yet clean up any logic or other issues. (This is to keep the review simple.) Reviewers: abidh, ki.stfu, domipheus Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D10917 Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.cpp lldb/trunk/tools/lldb-mi/MICmdCmdData.h lldb/trunk/tools/lldb-mi/MICmdCmdExec.cpp lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp lldb/trunk/tools/lldb-mi/MICmdCmdMiscellanous.cpp lldb/trunk/tools/lldb-mi/MICmdCmdSymbol.cpp lldb/trunk/tools/lldb-mi/MICmdCmdTarget.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.cpp lldb/trunk/tools/lldb-mi/MICmdCmdVar.h lldb/trunk/tools/lldb-mi/MICmdInterpreter.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h lldb/trunk/tools/lldb-mi/MICmnLLDBDebugger.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBProxySBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.cpp lldb/trunk/tools/lldb-mi/MICmnLLDBUtilSBValue.h lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.cpp lldb/trunk/tools/lldb-mi/MICmnLogMediumFile.h lldb/trunk/tools/lldb-mi/MICmnMIOutOfBandRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIResultRecord.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueConst.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueList.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueResult.cpp lldb/trunk/tools/lldb-mi/MICmnMIValueTuple.cpp lldb/trunk/tools/lldb-mi/MICmnResources.cpp lldb/trunk/tools/lldb-mi/MICmnResources.h lldb/trunk/tools/lldb-mi/MICmnStreamStdin.cpp lldb/trunk/tools/lldb-mi/MICmnStreamStdin.h lldb/trunk/tools/lldb-mi/MIDataTypes.h lldb/trunk/tools/lldb-mi/MIDriver.cpp lldb/trunk/tools/lldb-mi/MIDriverMgr.cpp lldb/trunk/tools/lldb-mi/MIUtilDateTimeStd.h lldb/trunk/tools/lldb-mi/MIUtilFileStd.cpp lldb/trunk/tools/lldb-mi/MIUtilFileStd.h lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Modified: lldb/trunk/tools/lldb-mi/MICmdArgContext.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgContext.h?rev=241349&r1=241348&r2=241349&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgContext.h (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgContext.h Fri Jul 3 08:45:34 2015 @@ -44,6 +44,6 @@ class CMICmdArgContext // Attributes: private: CMIUtilString m_strCmdArgsAndOptions; -const MIchar m_constCharSpace; +const char m_constCharSpace; const CMIUtilString m_constStrSpace; }; Modified: lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp?rev=241349&r1=241348&r2=241349&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp Fri Jul 3 08:45:34 2015 @@ -121,7 +121,7 @@ CMICmdArgValFile::GetFileNamePath(const CMIUtilString fileNamePath(vrTxt); // Look for a space in the path -const MIchar cSpace = ' '; +const char cSpace = ' '; const MIint nPos = fileNamePath.find(cSpace); if (nPos != (MIint)std::string::npos) fileNamePath = CMIUtilString::Format("\"%s\"", fileNamePath.c_str()); @@ -182,10 +182,10 @@ bool CMICmdArgValFile::IsValidChars(const CMIUtilString &vrText) const { static CMIUtilString s_strSpecialCharacters(".'\"`@#$%^&*()_+-={}[]| "); -const MIchar *pPtr = const_cast(vrText.c_str()); +const char *pPtr = const_cast(vrText.c_str()); for (MIuint i = 0; i < vrText.length(); i++, pPtr++) { -const MIchar c = *pPtr; +const char c = *pPtr; if (::isalnum((int)c) == 0) { if (s_strSpecialCharacters.find(c) == CMIUtilString::npos) Modified: lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp?rev=241349&r1=241348&r2=241349&view=diff == --- lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmdArgValString.cpp Fri Jul 3 08:45:34 2015 @@ -179,7 +179,7 @@ CMICmdArgValString::ValidateQuotedText(C if (vrwArgContext.Re
Re: [Lldb-commits] [PATCH] D10917: Remove typedefs for MIchar, MIschar, MIuchar.
The MI tests pass on Mac OS X with this: RESULT: PASSED (85 passes, 0 failures, 0 errors, 1 skipped, 3 expected failures, 0 unexpected successes) No new compilation warnings. http://reviews.llvm.org/D10917 ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D10917: Remove typedefs for MIchar, MIschar, MIuchar.
brucem created this revision. brucem added reviewers: abidh, ki.stfu, domipheus. brucem added a subscriber: lldb-commits. This is a start on bringing lldb-mi more in line with the typical LLDB coding style. This just removes the usage of the typedefs and doesn't yet clean up any logic or other issues. (This is to keep the review simple.) http://reviews.llvm.org/D10917 Files: tools/lldb-mi/MICmdArgContext.h tools/lldb-mi/MICmdArgValFile.cpp tools/lldb-mi/MICmdArgValString.cpp tools/lldb-mi/MICmdCmdData.cpp tools/lldb-mi/MICmdCmdData.h tools/lldb-mi/MICmdCmdExec.cpp tools/lldb-mi/MICmdCmdFile.cpp tools/lldb-mi/MICmdCmdMiscellanous.cpp tools/lldb-mi/MICmdCmdSymbol.cpp tools/lldb-mi/MICmdCmdTarget.cpp tools/lldb-mi/MICmdCmdVar.cpp tools/lldb-mi/MICmdCmdVar.h tools/lldb-mi/MICmdInterpreter.cpp tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.cpp tools/lldb-mi/MICmnLLDBDebugSessionInfoVarObj.h tools/lldb-mi/MICmnLLDBDebugger.cpp tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp tools/lldb-mi/MICmnLLDBProxySBValue.cpp tools/lldb-mi/MICmnLLDBUtilSBValue.cpp tools/lldb-mi/MICmnLLDBUtilSBValue.h tools/lldb-mi/MICmnLogMediumFile.cpp tools/lldb-mi/MICmnLogMediumFile.h tools/lldb-mi/MICmnMIOutOfBandRecord.cpp tools/lldb-mi/MICmnMIResultRecord.cpp tools/lldb-mi/MICmnMIValueConst.cpp tools/lldb-mi/MICmnMIValueList.cpp tools/lldb-mi/MICmnMIValueResult.cpp tools/lldb-mi/MICmnMIValueTuple.cpp tools/lldb-mi/MICmnResources.cpp tools/lldb-mi/MICmnResources.h tools/lldb-mi/MICmnStreamStdin.cpp tools/lldb-mi/MICmnStreamStdin.h tools/lldb-mi/MIDataTypes.h tools/lldb-mi/MIDriver.cpp tools/lldb-mi/MIDriverMgr.cpp tools/lldb-mi/MIUtilDateTimeStd.h tools/lldb-mi/MIUtilFileStd.cpp tools/lldb-mi/MIUtilFileStd.h tools/lldb-mi/MIUtilString.cpp tools/lldb-mi/MIUtilString.h Index: tools/lldb-mi/MIUtilString.h === --- tools/lldb-mi/MIUtilString.h +++ tools/lldb-mi/MIUtilString.h @@ -35,40 +35,40 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); +static bool IsAllValidAlphaAndNumeric(const char *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); static CMIUtilString ConvertToPrintableASCII(const char32_t vChar32); // Methods: public: /* ctor */ CMIUtilString(void); -/* ctor */ CMIUtilString(const MIchar *vpData); -/* ctor */ CMIUtilString(const MIchar *const *vpData); +/* ctor */ CMIUtilString(const char *vpData); +/* ctor */ CMIUtilString(const char *const *vpData); // bool ExtractNumber(MIint64 &vwrNumber) const; CMIUtilString FindAndReplace(const CMIUtilString &vFind, const CMIUtilString &vReplaceWith) const; bool IsNumber(void) const; bool IsHexadecimalNumber(void) const; bool IsQuoted(void) const; -CMIUtilString RemoveRepeatedCharacters(const MIchar vChar); +CMIUtilString RemoveRepeatedCharacters(const char vChar); MIuint Split(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; MIuint SplitConsiderQuotes(const CMIUtilString &vDelimiter, VecString_t &vwVecSplits) const; MIuint SplitLines(VecString_t &vwVecSplits) const; CMIUtilString StripCREndOfLine(void) const; CMIUtilString StripCRAll(void) const; CMIUtilString Trim(void) const; -CMIUtilString Trim(const MIchar vChar) const; +CMIUtilString Trim(const char vChar) const; MIuint FindFirst(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; MIuint FindFirst(const CMIUtilString &vrPattern, const bool vbSkipQuotedText, bool &vrwbNotFoundClosedQuote, const MIuint vnPos = 0) const; MIuint FindFirstNot(const CMIUtilString &vrPattern, const MIuint vnPos = 0) const; CMIUtilString Escape(const bool vbEscapeQuotes = false) const; CMIUtilString AddSlashes(void) const; CMIUtilString StripSlashes(void) const; // -CMIUtilString &operator=(const MIchar *vpRhs); +CMIUtilString &operator=(const char *vpRhs); CMIUtilString &operator=(const std::string &vrRhs); // Overrideable: @@ -82,6 +82,6 @@ // Methods: private: bool ExtractNumberFromHexadecimal(MIint64 &vwrNumber) const; -CMIUtilString RemoveRepeatedCharacters(const MIint vnPos, const MIchar vChar); +CMIUtilString RemoveRepeatedCharacters(const MIint vnPos, const char vChar); MIuint FindFirstQuote(const MIuint vnPos) const; }; Index: tools/lldb-mi/MIUtilString.cpp
[Lldb-commits] [lldb] r241322 - Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric.
Author: brucem Date: Fri Jul 3 02:28:11 2015 New Revision: 241322 URL: http://llvm.org/viewvc/llvm-project?rev=241322&view=rev Log: Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric. This should take a "const char*" not a "char &". Summary: Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric. This passes the MI tests on Mac OS X. Reviewers: ki.stfu, abidh, domipheus Subscribers: lldb-commits-list Differential Revision: http://reviews.llvm.org/D10906 Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Modified: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp?rev=241322&r1=241321&r2=241322&view=diff == --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp (original) +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp Fri Jul 3 02:28:11 2015 @@ -383,7 +383,7 @@ CMICmnLLDBDebugSessionInfo::MIResponseFo const MIchar *pThreadName = rThread.GetName(); const MIuint len = (pThreadName != nullptr) ? CMIUtilString(pThreadName).length() : 0; const bool bHaveName = ((pThreadName != nullptr) && (len > 0) && (len < 32) && - CMIUtilString::IsAllValidAlphaAndNumeric(*pThreadName)); // 32 is arbitary number + CMIUtilString::IsAllValidAlphaAndNumeric(pThreadName)); // 32 is arbitary number const MIchar *pThrdFmt = bHaveName ? "%s" : "Thread %d"; CMIUtilString strThread; if (bHaveName) Modified: lldb/trunk/tools/lldb-mi/MIUtilString.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIUtilString.cpp?rev=241322&r1=241321&r2=241322&view=diff == --- lldb/trunk/tools/lldb-mi/MIUtilString.cpp (original) +++ lldb/trunk/tools/lldb-mi/MIUtilString.cpp Fri Jul 3 02:28:11 2015 @@ -475,21 +475,20 @@ CMIUtilString::ExtractNumberFromHexadeci // Details: Determine if the text is all valid alpha numeric characters. Letters can be // either upper or lower case. // Type:Static method. -// Args:vrText - (R) The text data to examine. +// Args:vpText - (R) The text data to examine. // Return: bool - True = yes all alpha, false = one or more chars is non alpha. // Throws: None. //-- bool -CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar &vrText) +CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar *vpText) { -const MIuint len = ::strlen(&vrText); +const MIuint len = ::strlen(vpText); if (len == 0) return false; -MIchar *pPtr = const_cast(&vrText); -for (MIuint i = 0; i < len; i++, pPtr++) +for (MIuint i = 0; i < len; i++, vpText++) { -const MIchar c = *pPtr; +const MIchar c = *vpText; if (::isalnum((int)c) == 0) return false; } Modified: lldb/trunk/tools/lldb-mi/MIUtilString.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIUtilString.h?rev=241322&r1=241321&r2=241322&view=diff == --- lldb/trunk/tools/lldb-mi/MIUtilString.h (original) +++ lldb/trunk/tools/lldb-mi/MIUtilString.h Fri Jul 3 02:28:11 2015 @@ -35,7 +35,7 @@ class CMIUtilString : public std::string static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar &vrText); +static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); ___ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
lldb-commits@cs.uiuc.edu
This revision was automatically updated to reflect the committed changes. Closed by commit rL241322: Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric. (authored by brucem). Changed prior to commit: http://reviews.llvm.org/D10906?vs=28993&id=28994#toc Repository: rL LLVM http://reviews.llvm.org/D10906 Files: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp lldb/trunk/tools/lldb-mi/MIUtilString.cpp lldb/trunk/tools/lldb-mi/MIUtilString.h Index: lldb/trunk/tools/lldb-mi/MIUtilString.h === --- lldb/trunk/tools/lldb-mi/MIUtilString.h +++ lldb/trunk/tools/lldb-mi/MIUtilString.h @@ -35,7 +35,7 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar &vrText); +static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -383,7 +383,7 @@ const MIchar *pThreadName = rThread.GetName(); const MIuint len = (pThreadName != nullptr) ? CMIUtilString(pThreadName).length() : 0; const bool bHaveName = ((pThreadName != nullptr) && (len > 0) && (len < 32) && - CMIUtilString::IsAllValidAlphaAndNumeric(*pThreadName)); // 32 is arbitary number + CMIUtilString::IsAllValidAlphaAndNumeric(pThreadName)); // 32 is arbitary number const MIchar *pThrdFmt = bHaveName ? "%s" : "Thread %d"; CMIUtilString strThread; if (bHaveName) Index: lldb/trunk/tools/lldb-mi/MIUtilString.cpp === --- lldb/trunk/tools/lldb-mi/MIUtilString.cpp +++ lldb/trunk/tools/lldb-mi/MIUtilString.cpp @@ -475,21 +475,20 @@ // Details: Determine if the text is all valid alpha numeric characters. Letters can be // either upper or lower case. // Type:Static method. -// Args:vrText - (R) The text data to examine. +// Args:vpText - (R) The text data to examine. // Return: bool - True = yes all alpha, false = one or more chars is non alpha. // Throws: None. //-- bool -CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar &vrText) +CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar *vpText) { -const MIuint len = ::strlen(&vrText); +const MIuint len = ::strlen(vpText); if (len == 0) return false; -MIchar *pPtr = const_cast(&vrText); -for (MIuint i = 0; i < len; i++, pPtr++) +for (MIuint i = 0; i < len; i++, vpText++) { -const MIchar c = *pPtr; +const MIchar c = *vpText; if (::isalnum((int)c) == 0) return false; } Index: lldb/trunk/tools/lldb-mi/MIUtilString.h === --- lldb/trunk/tools/lldb-mi/MIUtilString.h +++ lldb/trunk/tools/lldb-mi/MIUtilString.h @@ -35,7 +35,7 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar &vrText); +static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); Index: lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ lldb/trunk/tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -383,7 +383,7 @@ const MIchar *pThreadName = rThread.GetName(); const MIuint len = (pThreadName != nullptr) ? CMIUtilString(pThreadName).length() : 0; const bool bHaveName = ((pThreadName != nullptr) && (len > 0) && (len < 32) && -CMIUtilString::IsAllValidAlphaAndNumeric(*pThreadName)); // 32 is arbitary number +CMIUtilString::IsAllValidAlphaAndNumeric(pThreadName)); // 32 is arbitary number const MIchar *pThrdFmt = bHaveName ? "%s" : "Thread %d"; CMIUtilString strThread; if (bHaveName) Index: lldb/trunk/tools/lldb-mi/MIUtilString.cpp =
lldb-commits@cs.uiuc.edu
brucem updated this revision to Diff 28993. brucem added a comment. Update per review comments. Updating D10906: Fix type signature for CMIUtilString::IsAllValidAlphaAndNumeric. = This should take a "const char*" not a "char &". http://reviews.llvm.org/D10906 Files: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp tools/lldb-mi/MIUtilString.cpp tools/lldb-mi/MIUtilString.h Index: tools/lldb-mi/MIUtilString.h === --- tools/lldb-mi/MIUtilString.h +++ tools/lldb-mi/MIUtilString.h @@ -35,7 +35,7 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar &vrText); +static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); Index: tools/lldb-mi/MIUtilString.cpp === --- tools/lldb-mi/MIUtilString.cpp +++ tools/lldb-mi/MIUtilString.cpp @@ -475,21 +475,20 @@ // Details: Determine if the text is all valid alpha numeric characters. Letters can be // either upper or lower case. // Type:Static method. -// Args:vrText - (R) The text data to examine. +// Args:vpText - (R) The text data to examine. // Return: bool - True = yes all alpha, false = one or more chars is non alpha. // Throws: None. //-- bool -CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar &vrText) +CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar *vpText) { -const MIuint len = ::strlen(&vrText); +const MIuint len = ::strlen(vpText); if (len == 0) return false; -MIchar *pPtr = const_cast(&vrText); -for (MIuint i = 0; i < len; i++, pPtr++) +for (MIuint i = 0; i < len; i++, vpText++) { -const MIchar c = *pPtr; +const MIchar c = *vpText; if (::isalnum((int)c) == 0) return false; } Index: tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp === --- tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp +++ tools/lldb-mi/MICmnLLDBDebugSessionInfo.cpp @@ -383,7 +383,7 @@ const MIchar *pThreadName = rThread.GetName(); const MIuint len = (pThreadName != nullptr) ? CMIUtilString(pThreadName).length() : 0; const bool bHaveName = ((pThreadName != nullptr) && (len > 0) && (len < 32) && - CMIUtilString::IsAllValidAlphaAndNumeric(*pThreadName)); // 32 is arbitary number + CMIUtilString::IsAllValidAlphaAndNumeric(pThreadName)); // 32 is arbitary number const MIchar *pThrdFmt = bHaveName ? "%s" : "Thread %d"; CMIUtilString strThread; if (bHaveName) Index: tools/lldb-mi/MIUtilString.h === --- tools/lldb-mi/MIUtilString.h +++ tools/lldb-mi/MIUtilString.h @@ -35,7 +35,7 @@ static CMIUtilString Format(const CMIUtilString vFormating, ...); static CMIUtilString FormatBinary(const MIuint64 vnDecimal); static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs); -static bool IsAllValidAlphaAndNumeric(const MIchar &vrText); +static bool IsAllValidAlphaAndNumeric(const MIchar *vpText); static bool Compare(const CMIUtilString &vrLhs, const CMIUtilString &vrRhs); static CMIUtilString ConvertToPrintableASCII(const char vChar); static CMIUtilString ConvertToPrintableASCII(const char16_t vChar16); Index: tools/lldb-mi/MIUtilString.cpp === --- tools/lldb-mi/MIUtilString.cpp +++ tools/lldb-mi/MIUtilString.cpp @@ -475,21 +475,20 @@ // Details: Determine if the text is all valid alpha numeric characters. Letters can be // either upper or lower case. // Type:Static method. -// Args:vrText - (R) The text data to examine. +// Args:vpText - (R) The text data to examine. // Return: bool - True = yes all alpha, false = one or more chars is non alpha. // Throws: None. //-- bool -CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar &vrText) +CMIUtilString::IsAllValidAlphaAndNumeric(const MIchar *vpText) { -const MIuint len = ::strlen(&vrText); +const MIuint len = ::strlen(vpText); if (len == 0) return false; -MIchar *pPtr = const_cast(&vrText); -for (MIuint i = 0; i < len; i++, pPtr++) +for (MIuint i = 0; i < len; i++, vpText++) { -const MIchar c = *pPtr; +const MIchar c = *vpText; if (::isalnum