diff options
Diffstat (limited to 'lldb/source/Plugins/Process/Utility')
5 files changed, 10 insertions, 10 deletions
diff --git a/lldb/source/Plugins/Process/Utility/libunwind/src/AssemblyParser.hpp b/lldb/source/Plugins/Process/Utility/libunwind/src/AssemblyParser.hpp index c4425b47a0d..50d0c938ebc 100644 --- a/lldb/source/Plugins/Process/Utility/libunwind/src/AssemblyParser.hpp +++ b/lldb/source/Plugins/Process/Utility/libunwind/src/AssemblyParser.hpp @@ -46,7 +46,7 @@ class AssemblyParse_x86 { public: enum { kMaxInstructionByteSize = 32 }; - AssemblyParse_x86 (RemoteProcInfo& procinfo, unw_accessors_t *acc, unw_addr_space_t as, void *arg) : fArg(arg), fAccessors(acc), fAs(as), fRemoteProcInfo(procinfo) { + AssemblyParse_x86 (RemoteProcInfo& procinfo, unw_accessors_t *acc, unw_addr_space_t as, void *arg) : fArg(arg), fRemoteProcInfo(procinfo), fAccessors(acc), fAs(as) { fRegisterMap = fRemoteProcInfo.getRegisterMap(); if (fRemoteProcInfo.getTargetArch() == UNW_TARGET_X86_64) { fStackPointerRegnum = UNW_X86_64_RSP; diff --git a/lldb/source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp b/lldb/source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp index b11cb8ce441..df6db3047b8 100644 --- a/lldb/source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp +++ b/lldb/source/Plugins/Process/Utility/libunwind/src/DwarfParser.hpp @@ -390,7 +390,7 @@ const char* CFI_Parser<A>::parseCIE(A& addressSpace, pint_t cie, CIE_Info* cieIn cieContentEnd = p + cieLength; } if ( cieLength == 0 ) - return false; + return NULL; // CIE ID is always 0 if ( addressSpace.get32(p) != 0 ) return "CIE ID is not zero"; diff --git a/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp b/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp index e9ec886bf5b..8826bb271d7 100644 --- a/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp +++ b/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteProcInfo.hpp @@ -77,7 +77,7 @@ public: RemoteMemoryBlob (uint8_t *buf, free_callback_with_arg to_free, uint64_t startaddr, uint64_t len, uint64_t mh, void *arg) : - fBuf(buf), fToFreeWithArg(to_free), fToFree(NULL), + fBuf(buf), fToFree(NULL), fToFreeWithArg(to_free), fStartAddr(startaddr), fLen(len), fMachHeader(mh), fArg(arg) { } RemoteMemoryBlob (uint8_t *buf, free_callback to_free, uint64_t startaddr, @@ -88,9 +88,9 @@ public: // the following is to create a dummy RMB object for lower_bound's use in // searching. - RemoteMemoryBlob (uint64_t startaddr) : fStartAddr(startaddr), fToFree(NULL), - fBuf(NULL), fToFreeWithArg(NULL), fArg(NULL), fMachHeader(-1), - fLen(0) { } + RemoteMemoryBlob (uint64_t startaddr) : fBuf(NULL), fToFree(NULL), + fToFreeWithArg(NULL), fStartAddr(startaddr), fLen(0), + fMachHeader(-1), fArg(NULL) { } ~RemoteMemoryBlob () { if (fToFreeWithArg) fToFreeWithArg(fBuf, fArg); @@ -417,7 +417,7 @@ RemoteUnwindProfile* RemoteImages::findProfileByTextAddr (uint64_t pc) { img = &i->second; } else - return false; + return NULL; std::map<uint64_t, RemoteUnwindProfile *>::iterator j; j = img->profiles.lower_bound (pc); if (j == img->profiles.begin() && j == img->profiles.end()) diff --git a/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteRegisterMap.hpp b/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteRegisterMap.hpp index 19caae9a3f4..86da827370a 100644 --- a/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteRegisterMap.hpp +++ b/lldb/source/Plugins/Process/Utility/libunwind/src/RemoteRegisterMap.hpp @@ -65,8 +65,8 @@ private: int machine_regno; // What the actual bits/bytes are in instructions char *name; unw_regtype_t type; - reg () : unwind_regno(-1), machine_regno(-1), caller_regno(-1), - eh_frame_regno(-1), name(NULL), type(UNW_NOT_A_REG) { } + reg () : unwind_regno(-1), caller_regno(-1), eh_frame_regno(-1), + machine_regno(-1), name(NULL), type(UNW_NOT_A_REG) { } }; unw_accessors_t fAccessors; diff --git a/lldb/source/Plugins/Process/Utility/libunwind/src/UnwindCursor.hpp b/lldb/source/Plugins/Process/Utility/libunwind/src/UnwindCursor.hpp index 1f3f00bb79c..a29d742f1ed 100644 --- a/lldb/source/Plugins/Process/Utility/libunwind/src/UnwindCursor.hpp +++ b/lldb/source/Plugins/Process/Utility/libunwind/src/UnwindCursor.hpp @@ -933,7 +933,7 @@ typedef RemoteUnwindCursor<LocalAddressSpace,Registers_x86_64> AbstractRemoteUnw template <typename A, typename R> RemoteUnwindCursor<A,R>::RemoteUnwindCursor(A& as, unw_context_t* regs, void* arg) - : UnwindCursor<A,R>::UnwindCursor(regs, as), fIsFirstFrame (false), fIsLeafFrame(false), fArg(arg) + : UnwindCursor<A,R>::UnwindCursor(regs, as), fIsLeafFrame(false), fIsFirstFrame (false), fArg(arg) { COMPILE_TIME_ASSERT( sizeof(RemoteUnwindCursor<A,R>) < sizeof(unw_cursor_t) ); } |
