diff options
| -rw-r--r-- | gdb/python/py-arch.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-breakpoint.c | 4 | ||||
| -rw-r--r-- | gdb/python/py-connection.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-disasm.c | 6 | ||||
| -rw-r--r-- | gdb/python/py-frame.c | 42 | ||||
| -rw-r--r-- | gdb/python/py-gdb-readline.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-inferior.c | 10 | ||||
| -rw-r--r-- | gdb/python/py-infthread.c | 8 | ||||
| -rw-r--r-- | gdb/python/py-lazy-string.c | 4 | ||||
| -rw-r--r-- | gdb/python/py-linetable.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-mi.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-objfile.c | 8 | ||||
| -rw-r--r-- | gdb/python/py-progspace.c | 4 | ||||
| -rw-r--r-- | gdb/python/py-record-btrace.c | 8 | ||||
| -rw-r--r-- | gdb/python/py-record.c | 4 | ||||
| -rw-r--r-- | gdb/python/py-stopevent.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-symbol.c | 14 | ||||
| -rw-r--r-- | gdb/python/py-tui.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-type.c | 40 | ||||
| -rw-r--r-- | gdb/python/py-unwind.c | 22 | ||||
| -rw-r--r-- | gdb/python/py-value.c | 60 | ||||
| -rw-r--r-- | gdb/python/python-internal.h | 7 | ||||
| -rw-r--r-- | gdb/python/python.c | 10 |
23 files changed, 129 insertions, 136 deletions
diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c index 0eb4282..d73d7fc 100644 --- a/gdb/python/py-arch.c +++ b/gdb/python/py-arch.c @@ -199,7 +199,7 @@ archpy_disassemble (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } gdbpy_ref<> pc_obj = gdb_py_object_from_ulongest (pc); diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index a21ffac..43f0e96 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -443,7 +443,7 @@ bppy_delete_breakpoint (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -640,7 +640,7 @@ bppy_get_commands (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return host_string_to_python_string (stb.c_str ()).release (); diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c index 7f5cce3..1fdcd73 100644 --- a/gdb/python/py-connection.c +++ b/gdb/python/py-connection.c @@ -423,7 +423,7 @@ connpy_send_packet (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c index 8adf28c..7b64436 100644 --- a/gdb/python/py-disasm.c +++ b/gdb/python/py-disasm.c @@ -595,7 +595,7 @@ disasmpy_builtin_disassemble (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (!str.empty ()) PyErr_SetString (gdbpy_gdberror_exc, str.c_str ()); @@ -933,7 +933,7 @@ disasmpy_result_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_Decode (str.c_str (), str.size (), @@ -1512,7 +1512,7 @@ disasmpy_addr_part_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_Decode (str.c_str (), str.size (), diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index fef4640..88646ee 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -115,7 +115,7 @@ frapy_is_valid (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (frame == NULL) @@ -143,7 +143,7 @@ frapy_name (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (name) @@ -177,7 +177,7 @@ frapy_type (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return gdb_py_object_from_longest (type).release (); @@ -198,7 +198,7 @@ frapy_arch (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return gdbarch_to_arch_object (obj->gdbarch); @@ -219,7 +219,7 @@ frapy_unwind_stop_reason (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } stop_reason = get_frame_unwind_stop_reason (frame); @@ -244,7 +244,7 @@ frapy_pc (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return gdb_py_object_from_ulongest (pc).release (); @@ -286,7 +286,7 @@ frapy_read_register (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -308,7 +308,7 @@ frapy_block (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } for (fn_block = block; @@ -347,7 +347,7 @@ frapy_function (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (sym) @@ -389,7 +389,7 @@ frame_info_to_frame_object (const frame_info_ptr &frame) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return (PyObject *) frame_obj.release (); @@ -413,7 +413,7 @@ frapy_older (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (prev) @@ -445,7 +445,7 @@ frapy_newer (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (next) @@ -477,7 +477,7 @@ frapy_find_sal (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return sal_obj; @@ -537,7 +537,7 @@ frapy_read_var (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (!var) @@ -567,7 +567,7 @@ frapy_read_var (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -588,7 +588,7 @@ frapy_select (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -609,7 +609,7 @@ frapy_level (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -632,7 +632,7 @@ frapy_language (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -653,7 +653,7 @@ frapy_static_link (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (link == nullptr) @@ -676,7 +676,7 @@ gdbpy_newest_frame (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return frame_info_to_frame_object (frame); @@ -696,7 +696,7 @@ gdbpy_selected_frame (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return frame_info_to_frame_object (frame); diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c index 14a76b4..dd0ee45 100644 --- a/gdb/python/py-gdb-readline.c +++ b/gdb/python/py-gdb-readline.c @@ -59,7 +59,7 @@ gdbpy_readline_wrapper (FILE *sys_stdin, FILE *sys_stdout, /* This readline callback is called without the GIL held. */ gdbpy_gil gil; - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } /* Detect EOF (Ctrl-D). */ diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index e5a74c1..60bf56d 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -412,7 +412,7 @@ infpy_threads (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } tuple = PyTuple_New (inf_obj->threads->size ()); @@ -578,7 +578,7 @@ infpy_read_memory (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } @@ -633,7 +633,7 @@ infpy_write_memory (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &ex) { - GDB_PY_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (nullptr, ex); } Py_RETURN_NONE; @@ -707,7 +707,7 @@ infpy_search_memory (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &ex) { - GDB_PY_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (nullptr, ex); } if (found) @@ -783,7 +783,7 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c index 09f493a..4340666 100644 --- a/gdb/python/py-infthread.c +++ b/gdb/python/py-infthread.c @@ -104,7 +104,7 @@ thpy_get_details (PyObject *self, void *ignore) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (extra_info == nullptr) Py_RETURN_NONE; @@ -212,7 +212,7 @@ thpy_get_ptid_string (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } @@ -245,7 +245,7 @@ thpy_switch (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -330,7 +330,7 @@ thpy_thread_handle (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (hv.size () == 0) diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c index 67b7a33..4898a1f 100644 --- a/gdb/python/py-lazy-string.c +++ b/gdb/python/py-lazy-string.c @@ -148,7 +148,7 @@ stpy_convert_to_value (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -311,7 +311,7 @@ stpy_str (PyObject *self) } catch (const gdb_exception &exc) { - GDB_PY_HANDLE_EXCEPTION (exc); + return gdbpy_handle_gdb_exception (nullptr, exc); } return host_string_to_python_string (stream.c_str ()).release (); diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c index 8c0a6cc..fc57f36 100644 --- a/gdb/python/py-linetable.c +++ b/gdb/python/py-linetable.c @@ -169,7 +169,7 @@ ltpy_get_pcs_for_line (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return build_line_table_tuple_from_pcs (py_line, pcs); diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c index 0a63654..632de10 100644 --- a/gdb/python/py-mi.c +++ b/gdb/python/py-mi.c @@ -168,7 +168,7 @@ gdbpy_execute_mi_command (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return uiout.result ().release (); diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index d8c7631..6ce58a1 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -162,7 +162,7 @@ objfpy_get_build_id (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (build_id != NULL) @@ -453,7 +453,7 @@ objfpy_add_separate_debug_file (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -488,7 +488,7 @@ objfpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -523,7 +523,7 @@ objfpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c index 081d632..aa1e713 100644 --- a/gdb/python/py-progspace.c +++ b/gdb/python/py-progspace.c @@ -522,7 +522,7 @@ pspy_block_for_pc (PyObject *o, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (cust == NULL || cust->objfile () == NULL) @@ -564,7 +564,7 @@ pspy_find_pc_line (PyObject *o, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c index 55ee67e..e4f0fd1 100644 --- a/gdb/python/py-record-btrace.c +++ b/gdb/python/py-record-btrace.c @@ -217,7 +217,7 @@ recpy_bt_insn_sal (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -288,7 +288,7 @@ recpy_bt_insn_data (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } object = PyBytes_FromStringAndSize ((const char *) buffer.data (), @@ -318,7 +318,7 @@ recpy_bt_insn_decoded (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyBytes_FromString (strfile.string ().c_str ()); @@ -943,7 +943,7 @@ recpy_bt_goto (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c index 83cfa66..2995dc1 100644 --- a/gdb/python/py-record.c +++ b/gdb/python/py-record.c @@ -681,7 +681,7 @@ gdbpy_start_recording (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } @@ -713,7 +713,7 @@ gdbpy_stop_recording (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/py-stopevent.c b/gdb/python/py-stopevent.c index 47f81bd..485bbb1 100644 --- a/gdb/python/py-stopevent.c +++ b/gdb/python/py-stopevent.c @@ -74,7 +74,7 @@ py_print_bpstat (bpstat *bs, enum gdb_signal stop_signal) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } gdbpy_ref<> dict = uiout.result (); diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 1c3a675..24b53bb 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -222,7 +222,7 @@ sympy_needs_frame (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (result) @@ -307,7 +307,7 @@ sympy_value (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -425,7 +425,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } @@ -436,7 +436,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } gdbpy_ref<> ret_tuple (PyTuple_New (2)); @@ -485,7 +485,7 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (symbol) @@ -553,7 +553,7 @@ gdbpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (symbol) @@ -631,7 +631,7 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return return_list.release (); diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c index 3be0fb1..afa6f36 100644 --- a/gdb/python/py-tui.c +++ b/gdb/python/py-tui.c @@ -425,7 +425,7 @@ gdbpy_register_tui_window (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c index 5e00b94..284960a 100644 --- a/gdb/python/py-type.c +++ b/gdb/python/py-type.c @@ -292,7 +292,7 @@ typy_fields_items (PyObject *self, enum gdbpy_iter_kind kind) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } gdbpy_ref<> type_holder; @@ -456,7 +456,7 @@ typy_is_array_like (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (result) @@ -480,7 +480,7 @@ typy_is_string_like (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (result) @@ -501,7 +501,7 @@ typy_strip_typedefs (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -522,7 +522,7 @@ typy_get_composite (struct type *type) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (!type->is_pointer_or_reference ()) @@ -592,7 +592,7 @@ typy_array_1 (PyObject *self, PyObject *args, int is_vector) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (array); @@ -626,7 +626,7 @@ typy_pointer (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -698,7 +698,7 @@ typy_reference (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -732,7 +732,7 @@ typy_const (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -750,7 +750,7 @@ typy_volatile (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -768,7 +768,7 @@ typy_unqualified (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type_to_type_object (type); @@ -859,7 +859,7 @@ typy_lookup_typename (const char *type_name, const struct block *block) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return type; @@ -913,7 +913,7 @@ typy_lookup_type (struct demangle_component *demangled, } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } @@ -955,7 +955,7 @@ typy_legacy_template_argument (struct type *type, const struct block *block, } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (! info) @@ -1034,7 +1034,7 @@ typy_template_argument (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } /* We might not have DW_TAG_template_*, so try to parse the type's @@ -1069,7 +1069,7 @@ typy_template_argument (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1093,7 +1093,7 @@ typy_repr (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } auto py_typename = PyUnicode_Decode (type_name.c_str (), type_name.size (), host_charset (), NULL); @@ -1115,7 +1115,7 @@ typy_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_Decode (thetype.c_str (), thetype.size (), @@ -1151,7 +1151,7 @@ typy_richcompare (PyObject *self, PyObject *other, int op) { /* If there is a GDB exception, a comparison is not capable (or trusted), so exit. */ - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } @@ -1471,7 +1471,7 @@ type_to_type_object (struct type *type) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } type_obj = PyObject_New (type_object, &type_object_type); diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index a10a758..68deaf9 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -228,7 +228,7 @@ unwind_infopy_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } } else @@ -378,7 +378,7 @@ unwind_infopy_add_saved_register (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } gdbpy_ref<> new_value = gdbpy_ref<>::new_reference (pyo_reg_value); @@ -429,7 +429,7 @@ pending_framepy_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_FromFormat ("SP=%s,PC=%s", sp_str, pc_str); @@ -456,7 +456,7 @@ pending_framepy_repr (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_FromFormat ("<%s level=%d, sp=%s, pc=%s>", @@ -505,7 +505,7 @@ pending_framepy_read_register (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -546,7 +546,7 @@ pending_framepy_name (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (name != nullptr) @@ -574,7 +574,7 @@ pending_framepy_pc (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return gdb_py_object_from_ulongest (pc).release (); @@ -601,7 +601,7 @@ pending_framepy_language (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -628,7 +628,7 @@ pending_framepy_find_sal (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return sal_obj; @@ -653,7 +653,7 @@ pending_framepy_block (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } for (fn_block = block; @@ -696,7 +696,7 @@ pending_framepy_function (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (sym != nullptr) diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 98b82a9..e82a4a8 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -257,7 +257,7 @@ valpy_dereference (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -300,7 +300,7 @@ valpy_referenced_value (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -323,7 +323,7 @@ valpy_reference_value (PyObject *self, PyObject *args, enum type_code refcode) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -369,7 +369,7 @@ valpy_to_array (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -393,7 +393,7 @@ valpy_const_value (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -499,7 +499,7 @@ valpy_get_dynamic_type (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (type == NULL) @@ -605,7 +605,7 @@ valpy_lazy_string (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return str_obj; @@ -640,7 +640,7 @@ valpy_string (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } encoding = (user_encoding && *user_encoding) ? user_encoding : la_encoding; @@ -824,7 +824,7 @@ valpy_format_string (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_Decode (stb.c_str (), stb.size (), host_charset (), NULL); @@ -869,7 +869,7 @@ valpy_do_cast (PyObject *self, PyObject *args, enum exp_opcode op) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1180,7 +1180,7 @@ valpy_getitem (PyObject *self, PyObject *key) } catch (const gdb_exception &ex) { - GDB_PY_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (nullptr, ex); } return result; @@ -1211,7 +1211,7 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (ftype->code () != TYPE_CODE_FUNC && ftype->code () != TYPE_CODE_METHOD @@ -1268,7 +1268,7 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1293,7 +1293,7 @@ valpy_str (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyUnicode_Decode (stb.c_str (), stb.size (), host_charset (), NULL); @@ -1312,7 +1312,7 @@ valpy_get_is_optimized_out (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (opt) @@ -1334,7 +1334,7 @@ valpy_get_is_lazy (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (opt) @@ -1364,7 +1364,7 @@ valpy_get_bytes (PyObject *self, void *closure) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } value_obj->content_bytes @@ -1408,7 +1408,7 @@ valpy_fetch_lazy (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; @@ -1579,7 +1579,7 @@ valpy_binop (enum valpy_opcode opcode, PyObject *self, PyObject *other) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1647,7 +1647,7 @@ valpy_negative (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1674,7 +1674,7 @@ valpy_absolute (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (isabs) @@ -1729,7 +1729,7 @@ valpy_invert (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1856,7 +1856,7 @@ valpy_richcompare (PyObject *self, PyObject *other, int op) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } /* In this case, the Python exception has already been set. */ @@ -1895,7 +1895,7 @@ valpy_long (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (type->is_unsigned ()) @@ -1930,7 +1930,7 @@ valpy_float (PyObject *self) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return PyFloat_FromDouble (d); @@ -2056,7 +2056,7 @@ convert_value_from_python (PyObject *obj) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return value; @@ -2080,7 +2080,7 @@ gdbpy_history (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -2107,7 +2107,7 @@ gdbpy_add_history (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return nullptr; @@ -2152,7 +2152,7 @@ gdbpy_convenience_variable (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (result == nullptr && !found) @@ -2198,7 +2198,7 @@ gdbpy_set_convenience_variable (PyObject *self, PyObject *args) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 759e305..a6ee4a9 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -933,13 +933,6 @@ private: }; /* Use this in a 'catch' block to convert the exception to a Python - exception and return nullptr. */ -#define GDB_PY_HANDLE_EXCEPTION(Exception) \ - do { \ - return gdbpy_handle_gdb_exception (nullptr, Exception); \ - } while (0) - -/* Use this in a 'catch' block to convert the exception to a Python exception and return -1. */ #define GDB_PY_SET_HANDLE_EXCEPTION(Exception) \ do { \ diff --git a/gdb/python/python.c b/gdb/python/python.c index 405dc82..cc06526 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -593,7 +593,7 @@ gdbpy_parameter (PyObject *self, PyObject *args) } catch (const gdb_exception &ex) { - GDB_PY_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (nullptr, ex); } if (cmd == CMD_LIST_AMBIGUOUS) @@ -756,7 +756,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) convert the exception and continue back in Python, we should re-enable stdin here. */ async_enable_stdin (); - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } if (to_string) @@ -972,7 +972,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args) catch (const gdb_exception &ex) { /* We know this will always throw. */ - GDB_PY_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (nullptr, ex); } if (!sals.empty ()) @@ -1053,7 +1053,7 @@ gdbpy_parse_and_eval (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } return result; @@ -1538,7 +1538,7 @@ gdbpy_write (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (nullptr, except); } Py_RETURN_NONE; |