diff options
Diffstat (limited to 'gdb/addrmap.c')
| -rw-r--r-- | gdb/addrmap.c | 79 |
1 files changed, 44 insertions, 35 deletions
diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 1fc95f3..2b333a1 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -1,6 +1,6 @@ /* addrmap.c --- implementation of address map data structure. - Copyright (C) 2007-2024 Free Software Foundation, Inc. + Copyright (C) 2007-2025 Free Software Foundation, Inc. This file is part of GDB. @@ -201,10 +201,11 @@ xfree_wrapper (splay_tree_key key) xfree ((void *) key); } -void +bool addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, void *obj) { + bool full_range = true; splay_tree_node n, next; void *prior_value; @@ -234,7 +235,12 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, n && addrmap_node_key (n) <= end_inclusive; n = splay_tree_successor (addrmap_node_key (n))) { - if (! addrmap_node_value (n)) + if (addrmap_node_value (n)) + { + /* Already mapped. */ + full_range = false; + } + else addrmap_node_set_value (n, obj); } @@ -254,6 +260,8 @@ addrmap_mutable::set_empty (CORE_ADDR start, CORE_ADDR end_inclusive, else prior_value = addrmap_node_value (n); } + + return full_range; } @@ -398,20 +406,20 @@ namespace selftests { /* Convert P to CORE_ADDR. */ static CORE_ADDR -core_addr (void *p) +core_addr (const void *p) { - return (CORE_ADDR)(uintptr_t)p; + return (CORE_ADDR) (uintptr_t) p; } /* Check that &ARRAY[LOW]..&ARRAY[HIGH] has VAL in MAP. */ -#define CHECK_ADDRMAP_FIND(MAP, ARRAY, LOW, HIGH, VAL) \ - do \ - { \ - for (unsigned i = LOW; i <= HIGH; ++i) \ - SELF_CHECK (MAP->find (core_addr (&ARRAY[i])) == VAL); \ - } \ - while (0) +static void +check_addrmap_find (const addrmap &map, const char *array, unsigned int low, + unsigned int high, const void *val) +{ + for (unsigned int i = low; i <= high; ++i) + SELF_CHECK (map.find (core_addr (&array[i])) == val); +} /* Entry point for addrmap unit tests. */ @@ -427,25 +435,26 @@ test_addrmap () /* Create mutable addrmap. */ auto_obstack temp_obstack; - auto map = std::make_unique<struct addrmap_mutable> (); - SELF_CHECK (map != nullptr); + addrmap_mutable map; /* Check initial state. */ - CHECK_ADDRMAP_FIND (map, array, 0, 19, nullptr); + check_addrmap_find (map, array, 0, 19, nullptr); /* Insert address range into mutable addrmap. */ - map->set_empty (core_addr (&array[10]), core_addr (&array[12]), val1); - CHECK_ADDRMAP_FIND (map, array, 0, 9, nullptr); - CHECK_ADDRMAP_FIND (map, array, 10, 12, val1); - CHECK_ADDRMAP_FIND (map, array, 13, 19, nullptr); + bool full_range_p + = map.set_empty (core_addr (&array[10]), core_addr (&array[12]), val1); + SELF_CHECK (full_range_p); + check_addrmap_find (map, array, 0, 9, nullptr); + check_addrmap_find (map, array, 10, 12, val1); + check_addrmap_find (map, array, 13, 19, nullptr); /* Create corresponding fixed addrmap. */ addrmap_fixed *map2 - = new (&temp_obstack) addrmap_fixed (&temp_obstack, map.get ()); + = new (&temp_obstack) addrmap_fixed (&temp_obstack, &map); SELF_CHECK (map2 != nullptr); - CHECK_ADDRMAP_FIND (map2, array, 0, 9, nullptr); - CHECK_ADDRMAP_FIND (map2, array, 10, 12, val1); - CHECK_ADDRMAP_FIND (map2, array, 13, 19, nullptr); + check_addrmap_find (*map2, array, 0, 9, nullptr); + check_addrmap_find (*map2, array, 10, 12, val1); + check_addrmap_find (*map2, array, 13, 19, nullptr); /* Iterate over both addrmaps. */ auto callback = [&] (CORE_ADDR start_addr, void *obj) @@ -460,29 +469,29 @@ test_addrmap () SELF_CHECK (false); return 0; }; - SELF_CHECK (map->foreach (callback) == 0); + SELF_CHECK (map.foreach (callback) == 0); SELF_CHECK (map2->foreach (callback) == 0); /* Relocate fixed addrmap. */ map2->relocate (1); - CHECK_ADDRMAP_FIND (map2, array, 0, 10, nullptr); - CHECK_ADDRMAP_FIND (map2, array, 11, 13, val1); - CHECK_ADDRMAP_FIND (map2, array, 14, 19, nullptr); + check_addrmap_find (*map2, array, 0, 10, nullptr); + check_addrmap_find (*map2, array, 11, 13, val1); + check_addrmap_find (*map2, array, 14, 19, nullptr); /* Insert partially overlapping address range into mutable addrmap. */ - map->set_empty (core_addr (&array[11]), core_addr (&array[13]), val2); - CHECK_ADDRMAP_FIND (map, array, 0, 9, nullptr); - CHECK_ADDRMAP_FIND (map, array, 10, 12, val1); - CHECK_ADDRMAP_FIND (map, array, 13, 13, val2); - CHECK_ADDRMAP_FIND (map, array, 14, 19, nullptr); + full_range_p + = map.set_empty (core_addr (&array[11]), core_addr (&array[13]), val2); + SELF_CHECK (!full_range_p); + check_addrmap_find (map, array, 0, 9, nullptr); + check_addrmap_find (map, array, 10, 12, val1); + check_addrmap_find (map, array, 13, 13, val2); + check_addrmap_find (map, array, 14, 19, nullptr); } } /* namespace selftests */ #endif /* GDB_SELF_TEST */ -void _initialize_addrmap (); -void -_initialize_addrmap () +INIT_GDB_FILE (addrmap) { #if GDB_SELF_TEST selftests::register_test ("addrmap", selftests::test_addrmap); |