From owner-svn-src-vendor@freebsd.org Sat Jan 6 21:37:22 2018 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AE6FDF383B; Sat, 6 Jan 2018 21:37:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 24D9581859; Sat, 6 Jan 2018 21:37:22 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65A4317F2D; Sat, 6 Jan 2018 21:37:21 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w06LbL7b067716; Sat, 6 Jan 2018 21:37:21 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w06LbK19067713; Sat, 6 Jan 2018 21:37:20 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201801062137.w06LbK19067713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 6 Jan 2018 21:37:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r327649 - in vendor/lldb/dist-release_60/source: Core Plugins/Instruction/ARM64 Plugins/Process/MacOSX-Kernel X-SVN-Group: vendor X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in vendor/lldb/dist-release_60/source: Core Plugins/Instruction/ARM64 Plugins/Process/MacOSX-Kernel X-SVN-Commit-Revision: 327649 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jan 2018 21:37:22 -0000 Author: dim Date: Sat Jan 6 21:37:20 2018 New Revision: 327649 URL: https://svnweb.freebsd.org/changeset/base/327649 Log: Vendor import of lldb release_60 branch r321788: https://llvm.org/svn/llvm-project/lldb/branches/release_60@321788 Modified: vendor/lldb/dist-release_60/source/Core/Debugger.cpp vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Modified: vendor/lldb/dist-release_60/source/Core/Debugger.cpp ============================================================================== --- vendor/lldb/dist-release_60/source/Core/Debugger.cpp Sat Jan 6 21:36:52 2018 (r327648) +++ vendor/lldb/dist-release_60/source/Core/Debugger.cpp Sat Jan 6 21:37:20 2018 (r327649) @@ -1162,75 +1162,6 @@ DebuggerSP Debugger::FindDebuggerWithID(lldb::user_id_ return debugger_sp; } -#if 0 -static void -TestPromptFormats (StackFrame *frame) -{ - if (frame == nullptr) - return; - - StreamString s; - const char *prompt_format = - "{addr = '${addr}'\n}" - "{addr-file-or-load = '${addr-file-or-load}'\n}" - "{current-pc-arrow = '${current-pc-arrow}'\n}" - "{process.id = '${process.id}'\n}" - "{process.name = '${process.name}'\n}" - "{process.file.basename = '${process.file.basename}'\n}" - "{process.file.fullpath = '${process.file.fullpath}'\n}" - "{thread.id = '${thread.id}'\n}" - "{thread.index = '${thread.index}'\n}" - "{thread.name = '${thread.name}'\n}" - "{thread.queue = '${thread.queue}'\n}" - "{thread.stop-reason = '${thread.stop-reason}'\n}" - "{target.arch = '${target.arch}'\n}" - "{module.file.basename = '${module.file.basename}'\n}" - "{module.file.fullpath = '${module.file.fullpath}'\n}" - "{file.basename = '${file.basename}'\n}" - "{file.fullpath = '${file.fullpath}'\n}" - "{frame.index = '${frame.index}'\n}" - "{frame.pc = '${frame.pc}'\n}" - "{frame.sp = '${frame.sp}'\n}" - "{frame.fp = '${frame.fp}'\n}" - "{frame.flags = '${frame.flags}'\n}" - "{frame.reg.rdi = '${frame.reg.rdi}'\n}" - "{frame.reg.rip = '${frame.reg.rip}'\n}" - "{frame.reg.rsp = '${frame.reg.rsp}'\n}" - "{frame.reg.rbp = '${frame.reg.rbp}'\n}" - "{frame.reg.rflags = '${frame.reg.rflags}'\n}" - "{frame.reg.xmm0 = '${frame.reg.xmm0}'\n}" - "{frame.reg.carp = '${frame.reg.carp}'\n}" - "{function.id = '${function.id}'\n}" - "{function.changed = '${function.changed}'\n}" - "{function.initial-function = '${function.initial-function}'\n}" - "{function.name = '${function.name}'\n}" - "{function.name-without-args = '${function.name-without-args}'\n}" - "{function.name-with-args = '${function.name-with-args}'\n}" - "{function.addr-offset = '${function.addr-offset}'\n}" - "{function.concrete-only-addr-offset-no-padding = '${function.concrete-only-addr-offset-no-padding}'\n}" - "{function.line-offset = '${function.line-offset}'\n}" - "{function.pc-offset = '${function.pc-offset}'\n}" - "{line.file.basename = '${line.file.basename}'\n}" - "{line.file.fullpath = '${line.file.fullpath}'\n}" - "{line.number = '${line.number}'\n}" - "{line.start-addr = '${line.start-addr}'\n}" - "{line.end-addr = '${line.end-addr}'\n}" -; - - SymbolContext sc (frame->GetSymbolContext(eSymbolContextEverything)); - ExecutionContext exe_ctx; - frame->CalculateExecutionContext(exe_ctx); - if (Debugger::FormatPrompt (prompt_format, &sc, &exe_ctx, &sc.line_entry.range.GetBaseAddress(), s)) - { - printf("%s\n", s.GetData()); - } - else - { - printf ("what we got: %s\n", s.GetData()); - } -} -#endif - bool Debugger::FormatDisassemblerAddress(const FormatEntity::Entry *format, const SymbolContext *sc, const SymbolContext *prev_sc, Modified: vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp ============================================================================== --- vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp Sat Jan 6 21:36:52 2018 (r327648) +++ vendor/lldb/dist-release_60/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp Sat Jan 6 21:37:20 2018 (r327649) @@ -76,19 +76,6 @@ static inline bool IsZero(uint64_t x) { return x == 0; static inline uint64_t NOT(uint64_t x) { return ~x; } -#if 0 -// LSL_C() -// ======= -static inline uint64_t -LSL_C (uint64_t x, integer shift, bool &carry_out) -{ - assert (shift >= 0); - uint64_t result = x << shift; - carry_out = ((1ull << (64-1)) >> (shift - 1)) != 0; - return result; -} -#endif - // LSL() // ===== Modified: vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp ============================================================================== --- vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Sat Jan 6 21:36:52 2018 (r327648) +++ vendor/lldb/dist-release_60/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp Sat Jan 6 21:37:20 2018 (r327649) @@ -59,15 +59,6 @@ bool CommunicationKDP::SendRequestPacket( return SendRequestPacketNoLock(request_packet); } -#if 0 -typedef struct { - uint8_t request; // Either: CommandType | ePacketTypeRequest, or CommandType | ePacketTypeReply - uint8_t sequence; - uint16_t length; // Length of entire packet including this header - uint32_t key; // Session key -} kdp_hdr_t; -#endif - void CommunicationKDP::MakeRequestPacketHeader(CommandType request_type, PacketStreamType &request_packet, uint16_t request_length) { @@ -435,34 +426,6 @@ bool CommunicationKDP::SendRequestVersion() { } return false; } - -#if 0 // Disable KDP_IMAGEPATH for now, it seems to hang the KDP connection... -const char * -CommunicationKDP::GetImagePath () -{ - if (m_image_path.empty()) - SendRequestImagePath(); - return m_image_path.c_str(); -} - -bool -CommunicationKDP::SendRequestImagePath () -{ - PacketStreamType request_packet (Stream::eBinary, m_addr_byte_size, m_byte_order); - const CommandType command = KDP_IMAGEPATH; - const uint32_t command_length = 8; - MakeRequestPacketHeader (command, request_packet, command_length); - DataExtractor reply_packet; - if (SendRequestAndGetReply (command, request_packet, reply_packet)) - { - const char *path = reply_packet.PeekCStr(8); - if (path && path[0]) - m_kernel_version.assign (path); - return true; - } - return false; -} -#endif uint32_t CommunicationKDP::GetCPUMask() { if (!HostInfoIsValid())