From 8da065d53ccd9ed50eb9b30979672ba0ead52a1c Mon Sep 17 00:00:00 2001 From: David Carlton Date: Wed, 23 Oct 2002 23:37:33 +0000 Subject: [PATCH] 2002-10-23 David Carlton * parse.c (parse_exp_1): Use BLOCK_START. * x86-64-tdep.c (x86_64_skip_prologue): Use BLOCK_END, SYMBOL_BLOCK_VALUE. * objc-lang.c (find_methods): Use BLOCK_START, BLOCK_END. --- gdb/ChangeLog | 7 +++++++ gdb/objc-lang.c | 4 ++-- gdb/parse.c | 2 +- gdb/x86-64-tdep.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8c4b6e3454..09259e595b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2002-10-23 David Carlton + + * parse.c (parse_exp_1): Use BLOCK_START. + * x86-64-tdep.c (x86_64_skip_prologue): Use BLOCK_END, + SYMBOL_BLOCK_VALUE. + * objc-lang.c (find_methods): Use BLOCK_START, BLOCK_END. + 2002-10-23 David Carlton * symtab.c: Delete cplusplus_hint. diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 0c749a2ebe..2ed2c2e76c 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -1320,8 +1320,8 @@ find_methods (struct symtab *symtab, char type, continue; if (symtab) - if ((SYMBOL_VALUE_ADDRESS (msymbol) < block->startaddr) || - (SYMBOL_VALUE_ADDRESS (msymbol) >= block->endaddr)) + if ((SYMBOL_VALUE_ADDRESS (msymbol) < BLOCK_START (block)) || + (SYMBOL_VALUE_ADDRESS (msymbol) >= BLOCK_END (block))) /* Not in the specified symtab. */ continue; diff --git a/gdb/parse.c b/gdb/parse.c index 5a5612fb3a..5d81dfd0e5 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -1123,7 +1123,7 @@ parse_exp_1 (char **stringptr, struct block *block, int comma) if (block) { expression_context_block = block; - expression_context_pc = block->startaddr; + expression_context_pc = BLOCK_START (block); } else expression_context_block = get_selected_block (&expression_context_pc); diff --git a/gdb/x86-64-tdep.c b/gdb/x86-64-tdep.c index dbc5611cb0..31f32f189c 100644 --- a/gdb/x86-64-tdep.c +++ b/gdb/x86-64-tdep.c @@ -889,7 +889,7 @@ x86_64_skip_prologue (CORE_ADDR pc) if (!v_function || !v_function->ginfo.value.block || !v_sal.symtab) return pc; - endaddr = v_function->ginfo.value.block->endaddr; + endaddr = BLOCK_END (SYMBOL_BLOCK_VALUE (v_function)); for (i = 0; i < v_sal.symtab->linetable->nitems; i++) if (v_sal.symtab->linetable->item[i].pc >= pc -- 2.34.1