From 6dd5a4bd44b7b7d2daf195dd5e48faeaf7231c17 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 6 Feb 2022 22:21:21 -0500 Subject: gdb: remove BLOCK_RANGE_{START,END} macros Replace with equivalent methods on blockrange. Change-Id: I20fd8f624e0129782c36768291891e7582d77c74 --- gdb/blockframe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gdb/blockframe.c') diff --git a/gdb/blockframe.c b/gdb/blockframe.c index cfc4fd2..e91faaa 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -286,11 +286,11 @@ find_pc_partial_function_sym (CORE_ADDR pc, int i; for (i = 0; i < BLOCK_NRANGES (b); i++) { - if (BLOCK_RANGE_START (b, i) <= mapped_pc - && mapped_pc < BLOCK_RANGE_END (b, i)) + if (BLOCK_RANGE (b)[i].start () <= mapped_pc + && mapped_pc < BLOCK_RANGE (b)[i].end ()) { - cache_pc_function_low = BLOCK_RANGE_START (b, i); - cache_pc_function_high = BLOCK_RANGE_END (b, i); + cache_pc_function_low = BLOCK_RANGE (b)[i].start (); + cache_pc_function_high = BLOCK_RANGE (b)[i].end (); break; } } @@ -396,14 +396,14 @@ find_function_entry_range_from_pc (CORE_ADDR pc, const char **name, for (int i = 0; i < BLOCK_NRANGES (block); i++) { - if (BLOCK_RANGE_START (block, i) <= entry_pc - && entry_pc < BLOCK_RANGE_END (block, i)) + if (BLOCK_RANGE (block)[i].start () <= entry_pc + && entry_pc < BLOCK_RANGE (block)[i].end ()) { if (address != nullptr) - *address = BLOCK_RANGE_START (block, i); + *address = BLOCK_RANGE (block)[i].start (); if (endaddr != nullptr) - *endaddr = BLOCK_RANGE_END (block, i); + *endaddr = BLOCK_RANGE (block)[i].end (); return status; } -- cgit v1.1