From a0b70d996c326eb754bd9ed202b24921ca0b42b9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 21 Mar 2023 14:10:18 -0600 Subject: [PATCH] Implement DAP loadedSources request This implements the DAP loadedSources request, using gdb.execute_mi to avoid having to write another custom Python API. --- gdb/data-directory/Makefile.in | 1 + gdb/python/lib/gdb/dap/__init__.py | 1 + gdb/python/lib/gdb/dap/sources.py | 40 +++++++++++++++++++++++++++++ gdb/testsuite/gdb.dap/basic-dap.exp | 3 +++ 4 files changed, 45 insertions(+) create mode 100644 gdb/python/lib/gdb/dap/sources.py diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in index 39979037245..a95c2d7ab37 100644 --- a/gdb/data-directory/Makefile.in +++ b/gdb/data-directory/Makefile.in @@ -101,6 +101,7 @@ PYTHON_FILE_LIST = \ gdb/dap/pause.py \ gdb/dap/scopes.py \ gdb/dap/server.py \ + gdb/dap/sources.py \ gdb/dap/startup.py \ gdb/dap/state.py \ gdb/dap/threads.py \ diff --git a/gdb/python/lib/gdb/dap/__init__.py b/gdb/python/lib/gdb/dap/__init__.py index 014fd086f4b..f07228e46ce 100644 --- a/gdb/python/lib/gdb/dap/__init__.py +++ b/gdb/python/lib/gdb/dap/__init__.py @@ -29,6 +29,7 @@ from . import memory from . import next from . import pause from . import scopes +from . import sources from . import threads from .server import Server diff --git a/gdb/python/lib/gdb/dap/sources.py b/gdb/python/lib/gdb/dap/sources.py new file mode 100644 index 00000000000..af7313ca2f9 --- /dev/null +++ b/gdb/python/lib/gdb/dap/sources.py @@ -0,0 +1,40 @@ +# Copyright 2023 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import gdb + +from .server import request, capability +from .startup import send_gdb_with_response, in_gdb_thread + + +@in_gdb_thread +def _sources(): + result = [] + for elt in gdb.execute_mi("-file-list-exec-source-files")["files"]: + result.append( + { + "name": elt["file"], + "path": elt["fullname"], + } + ) + return { + "sources": result, + } + + +@request("loadedSources") +@capability("supportsLoadedSourcesRequest") +def sources(**extra): + return send_gdb_with_response(_sources) diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp index 0026690ba44..f28239d8268 100644 --- a/gdb/testsuite/gdb.dap/basic-dap.exp +++ b/gdb/testsuite/gdb.dap/basic-dap.exp @@ -168,4 +168,7 @@ set obj [dap_check_request_and_response "command repl" \ set response [lindex $obj 0] gdb_assert {[dict get $response body result] == 23} +set obj [dap_check_request_and_response sources loadedSources] +gdb_assert {[string first basic-dap.c $obj] != -1} + dap_shutdown -- 2.30.2