gdb: remove BLOCK_SUPERBLOCK macro

Replace with equivalent methods.

Change-Id: I334a319909a50b5cc5570a45c38c70e10dc00630
This commit is contained in:
Simon Marchi 2022-01-28 11:41:38 -05:00 committed by Simon Marchi
parent 6c00f721c8
commit f135fe728e
26 changed files with 92 additions and 84 deletions

View file

@ -146,7 +146,7 @@ blpy_get_superblock (PyObject *self, void *closure)
BLPY_REQUIRE_VALID (self, block);
super_block = BLOCK_SUPERBLOCK (block);
super_block = block->superblock ();
if (super_block)
return block_to_block_object (super_block, self_obj->objfile);
@ -183,7 +183,7 @@ blpy_get_static_block (PyObject *self, void *closure)
BLPY_REQUIRE_VALID (self, block);
if (BLOCK_SUPERBLOCK (block) == NULL)
if (block->superblock () == NULL)
Py_RETURN_NONE;
static_block = block_static_block (block);
@ -201,7 +201,7 @@ blpy_is_global (PyObject *self, void *closure)
BLPY_REQUIRE_VALID (self, block);
if (BLOCK_SUPERBLOCK (block))
if (block->superblock ())
Py_RETURN_FALSE;
Py_RETURN_TRUE;
@ -217,8 +217,8 @@ blpy_is_static (PyObject *self, void *closure)
BLPY_REQUIRE_VALID (self, block);
if (BLOCK_SUPERBLOCK (block) != NULL
&& BLOCK_SUPERBLOCK (BLOCK_SUPERBLOCK (block)) == NULL)
if (block->superblock () != NULL
&& block->superblock ()->superblock () == NULL)
Py_RETURN_TRUE;
Py_RETURN_FALSE;

View file

@ -293,7 +293,7 @@ frapy_block (PyObject *self, PyObject *args)
for (fn_block = block;
fn_block != NULL && fn_block->function () == NULL;
fn_block = BLOCK_SUPERBLOCK (fn_block))
fn_block = fn_block->superblock ())
;
if (block == NULL || fn_block == NULL || fn_block->function () == NULL)