projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill init_sal
[deliverable/binutils-gdb.git]
/
gdb
/
python
/
py-frame.c
diff --git
a/gdb/python/py-frame.c
b/gdb/python/py-frame.c
index d78d80794bd70e73ac055cd37f52ab9842239087..c5ae391ef544aff151c9f755c5ef5136bd87f273 100644
(file)
--- a/
gdb/python/py-frame.c
+++ b/
gdb/python/py-frame.c
@@
-1,6
+1,6
@@
/* Python interface to stack frames
/* Python interface to stack frames
- Copyright (C) 2008-201
4
Free Software Foundation, Inc.
+ Copyright (C) 2008-201
7
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-28,6
+28,7
@@
#include "symfile.h"
#include "objfiles.h"
#include "user-regs.h"
#include "symfile.h"
#include "objfiles.h"
#include "user-regs.h"
+#include "py-ref.h"
typedef struct {
PyObject_HEAD
typedef struct {
PyObject_HEAD
@@
-80,17
+81,10
@@
frame_object_to_frame_info (PyObject *obj)
static PyObject *
frapy_str (PyObject *self)
{
static PyObject *
frapy_str (PyObject *self)
{
- char *s;
- PyObject *result;
- struct ui_file *strfile;
-
- strfile = mem_fileopen ();
- fprint_frame_id (strfile, ((frame_object *) self)->frame_id);
- s = ui_file_xstrdup (strfile, NULL);
- result = PyString_FromString (s);
- xfree (s);
+ string_file strfile;
- return result;
+ fprint_frame_id (&strfile, ((frame_object *) self)->frame_id);
+ return PyString_FromString (strfile.c_str ());
}
/* Implementation of gdb.Frame.is_valid (self) -> Boolean.
}
/* Implementation of gdb.Frame.is_valid (self) -> Boolean.
@@
-101,13
+95,16
@@
static PyObject *
frapy_is_valid (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
frapy_is_valid (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
frame = frame_object_to_frame_info (self);
}
{
frame = frame_object_to_frame_info (self);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
if (frame == NULL)
Py_RETURN_FALSE;
if (frame == NULL)
Py_RETURN_FALSE;
@@
-125,19
+122,19
@@
frapy_name (PyObject *self, PyObject *args)
char *name = NULL;
enum language lang;
PyObject *result;
char *name = NULL;
enum language lang;
PyObject *result;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
find_frame_funname (frame, &name, &lang, NULL);
}
{
FRAPY_REQUIRE_VALID (self, frame);
find_frame_funname (frame, &name, &lang, NULL);
}
-
- if (except.reason < 0)
- xfree (name);
-
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ xfree (name);
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
if (name)
{
if (name)
{
@@
-161,15
+158,18
@@
frapy_type (PyObject *self, PyObject *args)
{
struct frame_info *frame;
enum frame_type type = NORMAL_FRAME;/* Initialize to appease gcc warning. */
{
struct frame_info *frame;
enum frame_type type = NORMAL_FRAME;/* Initialize to appease gcc warning. */
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
type = get_frame_type (frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
type = get_frame_type (frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return PyInt_FromLong (type);
}
return PyInt_FromLong (type);
}
@@
-182,13
+182,16
@@
frapy_arch (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL; /* Initialize to appease gcc warning. */
frame_object *obj = (frame_object *) self;
{
struct frame_info *frame = NULL; /* Initialize to appease gcc warning. */
frame_object *obj = (frame_object *) self;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return gdbarch_to_arch_object (obj->gdbarch);
}
return gdbarch_to_arch_object (obj->gdbarch);
}
@@
-200,14
+203,17
@@
static PyObject *
frapy_unwind_stop_reason (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL; /* Initialize to appease gcc warning. */
frapy_unwind_stop_reason (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL; /* Initialize to appease gcc warning. */
- volatile struct gdb_exception except;
enum unwind_stop_reason stop_reason;
enum unwind_stop_reason stop_reason;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
stop_reason = get_frame_unwind_stop_reason (frame);
stop_reason = get_frame_unwind_stop_reason (frame);
@@
-222,15
+228,18
@@
frapy_pc (PyObject *self, PyObject *args)
{
CORE_ADDR pc = 0; /* Initialize to appease gcc warning. */
struct frame_info *frame;
{
CORE_ADDR pc = 0; /* Initialize to appease gcc warning. */
struct frame_info *frame;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
pc = get_frame_pc (frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
pc = get_frame_pc (frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return gdb_py_long_from_ulongest (pc);
}
return gdb_py_long_from_ulongest (pc);
}
@@
-241,14
+250,13
@@
frapy_pc (PyObject *self, PyObject *args)
static PyObject *
frapy_read_register (PyObject *self, PyObject *args)
{
static PyObject *
frapy_read_register (PyObject *self, PyObject *args)
{
- volatile struct gdb_exception except;
const char *regnum_str;
struct value *val = NULL;
if (!PyArg_ParseTuple (args, "s", ®num_str))
return NULL;
const char *regnum_str;
struct value *val = NULL;
if (!PyArg_ParseTuple (args, "s", ®num_str))
return NULL;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
struct frame_info *frame;
int regnum;
{
struct frame_info *frame;
int regnum;
@@
-264,7
+272,11
@@
frapy_read_register (PyObject *self, PyObject *args)
if (val == NULL)
PyErr_SetString (PyExc_ValueError, _("Unknown register."));
}
if (val == NULL)
PyErr_SetString (PyExc_ValueError, _("Unknown register."));
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return val == NULL ? NULL : value_to_value_object (val);
}
return val == NULL ? NULL : value_to_value_object (val);
}
@@
-277,14
+289,17
@@
frapy_block (PyObject *self, PyObject *args)
{
struct frame_info *frame;
const struct block *block = NULL, *fn_block;
{
struct frame_info *frame;
const struct block *block = NULL, *fn_block;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
block = get_frame_block (frame, NULL);
}
{
FRAPY_REQUIRE_VALID (self, frame);
block = get_frame_block (frame, NULL);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
for (fn_block = block;
fn_block != NULL && BLOCK_FUNCTION (fn_block) == NULL;
for (fn_block = block;
fn_block != NULL && BLOCK_FUNCTION (fn_block) == NULL;
@@
-316,15
+331,22
@@
frapy_function (PyObject *self, PyObject *args)
{
struct symbol *sym = NULL;
struct frame_info *frame;
{
struct symbol *sym = NULL;
struct frame_info *frame;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
{
+ char *funname;
+ enum language funlang;
+
FRAPY_REQUIRE_VALID (self, frame);
FRAPY_REQUIRE_VALID (self, frame);
- sym = find_pc_function (get_frame_address_in_block (frame));
+ find_frame_funname (frame, &funname, &funlang, &sym);
+ xfree (funname);
+ }
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
}
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ END_CATCH
if (sym)
return symbol_to_symbol_object (sym);
if (sym)
return symbol_to_symbol_object (sym);
@@
-338,14
+360,12
@@
frapy_function (PyObject *self, PyObject *args)
PyObject *
frame_info_to_frame_object (struct frame_info *frame)
{
PyObject *
frame_info_to_frame_object (struct frame_info *frame)
{
- frame_object *frame_obj;
- volatile struct gdb_exception except;
-
- frame_obj = PyObject_New (frame_object, &frame_object_type);
+ gdbpy_ref<frame_object> frame_obj (PyObject_New (frame_object,
+ &frame_object_type));
if (frame_obj == NULL)
return NULL;
if (frame_obj == NULL)
return NULL;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
/* Try to get the previous frame, to determine if this is the last frame
{
/* Try to get the previous frame, to determine if this is the last frame
@@
-365,13
+385,14
@@
frame_info_to_frame_object (struct frame_info *frame)
}
frame_obj->gdbarch = get_frame_arch (frame);
}
}
frame_obj->gdbarch = get_frame_arch (frame);
}
-
if (except.reason < 0
)
+
CATCH (except, RETURN_MASK_ALL
)
{
{
- Py_DECREF (frame_obj);
gdbpy_convert_exception (except);
return NULL;
}
gdbpy_convert_exception (except);
return NULL;
}
- return (PyObject *) frame_obj;
+ END_CATCH
+
+ return (PyObject *) frame_obj.release ();
}
/* Implementation of gdb.Frame.older (self) -> gdb.Frame.
}
/* Implementation of gdb.Frame.older (self) -> gdb.Frame.
@@
-382,16
+403,19
@@
static PyObject *
frapy_older (PyObject *self, PyObject *args)
{
struct frame_info *frame, *prev = NULL;
frapy_older (PyObject *self, PyObject *args)
{
struct frame_info *frame, *prev = NULL;
- volatile struct gdb_exception except;
PyObject *prev_obj = NULL; /* Initialize to appease gcc warning. */
PyObject *prev_obj = NULL; /* Initialize to appease gcc warning. */
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
prev = get_prev_frame (frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
prev = get_prev_frame (frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
if (prev)
prev_obj = (PyObject *) frame_info_to_frame_object (prev);
if (prev)
prev_obj = (PyObject *) frame_info_to_frame_object (prev);
@@
-412,16
+436,19
@@
static PyObject *
frapy_newer (PyObject *self, PyObject *args)
{
struct frame_info *frame, *next = NULL;
frapy_newer (PyObject *self, PyObject *args)
{
struct frame_info *frame, *next = NULL;
- volatile struct gdb_exception except;
PyObject *next_obj = NULL; /* Initialize to appease gcc warning. */
PyObject *next_obj = NULL; /* Initialize to appease gcc warning. */
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
next = get_next_frame (frame);
}
{
FRAPY_REQUIRE_VALID (self, frame);
next = get_next_frame (frame);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
if (next)
next_obj = (PyObject *) frame_info_to_frame_object (next);
if (next)
next_obj = (PyObject *) frame_info_to_frame_object (next);
@@
-441,18
+468,20
@@
static PyObject *
frapy_find_sal (PyObject *self, PyObject *args)
{
struct frame_info *frame;
frapy_find_sal (PyObject *self, PyObject *args)
{
struct frame_info *frame;
- struct symtab_and_line sal;
- volatile struct gdb_exception except;
PyObject *sal_obj = NULL; /* Initialize to appease gcc warning. */
PyObject *sal_obj = NULL; /* Initialize to appease gcc warning. */
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
{
FRAPY_REQUIRE_VALID (self, frame);
-
find_frame_sal (frame, &sal
);
+
symtab_and_line sal = find_frame_sal (frame
);
sal_obj = symtab_and_line_to_sal_object (sal);
}
sal_obj = symtab_and_line_to_sal_object (sal);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return sal_obj;
}
return sal_obj;
}
@@
-470,8
+499,8
@@
frapy_read_var (PyObject *self, PyObject *args)
struct frame_info *frame;
PyObject *sym_obj, *block_obj = NULL;
struct symbol *var = NULL; /* gcc-4.3.2 false warning. */
struct frame_info *frame;
PyObject *sym_obj, *block_obj = NULL;
struct symbol *var = NULL; /* gcc-4.3.2 false warning. */
+ const struct block *block = NULL;
struct value *val = NULL;
struct value *val = NULL;
- volatile struct gdb_exception except;
if (!PyArg_ParseTuple (args, "O|O", &sym_obj, &block_obj))
return NULL;
if (!PyArg_ParseTuple (args, "O|O", &sym_obj, &block_obj))
return NULL;
@@
-480,15
+509,11
@@
frapy_read_var (PyObject *self, PyObject *args)
var = symbol_object_to_symbol (sym_obj);
else if (gdbpy_is_string (sym_obj))
{
var = symbol_object_to_symbol (sym_obj);
else if (gdbpy_is_string (sym_obj))
{
- char *var_name;
- const struct block *block = NULL;
- struct cleanup *cleanup;
- volatile struct gdb_exception except;
+ gdb::unique_xmalloc_ptr<char>
+ var_name (python_string_to_target_string (sym_obj));
- var_name = python_string_to_target_string (sym_obj);
if (!var_name)
return NULL;
if (!var_name)
return NULL;
- cleanup = make_cleanup (xfree, var_name);
if (block_obj)
{
if (block_obj)
{
@@
-497,36
+522,35
@@
frapy_read_var (PyObject *self, PyObject *args)
{
PyErr_SetString (PyExc_RuntimeError,
_("Second argument must be block."));
{
PyErr_SetString (PyExc_RuntimeError,
_("Second argument must be block."));
- do_cleanups (cleanup);
return NULL;
}
}
return NULL;
}
}
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
{
+ struct block_symbol lookup_sym;
FRAPY_REQUIRE_VALID (self, frame);
if (!block)
block = get_frame_block (frame, NULL);
FRAPY_REQUIRE_VALID (self, frame);
if (!block)
block = get_frame_block (frame, NULL);
- var = lookup_symbol (var_name, block, VAR_DOMAIN, NULL);
+ lookup_sym = lookup_symbol (var_name.get (), block, VAR_DOMAIN, NULL);
+ var = lookup_sym.symbol;
+ block = lookup_sym.block;
}
}
-
if (except.reason < 0
)
+
CATCH (except, RETURN_MASK_ALL
)
{
{
- do_cleanups (cleanup);
gdbpy_convert_exception (except);
return NULL;
}
gdbpy_convert_exception (except);
return NULL;
}
+ END_CATCH
if (!var)
{
PyErr_Format (PyExc_ValueError,
if (!var)
{
PyErr_Format (PyExc_ValueError,
- _("Variable '%s' not found."), var_name);
- do_cleanups (cleanup);
+ _("Variable '%s' not found."), var_name.get ());
return NULL;
}
return NULL;
}
-
- do_cleanups (cleanup);
}
else
{
}
else
{
@@
-535,13
+559,17
@@
frapy_read_var (PyObject *self, PyObject *args)
return NULL;
}
return NULL;
}
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, frame);
{
FRAPY_REQUIRE_VALID (self, frame);
- val = read_var_value (var, frame);
+ val = read_var_value (var,
block,
frame);
}
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return value_to_value_object (val);
}
return value_to_value_object (val);
}
@@
-552,15
+580,18
@@
static PyObject *
frapy_select (PyObject *self, PyObject *args)
{
struct frame_info *fi;
frapy_select (PyObject *self, PyObject *args)
{
struct frame_info *fi;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
FRAPY_REQUIRE_VALID (self, fi);
select_frame (fi);
}
{
FRAPY_REQUIRE_VALID (self, fi);
select_frame (fi);
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
Py_RETURN_NONE;
}
Py_RETURN_NONE;
}
@@
-572,13
+603,16
@@
PyObject *
gdbpy_newest_frame (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
gdbpy_newest_frame (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
frame = get_current_frame ();
}
{
frame = get_current_frame ();
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return frame_info_to_frame_object (frame);
}
return frame_info_to_frame_object (frame);
}
@@
-590,13
+624,16
@@
PyObject *
gdbpy_selected_frame (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
gdbpy_selected_frame (PyObject *self, PyObject *args)
{
struct frame_info *frame = NULL;
- volatile struct gdb_exception except;
- TRY
_CATCH (except, RETURN_MASK_ALL)
+ TRY
{
frame = get_selected_frame ("No frame is currently selected.");
}
{
frame = get_selected_frame ("No frame is currently selected.");
}
- GDB_PY_HANDLE_EXCEPTION (except);
+ CATCH (except, RETURN_MASK_ALL)
+ {
+ GDB_PY_HANDLE_EXCEPTION (except);
+ }
+ END_CATCH
return frame_info_to_frame_object (frame);
}
return frame_info_to_frame_object (frame);
}
@@
-620,7
+657,7
@@
gdbpy_frame_stop_reason_string (PyObject *self, PyObject *args)
return NULL;
}
return NULL;
}
- str = unwind_stop_reason_to_string (reason);
+ str = unwind_stop_reason_to_string (
(enum unwind_stop_reason)
reason);
return PyUnicode_Decode (str, strlen (str), host_charset (), NULL);
}
return PyUnicode_Decode (str, strlen (str), host_charset (), NULL);
}
This page took
0.0304 seconds
and
4
git commands to generate.