From f0b734886e33ffa001beaa132f692fbfdd69229d Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Wed, 20 Sep 2023 14:18:53 +0200 Subject: [PATCH] GDB: don't cache the memory map Issue #5004 --- repos/ports/ports/gdb.hash | 2 +- .../src/noux-pkg/gdb/patches/memory_map.patch | 20 +++++++++++++++++++ repos/ports/src/noux-pkg/gdb/patches/series | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 repos/ports/src/noux-pkg/gdb/patches/memory_map.patch diff --git a/repos/ports/ports/gdb.hash b/repos/ports/ports/gdb.hash index f00003abd9..d04d577889 100644 --- a/repos/ports/ports/gdb.hash +++ b/repos/ports/ports/gdb.hash @@ -1 +1 @@ -3b5bd5ce53f96a52eb48eca9c95066e307636367 +a8c8d04deda7e71e478139c13462d27372f61df3 diff --git a/repos/ports/src/noux-pkg/gdb/patches/memory_map.patch b/repos/ports/src/noux-pkg/gdb/patches/memory_map.patch new file mode 100644 index 0000000000..e0baa65bb6 --- /dev/null +++ b/repos/ports/src/noux-pkg/gdb/patches/memory_map.patch @@ -0,0 +1,20 @@ +memory_map.patch + +Always request the current memory map instead of +caching the first received map, so 'info mem' +can be used to get the memory maps of different +inferiors. + +diff --git a/gdb/memattr.c b/gdb/memattr.c +index fafd909..258aca3 100644 +--- a/gdb/memattr.c ++++ b/gdb/memattr.c +@@ -105,7 +105,7 @@ require_user_regions (int from_tty) + static void + require_target_regions (void) + { +- if (mem_use_target () && !target_mem_regions_valid) ++ if (mem_use_target () /*&& !target_mem_regions_valid*/) + { + target_mem_regions_valid = true; + target_mem_region_list = target_memory_map (); diff --git a/repos/ports/src/noux-pkg/gdb/patches/series b/repos/ports/src/noux-pkg/gdb/patches/series index 1dc3e7687d..131a5b8d26 100644 --- a/repos/ports/src/noux-pkg/gdb/patches/series +++ b/repos/ports/src/noux-pkg/gdb/patches/series @@ -6,3 +6,4 @@ noux_build.patch gdbserver_genode.patch call_dummy_location.patch non_stop.patch +memory_map.patch