diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-04-22 17:11:25 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-04-28 09:56:20 +0100 |
| commit | 8e3685bf250d9ecda5058912d6624e77d7a2b07e (patch) | |
| tree | 558ae8b08940df7cd7754f42051319591900c249 /gdb/python/python.c | |
| parent | 913832e99c5a1576663e52a4929b13bb263bd692 (diff) | |
| download | binutils-8e3685bf250d9ecda5058912d6624e77d7a2b07e.zip binutils-8e3685bf250d9ecda5058912d6624e77d7a2b07e.tar.gz binutils-8e3685bf250d9ecda5058912d6624e77d7a2b07e.tar.bz2 | |
gdb: delay python initialisation until gdbpy_finish_initialization
Delay Python initialisation until gdbpy_finish_initialization.
This is mostly about splitting the existing gdbpy_initialize_*
functions in two, all the calls to register_objfile_data_with_cleanup,
gdbarch_data_register_post_init, etc are moved into new _initialize_*
functions, but everything else is left in the gdbpy_initialize_*
functions.
Then the call to do_start_initialization (in python/python.c) is moved
from the _initialize_python function into gdbpy_finish_initialization.
There should be no user visible changes after this commit.
gdb/ChangeLog:
* python/py-arch.c (_initialize_py_arch): New function.
(gdbpy_initialize_arch): Move code to _initialize_py_arch.
* python/py-block.c (_initialize_py_block): New function.
(gdbpy_initialize_blocks): Move code to _initialize_py_block.
* python/py-inferior.c (_initialize_py_inferior): New function.
(gdbpy_initialize_inferior): Move code to _initialize_py_inferior.
* python/py-objfile.c (_initialize_py_objfile): New function.
(gdbpy_initialize_objfile): Move code to _initialize_py_objfile.
* python/py-progspace.c (_initialize_py_progspace): New function.
(gdbpy_initialize_pspace): Move code to _initialize_py_progspace.
* python/py-registers.c (_initialize_py_registers): New function.
(gdbpy_initialize_registers): Move code to
_initialize_py_registers.
* python/py-symbol.c (_initialize_py_symbol): New function.
(gdbpy_initialize_symbols): Move code to _initialize_py_symbol.
* python/py-symtab.c (_initialize_py_symtab): New function.
(gdbpy_initialize_symtabs): Move code to _initialize_py_symtab.
* python/py-type.c (_initialize_py_type): New function.
(gdbpy_initialize_types): Move code to _initialize_py_type.
* python/py-unwind.c (_initialize_py_unwind): New function.
(gdbpy_initialize_unwind): Move code to _initialize_py_unwind.
* python/python.c (_initialize_python): Move call to
do_start_initialization to gdbpy_finish_initialization.
(gdbpy_finish_initialization): Add call to
do_start_initialization.
Diffstat (limited to 'gdb/python/python.c')
| -rw-r--r-- | gdb/python/python.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gdb/python/python.c b/gdb/python/python.c index 9eed258..5205080 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1881,11 +1881,6 @@ message == an error message without a stack will be printed."), NULL, NULL, &user_set_python_list, &user_show_python_list); - -#ifdef HAVE_PYTHON - if (!do_start_initialization () && PyErr_Occurred ()) - gdbpy_print_stack (); -#endif /* HAVE_PYTHON */ } #ifdef HAVE_PYTHON @@ -1962,6 +1957,9 @@ do_finish_initialization (const struct extension_language_defn *extlang) static void gdbpy_finish_initialization (const struct extension_language_defn *extlang) { + if (!do_start_initialization () && PyErr_Occurred ()) + gdbpy_print_stack (); + gdbpy_enter enter_py (get_current_arch (), current_language); if (!do_finish_initialization (extlang)) |