diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2022-02-06 22:54:03 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2022-04-27 22:05:03 -0400 |
| commit | 63d609debba854d08a515f73d0ad8e4ef8948370 (patch) | |
| tree | c5e6b2c9d4b48350c707316a48e69388524cdf66 /gdb/python | |
| parent | 6395b62847e581acc3e8fa179444b824d17b3d68 (diff) | |
| download | binutils-63d609debba854d08a515f73d0ad8e4ef8948370.zip binutils-63d609debba854d08a515f73d0ad8e4ef8948370.tar.gz binutils-63d609debba854d08a515f73d0ad8e4ef8948370.tar.bz2 | |
gdb: remove BLOCKVECTOR_BLOCK and BLOCKVECTOR_NBLOCKS macros
Replace with calls to blockvector::blocks, and the appropriate method
call on the returned array_view.
Change-Id: I04d1f39603e4d4c21c96822421431d9a029d8ddd
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/py-symbol.c | 3 | ||||
| -rw-r--r-- | gdb/python/py-symtab.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 414a310..02c35ac 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -569,10 +569,9 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw) for (compunit_symtab *cust : objfile->compunits ()) { const struct blockvector *bv; - const struct block *block; bv = cust->blockvector (); - block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); + const struct block *block = bv->static_block (); if (block != nullptr) { diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index 0a6ee01..7ed6271 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -176,13 +176,13 @@ static PyObject * stpy_global_block (PyObject *self, PyObject *args) { struct symtab *symtab = NULL; - const struct block *block = NULL; const struct blockvector *blockvector; STPY_REQUIRE_VALID (self, symtab); blockvector = symtab->compunit ()->blockvector (); - block = BLOCKVECTOR_BLOCK (blockvector, GLOBAL_BLOCK); + const struct block *block = blockvector->global_block (); + return block_to_block_object (block, symtab->compunit ()->objfile ()); } @@ -192,13 +192,13 @@ static PyObject * stpy_static_block (PyObject *self, PyObject *args) { struct symtab *symtab = NULL; - const struct block *block = NULL; const struct blockvector *blockvector; STPY_REQUIRE_VALID (self, symtab); blockvector = symtab->compunit ()->blockvector (); - block = BLOCKVECTOR_BLOCK (blockvector, STATIC_BLOCK); + const struct block *block = blockvector->static_block (); + return block_to_block_object (block, symtab->compunit ()->objfile ()); } |