diff options
Diffstat (limited to 'gdb/python')
| -rw-r--r-- | gdb/python/py-breakpoint.c | 20 | ||||
| -rw-r--r-- | gdb/python/py-finishbreakpoint.c | 6 | ||||
| -rw-r--r-- | gdb/python/python.c | 10 |
3 files changed, 18 insertions, 18 deletions
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 74de0d9..029ced74 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -412,8 +412,8 @@ bppy_get_location (PyObject *self, void *closure) && obj->bp->type != bp_hardware_breakpoint) Py_RETURN_NONE; - const char *str = event_location_to_string (obj->bp->location.get ()); - if (! str) + const char *str = location_spec_to_string (obj->bp->locspec.get ()); + if (str == nullptr) str = ""; return host_string_to_python_string (str).release (); } @@ -821,7 +821,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) case bp_breakpoint: case bp_hardware_breakpoint: { - event_location_up location; + location_spec_up locspec; symbol_name_match_type func_name_match_type = (qualified != NULL && PyObject_IsTrue (qualified) ? symbol_name_match_type::FULL @@ -833,9 +833,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) copy_holder (xstrdup (skip_spaces (spec))); const char *copy = copy_holder.get (); - location = string_to_event_location (©, - current_language, - func_name_match_type); + locspec = string_to_location_spec (©, + current_language, + func_name_match_type); } else { @@ -852,14 +852,14 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) explicit_loc.func_name_match_type = func_name_match_type; - location = new_explicit_location (&explicit_loc); + locspec = new_explicit_location_spec (&explicit_loc); } - const struct breakpoint_ops *ops = - breakpoint_ops_for_event_location (location.get (), false); + const struct breakpoint_ops *ops + = breakpoint_ops_for_location_spec (locspec.get (), false); create_breakpoint (gdbpy_enter::get_gdbarch (), - location.get (), NULL, -1, NULL, false, + locspec.get (), NULL, -1, NULL, false, 0, temporary_bp, type, 0, diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index df54d36..c80096f 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -296,10 +296,10 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) try { /* Set a breakpoint on the return address. */ - event_location_up location - = new_address_location (get_frame_pc (prev_frame), NULL, 0); + location_spec_up locspec + = new_address_location_spec (get_frame_pc (prev_frame), NULL, 0); create_breakpoint (gdbpy_enter::get_gdbarch (), - location.get (), NULL, thread, NULL, false, + locspec.get (), NULL, thread, NULL, false, 0, 1 /*temp_flag*/, bp_breakpoint, diff --git a/gdb/python/python.c b/gdb/python/python.c index 7faad2b..8f526bb 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -868,7 +868,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args) const char *arg = NULL; gdbpy_ref<> result; gdbpy_ref<> unparsed; - event_location_up location; + location_spec_up locspec; if (! PyArg_ParseTuple (args, "|s", &arg)) return NULL; @@ -883,17 +883,17 @@ gdbpy_decode_line (PyObject *self, PyObject *args) } if (arg != NULL) - location = string_to_event_location_basic (&arg, current_language, - symbol_name_match_type::WILD); + locspec = string_to_location_spec_basic (&arg, current_language, + symbol_name_match_type::WILD); std::vector<symtab_and_line> decoded_sals; symtab_and_line def_sal; gdb::array_view<symtab_and_line> sals; try { - if (location != NULL) + if (locspec != NULL) { - decoded_sals = decode_line_1 (location.get (), 0, NULL, NULL, 0); + decoded_sals = decode_line_1 (locspec.get (), 0, NULL, NULL, 0); sals = decoded_sals; } else |