diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2024-02-25 21:47:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-27 11:38:46 +0000 |
commit | c82c57621be1447ff2bceb89f232de05b2b6f3a3 (patch) | |
tree | 61f2c5f883b8a1b66b156bcb2cc6ad39451a68d1 /scripts/lib/devtool/ide_plugins/ide_code.py | |
parent | a5b75e29ff1163f433a707506161943289e98d6c (diff) | |
download | poky-c82c57621be1447ff2bceb89f232de05b2b6f3a3.tar.gz |
devtool: ide-sdk prefer sources from workspace
Improve the previous commit:
- log an error if some assumptions are not true
- Use TARGET_DBGSRC_DIR variable
- Do the same for ide none
Why the additional source mapping is required:
For example the cmake-example recipe refers to sources like this:
./recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-readelf \
-wi image/usr/bin/cmake-example | grep -B1 DW_AT_comp_dir
...
<560> DW_AT_name : (indirect line string, offset: 0x1da):
/usr/src/debug/cmake-example/1.0/oe-local-files/cpp-example.cpp
...
Another example is powertop:
./recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-readelf \
-wi image/usr/sbin/powertop | grep -B1 DW_AT_comp_dir
...
<561> DW_AT_name : (indirect line string, offset: 0x1da):
/usr/src/debug/powertop/2.15/src/devlist.cpp
...
For recipes with local files this works. The oe-local-files folder is
not available in the rootfs-dbg and therefore the sources are first
found in the workspace folder. GDB searches for source files in various
places:
https://sourceware.org/gdb/current/onlinedocs/gdb.html/Source-Path.html
However, for the powertop example the sources opened in the editor are
from the rootfs-dbg instead of from the workspace.
Bitbake calls the compiler with
-fmacro-prefix-map=${S}=${TARGET_DBGSRC_DIR}
where TARGET_DBGSRC_DIR defaults to "/usr/src/debug/${PN}/${PV}".
A source map which maps the recipe specific path from TARGET_DBGSRC_DIR
to the workspace fixes this.
The already existing source map for /usr/src/debug applies for all other
recipes. It finds the sources (read only) in the rootfs-dbg folder.
(From OE-Core rev: 06601632c1879cb80276f9b36de91fb7808311a5)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/ide_plugins/ide_code.py')
-rw-r--r-- | scripts/lib/devtool/ide_plugins/ide_code.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/lib/devtool/ide_plugins/ide_code.py b/scripts/lib/devtool/ide_plugins/ide_code.py index 09f0bb2a07..a62b93224e 100644 --- a/scripts/lib/devtool/ide_plugins/ide_code.py +++ b/scripts/lib/devtool/ide_plugins/ide_code.py | |||
@@ -242,9 +242,19 @@ class IdeVSCode(IdeBase): | |||
242 | if gdb_cross_config.image_recipe.rootfs_dbg: | 242 | if gdb_cross_config.image_recipe.rootfs_dbg: |
243 | launch_config['additionalSOLibSearchPath'] = modified_recipe.solib_search_path_str( | 243 | launch_config['additionalSOLibSearchPath'] = modified_recipe.solib_search_path_str( |
244 | gdb_cross_config.image_recipe) | 244 | gdb_cross_config.image_recipe) |
245 | src_file_map[os.path.join("/usr/src/debug", modified_recipe.pn, modified_recipe.pv)] = "${workspaceFolder}" | 245 | # First: Search for sources of this recipe in the workspace folder |
246 | src_file_map["/usr/src/debug"] = os.path.join( | 246 | if modified_recipe.pn in modified_recipe.target_dbgsrc_dir: |
247 | gdb_cross_config.image_recipe.rootfs_dbg, "usr", "src", "debug") | 247 | src_file_map[modified_recipe.target_dbgsrc_dir] = "${workspaceFolder}" |
248 | else: | ||
249 | logger.error( | ||
250 | "TARGET_DBGSRC_DIR must contain the recipe name PN.") | ||
251 | # Second: Search for sources of other recipes in the rootfs-dbg | ||
252 | if modified_recipe.target_dbgsrc_dir.startswith("/usr/src/debug"): | ||
253 | src_file_map["/usr/src/debug"] = os.path.join( | ||
254 | gdb_cross_config.image_recipe.rootfs_dbg, "usr", "src", "debug") | ||
255 | else: | ||
256 | logger.error( | ||
257 | "TARGET_DBGSRC_DIR must start with /usr/src/debug.") | ||
248 | else: | 258 | else: |
249 | logger.warning( | 259 | logger.warning( |
250 | "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") | 260 | "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") |