diff options
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/py-breakpoint.c | 14 | ||||
| -rw-r--r-- | gdb/python/py-cmd.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-finishbreakpoint.c | 4 | ||||
| -rw-r--r-- | gdb/python/py-param.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-utils.c | 2 | ||||
| -rw-r--r-- | gdb/python/py-value.c | 4 | ||||
| -rw-r--r-- | gdb/python/python-internal.h | 7 |
7 files changed, 14 insertions, 21 deletions
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 43f0e96..1edd556 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -207,7 +207,7 @@ bppy_set_enabled (PyObject *self, PyObject *newvalue, void *closure) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return 0; @@ -394,7 +394,7 @@ bppy_set_task (PyObject *self, PyObject *newvalue, void *closure) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } if (! valid_id) @@ -484,7 +484,7 @@ bppy_set_ignore_count (PyObject *self, PyObject *newvalue, void *closure) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return 0; @@ -613,7 +613,7 @@ bppy_set_condition (PyObject *self, PyObject *newvalue, void *closure) } catch (const gdb_exception &ex) { - GDB_PY_SET_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (-1, ex); } return 0; @@ -678,7 +678,7 @@ bppy_set_commands (PyObject *self, PyObject *newvalue, void *closure) } catch (const gdb_exception &ex) { - GDB_PY_SET_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (-1, ex); } return 0; @@ -1054,7 +1054,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) catch (const gdb_exception &except) { bppy_pending_object = NULL; - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } BPPY_SET_REQUIRE_VALID ((gdbpy_breakpoint_object *) self); @@ -1584,7 +1584,7 @@ bplocpy_set_enabled (PyObject *py_self, PyObject *newvalue, void *closure) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return 0; } diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index 731a94d..2bb9b82 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -541,7 +541,7 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return 0; diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index d9f7c89..bc53d4e 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -217,7 +217,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } if (PyErr_Occurred ()) @@ -317,7 +317,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } self_bpfinish->py_bp.bp->frame_id = frame_id; diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index 2567061..9741782 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -885,7 +885,7 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds) catch (const gdb_exception &except) { Py_DECREF (self); - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return 0; diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 47f65f4..8064cec 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -247,7 +247,7 @@ get_addr_from_python (PyObject *obj, CORE_ADDR *addr) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } } else diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index e82a4a8..cce7bcb 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -997,7 +997,7 @@ value_has_field (struct value *v, PyObject *field) } catch (const gdb_exception &except) { - GDB_PY_SET_HANDLE_EXCEPTION (except); + return gdbpy_handle_gdb_exception (-1, except); } return has_field; @@ -1709,7 +1709,7 @@ valpy_nonzero (PyObject *self) /* This is not documented in the Python documentation, but if this function fails, return -1 as slot_nb_nonzero does (the default Python nonzero function). */ - GDB_PY_SET_HANDLE_EXCEPTION (ex); + return gdbpy_handle_gdb_exception (-1, ex); } return nonzero; diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index a6ee4a9..d723c4d 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -932,13 +932,6 @@ private: PyGILState_STATE m_state; }; -/* 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 { \ - return gdbpy_handle_gdb_exception (-1, Exception); \ - } while (0) - int gdbpy_print_python_errors_p (void); void gdbpy_print_stack (void); void gdbpy_print_stack_or_quit (); |