Vendor import of lldb release_60 branch r321788:vendor/lldb/lldb-release_60-r321788

https://llvm.org/svn/llvm-project/lldb/branches/release_60@321788

3 files changed, 0 insertions, 119 deletions

diff --git a/source/Core/Debugger.cpp b/source/Core/Debugger.cpp
index a4d78151c75f..75b762f085cb 100644
--- a/source/Core/Debugger.cpp
+++ b/source/Core/Debugger.cpp
@@ -1162,75 +1162,6 @@ DebuggerSP Debugger::FindDebuggerWithID(lldb::user_id_t 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,
diff --git a/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp b/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
index d882108c25f4..d2832656d906 100644
--- a/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
+++ b/source/Plugins/Instruction/ARM64/EmulateInstructionARM64.cpp
@@ -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()
 // =====
 
diff --git a/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp b/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
index 3d9f498b1e9a..1141b31ca1e3 100644
--- a/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
+++ b/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
@@ -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) {
@@ -436,34 +427,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())
     SendRequestHostInfo();