aadsm updated this revision to Diff 203477.
aadsm added a comment.
No longer depend on libxml2 to quote the attribute value
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D62502/new/
https://reviews.llvm.org/D62502
Files:
lldb/include/lldb/Host/XML.h
lldb/include/lldb/Host/common/NativeProcessProtocol.h
lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/main.cpp
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk
lldb/source/Host/common/XML.cpp
lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -25,6 +25,7 @@
#include "lldb/Host/Host.h"
#include "lldb/Host/HostInfo.h"
#include "lldb/Host/PosixApi.h"
+#include "lldb/Host/XML.h"
#include "lldb/Host/common/NativeProcessProtocol.h"
#include "lldb/Host/common/NativeRegisterContext.h"
#include "lldb/Host/common/NativeThreadProtocol.h"
@@ -2765,6 +2766,24 @@
return std::move(*buffer_or_error);
}
+ if (object == "libraries-svr4") {
+ auto library_list = m_debugged_process_up->GetLoadedSVR4Libraries();
+ if (!library_list)
+ return library_list.takeError();
+
+ StreamString response;
+ response.Printf("<library-list-svr4 version=\"1.0\">");
+ for (auto const &library : *library_list) {
+ response.Printf("<library name=\"%s\" ",
+ XMLEncodeAttributeValue(library.name.c_str()).c_str());
+ response.Printf("lm=\"0x%" PRIx64 "\" ", library.link_map);
+ response.Printf("l_addr=\"0x%" PRIx64 "\" ", library.base_addr);
+ response.Printf("l_ld=\"0x%" PRIx64 "\" />", library.ld_addr);
+ }
+ response.Printf("</library-list-svr4>");
+ return MemoryBuffer::getMemBufferCopy(response.GetString(), __FUNCTION__);
+ }
+
return llvm::make_error<PacketUnimplementedError>(
"Xfer object not supported");
}
Index: lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
===================================================================
--- lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
+++ lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp
@@ -826,6 +826,9 @@
response.PutCString(";QPassSignals+");
response.PutCString(";qXfer:auxv:read+");
#endif
+#if defined(__linux__)
+ response.PutCString(";qXfer:libraries-svr4:read+");
+#endif
return SendPacketNoLock(response.GetString());
}
Index: lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
===================================================================
--- lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
+++ lldb/source/Plugins/Process/Linux/NativeProcessLinux.h
@@ -76,6 +76,9 @@
Status DeallocateMemory(lldb::addr_t addr) override;
+ llvm::Expected<std::vector<SVR4LibraryInfo>>
+ GetLoadedSVR4Libraries() override;
+
size_t UpdateThreads() override;
const ArchSpec &GetArchitecture() const override { return m_arch; }
@@ -127,6 +130,10 @@
llvm::Expected<llvm::ArrayRef<uint8_t>>
GetSoftwareBreakpointTrapOpcode(size_t size_hint) override;
+ template <typename T>
+ Status ReadSVR4LibraryInfo(lldb::addr_t link_map_addr, SVR4LibraryInfo &info,
+ lldb::addr_t &next);
+
private:
MainLoop::SignalHandleUP m_sigchld_handle;
ArchSpec m_arch;
Index: lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
===================================================================
--- lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -2078,3 +2078,74 @@
return error;
}
+
+template <typename T>
+Status NativeProcessLinux::ReadSVR4LibraryInfo(lldb::addr_t link_map_addr,
+ SVR4LibraryInfo &info,
+ lldb::addr_t &next) {
+ ELFLinkMap<T> link_map;
+ size_t bytes_read;
+ auto error =
+ ReadMemory(link_map_addr, &link_map, sizeof(link_map), bytes_read);
+ if (!error.Success())
+ return error;
+
+ char name_buffer[PATH_MAX];
+ error = ReadMemory(link_map.l_name, &name_buffer, sizeof(name_buffer),
+ bytes_read);
+ if (!error.Success())
+ return error;
+ name_buffer[PATH_MAX - 1] = '\0';
+ info.name = std::string(name_buffer);
+ info.link_map = link_map_addr;
+ info.base_addr = link_map.l_addr;
+ info.ld_addr = link_map.l_ld;
+
+ next = link_map.l_next;
+ return Status();
+}
+
+llvm::Expected<std::vector<SVR4LibraryInfo>>
+NativeProcessLinux::GetLoadedSVR4Libraries() {
+ // Address of DT_DEBUG.d_ptr which points to r_debug
+ lldb::addr_t info_address = GetSharedLibraryInfoAddress();
+ if (info_address == LLDB_INVALID_ADDRESS)
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "Invalid shared library info address");
+ // Address of r_debug
+ lldb::addr_t address = 0;
+ size_t bytes_read;
+ auto status =
+ ReadMemory(info_address, &address, GetAddressByteSize(), bytes_read);
+ if (!status.Success())
+ return status.ToError();
+ if (address == 0)
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "Invalid r_debug address");
+ // Read r_debug.r_map
+ lldb::addr_t link_map = 0;
+ status = ReadMemory(address + GetAddressByteSize(), &link_map,
+ GetAddressByteSize(), bytes_read);
+ if (!status.Success())
+ return status.ToError();
+ if (address == 0)
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "Invalid link_map address");
+
+ std::vector<SVR4LibraryInfo> library_list;
+ while (link_map) {
+ SVR4LibraryInfo info;
+ lldb::addr_t next;
+ if (GetAddressByteSize() == 8)
+ status = ReadSVR4LibraryInfo<uint64_t>(link_map, info, next);
+ else
+ status = ReadSVR4LibraryInfo<uint32_t>(link_map, info, next);
+ if (!status.Success())
+ return status.ToError();
+ if (!info.name.empty() && info.base_addr != 0)
+ library_list.push_back(info);
+ link_map = next;
+ }
+
+ return library_list;
+}
Index: lldb/source/Host/common/XML.cpp
===================================================================
--- lldb/source/Host/common/XML.cpp
+++ lldb/source/Host/common/XML.cpp
@@ -539,3 +539,27 @@
#endif
return root_sp;
}
+
+std::string lldb_private::XMLEncodeAttributeValue(const char *value) {
+ std::string result;
+ for (size_t i = 0; value[i] != '\0'; i++) {
+ switch (value[i]) {
+ case '\'':
+ result += "'";
+ break;
+ case '"':
+ result += """;
+ break;
+ case '<':
+ result += "<";
+ break;
+ case '>':
+ result += ">";
+ break;
+ default:
+ result += value[i];
+ break;
+ }
+ }
+ return result;
+}
\ No newline at end of file
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk
@@ -0,0 +1,9 @@
+LEVEL = ../../../make
+
+LIB_PREFIX := svr4lib
+
+DYLIB_NAME := $(LIB_PREFIX)_b\"
+DYLIB_CXX_SOURCES := $(LIB_PREFIX)_b_quote.cpp
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.cpp
@@ -0,0 +1,9 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+int svr4lib_b_quote() { return 42; }
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk
@@ -0,0 +1,9 @@
+LEVEL = ../../../make
+
+LIB_PREFIX := svr4lib
+
+DYLIB_NAME := $(LIB_PREFIX)_a
+DYLIB_CXX_SOURCES := $(LIB_PREFIX)_a.cpp
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.cpp
@@ -0,0 +1,9 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+int svr4lib_a() { return 42; }
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/main.cpp
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/main.cpp
@@ -0,0 +1,15 @@
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+int main(int argc, char **argv) {
+ // Perform a null pointer access.
+ int *const null_int_ptr = nullptr;
+ *null_int_ptr = 0xDEAD;
+
+ return 0;
+}
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
@@ -0,0 +1,135 @@
+import xml.etree.ElementTree as ET
+
+import gdbremote_testcase
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+
+
+class TestGdbRemoteLibrariesSvr4Support(gdbremote_testcase.GdbRemoteTestCaseBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ FEATURE_NAME = "qXfer:libraries-svr4:read"
+
+ def setup_test(self):
+ self.init_llgs_test()
+ self.build()
+ self.set_inferior_startup_launch()
+ env = {}
+ env[self.dylibPath] = self.getBuildDir()
+ procs = self.prep_debug_monitor_and_inferior(inferior_env=env)
+ self.test_sequence.add_log_lines(
+ [
+ # Start the inferior...
+ "read packet: $c#63"
+ ],
+ True,
+ )
+ # ... then interrupt.
+ self.add_interrupt_packets()
+
+ def has_libraries_svr4_support(self):
+ self.add_qSupported_packets()
+ context = self.expect_gdbremote_sequence()
+ self.assertIsNotNone(context)
+ features = self.parse_qSupported_response(context)
+ return self.FEATURE_NAME in features and features[self.FEATURE_NAME] == "+"
+
+ def get_libraries_svr4_data(self):
+ # Start up llgs and inferior, and check for libraries-svr4 support.
+ if not self.has_libraries_svr4_support():
+ self.skipTest("libraries-svr4 not supported")
+
+ # Grab the libraries-svr4 data.
+ self.reset_test_sequence()
+ self.test_sequence.add_log_lines(
+ [
+ "read packet: $qXfer:libraries-svr4:read::0,ffff:#00",
+ {
+ "direction": "send",
+ "regex": re.compile(
+ r"^\$([^E])(.*)#[0-9a-fA-F]{2}$", re.MULTILINE | re.DOTALL
+ ),
+ "capture": {1: "response_type", 2: "content_raw"},
+ },
+ ],
+ True,
+ )
+
+ context = self.expect_gdbremote_sequence()
+ self.assertIsNotNone(context)
+
+ # Ensure we end up with all libraries-svr4 data in one packet.
+ self.assertEqual(context.get("response_type"), "l")
+
+ # Decode binary data.
+ content_raw = context.get("content_raw")
+ self.assertIsNotNone(content_raw)
+ return content_raw
+
+ def get_libraries_svr4_xml(self):
+ libraries_svr4 = self.get_libraries_svr4_data()
+ xml_root = None
+ try:
+ xml_root = ET.fromstring(libraries_svr4)
+ except xml.etree.ElementTree.ParseError:
+ pass
+ self.assertIsNotNone(xml_root, "Malformed libraries-svr4 XML")
+ return xml_root
+
+ def libraries_svr4_well_formed(self):
+ xml_root = self.get_libraries_svr4_xml()
+ self.assertEqual(xml_root.tag, "library-list-svr4")
+ for child in xml_root:
+ self.assertEqual(child.tag, "library")
+ self.assertItemsEqual(child.attrib.keys(), ["name", "lm", "l_addr", "l_ld"])
+
+ def libraries_svr4_has_correct_load_addr(self):
+ xml_root = self.get_libraries_svr4_xml()
+ for child in xml_root:
+ name = child.attrib.get("name")
+ if not name:
+ continue
+ load_addr = int(child.attrib.get("l_addr"), 16)
+ self.reset_test_sequence()
+ self.add_query_memory_region_packets(load_addr)
+ context = self.expect_gdbremote_sequence()
+ mem_region = self.parse_memory_region_packet(context)
+ self.assertEqual(load_addr, int(mem_region.get("start", 0), 16))
+ self.assertEqual(
+ os.path.realpath(name), os.path.realpath(mem_region.get("name", ""))
+ )
+
+ def libraries_svr4_libs_present(self):
+ xml_root = self.get_libraries_svr4_xml()
+ libraries_svr4_names = []
+ for child in xml_root:
+ name = child.attrib.get("name")
+ libraries_svr4_names.append(os.path.realpath(name))
+ expected_libs = ["libsvr4lib_a.so", 'libsvr4lib_b".so']
+ for lib in expected_libs:
+ self.assertIn(self.getBuildDir() + "/" + lib, libraries_svr4_names)
+
+ @llgs_test
+ @skipUnlessPlatform(["linux", "android"])
+ def test_supports_libraries_svr4(self):
+ self.setup_test()
+ self.assertTrue(self.has_libraries_svr4_support())
+
+ @llgs_test
+ @skipUnlessPlatform(["linux", "android"])
+ def test_libraries_svr4_well_formed(self):
+ self.setup_test()
+ self.libraries_svr4_well_formed()
+
+ @llgs_test
+ @skipUnlessPlatform(["linux", "android"])
+ def test_libraries_svr4_load_addr(self):
+ self.setup_test()
+ self.libraries_svr4_has_correct_load_addr()
+
+ @llgs_test
+ @skipUnlessPlatform(["linux", "android"])
+ def test_libraries_svr4_libs_present(self):
+ self.setup_test()
+ self.libraries_svr4_libs_present()
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile
===================================================================
--- /dev/null
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile
@@ -0,0 +1,17 @@
+LEVEL = ../../../make
+
+LIB_PREFIX := svr4lib
+LD_EXTRAS := -L. -l$(LIB_PREFIX)_a -l$(LIB_PREFIX)_b\"
+CXX_SOURCES := main.cpp
+USE_LIBDL := 1
+MAKE_DSYM := NO
+
+include $(LEVEL)/Makefile.rules
+
+a.out: $(LIB_PREFIX)_a $(LIB_PREFIX)_b_quote
+
+svr4lib_%:
+ $(MAKE) VPATH=$(SRCDIR) -I $(SRCDIR) -f "$(SRCDIR)/$(LIB_PREFIX)_$*.mk"
+
+clean::
+ $(MAKE) -f $(SRCDIR)/$(LIB_PREFIX)_a.mk clean
Index: lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -513,7 +513,8 @@
self,
inferior_args=None,
inferior_sleep_seconds=3,
- inferior_exe_path=None):
+ inferior_exe_path=None,
+ inferior_env=None):
"""Prep the debug monitor, the inferior, and the expected packet stream.
Handle the separate cases of using the debug monitor in attach-to-inferior mode
@@ -576,6 +577,9 @@
# Build the expected protocol stream
self.add_no_ack_remote_stream()
+ if inferior_env:
+ for name, value in inferior_env.items():
+ self.add_set_environment_packets(name, value)
if self._inferior_startup == self._STARTUP_LAUNCH:
self.add_verified_launch_packets(launch_args)
@@ -656,6 +660,12 @@
{"direction": "send", "regex": r"^\$(.+)#[0-9a-fA-F]{2}$", "capture": {1: "process_info_raw"}}],
True)
+ def add_set_environment_packets(self, name, value):
+ self.test_sequence.add_log_lines(
+ ["read packet: $QEnvironment:" + name + "=" + value + "#00",
+ "send packet: $OK#00",
+ ], True)
+
_KNOWN_PROCESS_INFO_KEYS = [
"pid",
"parent-pid",
@@ -816,6 +826,7 @@
"error"])
self.assertIsNotNone(val)
+ mem_region_dict["name"] = seven.unhexlify(mem_region_dict.get("name", ""))
# Return the dictionary of key-value pairs for the memory region.
return mem_region_dict
Index: lldb/include/lldb/Host/common/NativeProcessProtocol.h
===================================================================
--- lldb/include/lldb/Host/common/NativeProcessProtocol.h
+++ lldb/include/lldb/Host/common/NativeProcessProtocol.h
@@ -32,6 +32,13 @@
class MemoryRegionInfo;
class ResumeActionList;
+struct SVR4LibraryInfo {
+ std::string name;
+ lldb::addr_t link_map;
+ lldb::addr_t base_addr;
+ lldb::addr_t ld_addr;
+};
+
// NativeProcessProtocol
class NativeProcessProtocol {
public:
@@ -86,6 +93,12 @@
virtual lldb::addr_t GetSharedLibraryInfoAddress() = 0;
+ virtual llvm::Expected<std::vector<SVR4LibraryInfo>>
+ GetLoadedSVR4Libraries() {
+ return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "Not implemented");
+ }
+
virtual bool IsAlive() const;
virtual size_t UpdateThreads() = 0;
Index: lldb/include/lldb/Host/XML.h
===================================================================
--- lldb/include/lldb/Host/XML.h
+++ lldb/include/lldb/Host/XML.h
@@ -175,6 +175,8 @@
XMLNode m_dict_node;
};
+std::string XMLEncodeAttributeValue(const char *value);
+
} // namespace lldb_private
#endif // liblldb_XML_h_
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
