diff options
| -rw-r--r-- | gdb/block.c | 8 | ||||
| -rw-r--r-- | gdb/block.h | 7 | ||||
| -rw-r--r-- | gdb/buildsym.c | 2 | ||||
| -rw-r--r-- | gdb/jit.c | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/gdb/block.c b/gdb/block.c index c0d6ed7..3cd90dc 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -404,15 +404,15 @@ allocate_global_block (struct obstack *obstack) return &bl->block; } -/* Set the compunit of the global block. */ +/* See block.h. */ void -set_block_compunit_symtab (struct block *block, struct compunit_symtab *cu) +block::set_compunit_symtab (struct compunit_symtab *cu) { struct global_block *gb; - gdb_assert (block->superblock () == NULL); - gb = (struct global_block *) block; + gdb_assert (superblock () == NULL); + gb = (struct global_block *) this; gdb_assert (gb->compunit_symtab == NULL); gb->compunit_symtab = cu; } diff --git a/gdb/block.h b/gdb/block.h index 9ce8ef5..ce8c967 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -254,6 +254,10 @@ struct block const struct block *global_block () const; + /* Set the compunit of this block, which must be a global block. */ + + void set_compunit_symtab (struct compunit_symtab *); + /* Addresses in the executable code that are in this block. */ CORE_ADDR m_start; @@ -417,9 +421,6 @@ extern struct block *allocate_block (struct obstack *obstack); extern struct block *allocate_global_block (struct obstack *obstack); -extern void set_block_compunit_symtab (struct block *, - struct compunit_symtab *); - /* Return a property to evaluate the static link associated to BLOCK. In the context of nested functions (available in Pascal, Ada and GNU C, for diff --git a/gdb/buildsym.c b/gdb/buildsym.c index adc554e..b76fef3 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -971,7 +971,7 @@ buildsym_compunit::end_compunit_symtab_with_blockvector { struct block *b = blockvector->global_block (); - set_block_compunit_symtab (b, cu); + b->set_compunit_symtab (cu); } cu->set_macro_table (release_macros ()); @@ -623,7 +623,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) bv->set_block (i, new_block); if (i == GLOBAL_BLOCK) - set_block_compunit_symtab (new_block, cust); + new_block->set_compunit_symtab (cust); } /* Fill up the superblock fields for the real blocks, using the |