2010-04-29 15:45:57 +00:00
|
|
|
|
/* GDB parameters implemented in Python
|
|
|
|
|
|
2015-01-01 09:32:14 +00:00
|
|
|
|
Copyright (C) 2008-2015 Free Software Foundation, Inc.
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "python-internal.h"
|
|
|
|
|
#include "charset.h"
|
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
|
#include "cli/cli-decode.h"
|
|
|
|
|
#include "completer.h"
|
2011-03-10 12:29:08 +00:00
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "arch-utils.h"
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
/* Parameter constants and their values. */
|
|
|
|
|
struct parm_constant
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
int value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct parm_constant parm_constants[] =
|
|
|
|
|
{
|
2010-04-30 16:22:42 +00:00
|
|
|
|
{ "PARAM_BOOLEAN", var_boolean }, /* ARI: var_boolean */
|
2010-04-29 15:45:57 +00:00
|
|
|
|
{ "PARAM_AUTO_BOOLEAN", var_auto_boolean },
|
|
|
|
|
{ "PARAM_UINTEGER", var_uinteger },
|
|
|
|
|
{ "PARAM_INTEGER", var_integer },
|
|
|
|
|
{ "PARAM_STRING", var_string },
|
|
|
|
|
{ "PARAM_STRING_NOESCAPE", var_string_noescape },
|
|
|
|
|
{ "PARAM_OPTIONAL_FILENAME", var_optional_filename },
|
|
|
|
|
{ "PARAM_FILENAME", var_filename },
|
|
|
|
|
{ "PARAM_ZINTEGER", var_zinteger },
|
|
|
|
|
{ "PARAM_ENUM", var_enum },
|
|
|
|
|
{ NULL, 0 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A union that can hold anything described by enum var_types. */
|
|
|
|
|
union parmpy_variable
|
|
|
|
|
{
|
|
|
|
|
/* Hold an integer value, for boolean and integer types. */
|
|
|
|
|
int intval;
|
|
|
|
|
|
|
|
|
|
/* Hold an auto_boolean. */
|
|
|
|
|
enum auto_boolean autoboolval;
|
|
|
|
|
|
|
|
|
|
/* Hold an unsigned integer value, for uinteger. */
|
|
|
|
|
unsigned int uintval;
|
|
|
|
|
|
|
|
|
|
/* Hold a string, for the various string types. */
|
|
|
|
|
char *stringval;
|
|
|
|
|
|
|
|
|
|
/* Hold a string, for enums. */
|
|
|
|
|
const char *cstringval;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* A GDB parameter. */
|
|
|
|
|
struct parmpy_object
|
|
|
|
|
{
|
|
|
|
|
PyObject_HEAD
|
|
|
|
|
|
|
|
|
|
/* The type of the parameter. */
|
|
|
|
|
enum var_types type;
|
|
|
|
|
|
|
|
|
|
/* The value of the parameter. */
|
|
|
|
|
union parmpy_variable value;
|
|
|
|
|
|
|
|
|
|
/* For an enum command, the possible values. The vector is
|
|
|
|
|
allocated with xmalloc, as is each element. It is
|
|
|
|
|
NULL-terminated. */
|
|
|
|
|
const char **enumeration;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
typedef struct parmpy_object parmpy_object;
|
|
|
|
|
|
Fix redefinition errors in C++ mode
In C, we can forward declare static structure instances. That doesn't
work in C++ though. C++ treats these as definitions. So then the
compiler complains about symbol redefinition, like:
src/gdb/elfread.c:1569:29: error: redefinition of ‘const sym_fns elf_sym_fns_lazy_psyms’
src/gdb/elfread.c:53:29: error: ‘const sym_fns elf_sym_fns_lazy_psyms’ previously declared here
The intent of static here is naturally to avoid making these objects
visible outside the compilation unit. The equivalent in C++ would be
to instead define the objects in the anonymous namespace. But given
that it's desirable to leave the codebase compiling as both C and C++
for a while, this just makes the objects extern.
(base_breakpoint_ops is already declared in breakpoint.h, so we can
just remove the forward declare from breakpoint.c)
gdb/ChangeLog:
2015-02-11 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
* breakpoint.c (base_breakpoint_ops): Delete.
* dwarf2loc.c (dwarf_expr_ctx_funcs): Make extern.
* elfread.c (elf_sym_fns_gdb_index, elf_sym_fns_lazy_psyms): Make extern.
* guile/guile.c (guile_extension_script_ops, guile_extension_ops): Make extern.
* ppcnbsd-tdep.c (ppcnbsd2_sigtramp): Make extern.
* python/py-arch.c (arch_object_type): Make extern.
* python/py-block.c (block_syms_iterator_object_type): Make extern.
* python/py-bpevent.c (breakpoint_event_object_type): Make extern.
* python/py-cmd.c (cmdpy_object_type): Make extern.
* python/py-continueevent.c (continue_event_object_type)
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Remove 'qual'
parameter. Update all callers.
* python/py-evtregistry.c (eventregistry_object_type): Make extern.
* python/py-exitedevent.c (exited_event_object_type): Make extern.
* python/py-finishbreakpoint.c (finish_breakpoint_object_type): Make extern.
* python/py-function.c (fnpy_object_type): Make extern.
* python/py-inferior.c (inferior_object_type, membuf_object_type): Make extern.
* python/py-infevents.c (call_pre_event_object_type)
(inferior_call_post_event_object_type).
(memory_changed_event_object_type): Make extern.
* python/py-infthread.c (thread_object_type): Make extern.
* python/py-lazy-string.c (lazy_string_object_type): Make extern.
* python/py-linetable.c (linetable_entry_object_type)
(linetable_object_type, ltpy_iterator_object_type): Make extern.
* python/py-newobjfileevent.c (new_objfile_event_object_type)
(clear_objfiles_event_object_type): Make extern.
* python/py-objfile.c (objfile_object_type): Make extern.
* python/py-param.c (parmpy_object_type): Make extern.
* python/py-progspace.c (pspace_object_type): Make extern.
* python/py-signalevent.c (signal_event_object_type): Make extern.
* python/py-symtab.c (symtab_object_type, sal_object_type): Make extern.
* python/py-type.c (type_object_type, field_object_type)
(type_iterator_object_type): Make extern.
* python/python.c (python_extension_script_ops)
(python_extension_ops): Make extern.
* stap-probe.c (stap_probe_ops): Make extern.
2015-02-11 11:20:21 +00:00
|
|
|
|
extern PyTypeObject parmpy_object_type
|
2013-05-20 20:09:01 +00:00
|
|
|
|
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("parmpy_object");
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
/* Some handy string constants. */
|
|
|
|
|
static PyObject *set_doc_cst;
|
|
|
|
|
static PyObject *show_doc_cst;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Get an attribute. */
|
|
|
|
|
static PyObject *
|
|
|
|
|
get_attr (PyObject *obj, PyObject *attr_name)
|
|
|
|
|
{
|
|
|
|
|
if (PyString_Check (attr_name)
|
2012-12-12 16:47:30 +00:00
|
|
|
|
#ifdef IS_PY3K
|
|
|
|
|
&& ! PyUnicode_CompareWithASCIIString (attr_name, "value"))
|
|
|
|
|
#else
|
2010-04-29 15:45:57 +00:00
|
|
|
|
&& ! strcmp (PyString_AsString (attr_name), "value"))
|
2012-12-12 16:47:30 +00:00
|
|
|
|
#endif
|
2010-04-29 15:45:57 +00:00
|
|
|
|
{
|
|
|
|
|
parmpy_object *self = (parmpy_object *) obj;
|
2010-05-17 21:23:25 +00:00
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
return gdbpy_parameter_value (self->type, &self->value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return PyObject_GenericGetAttr (obj, attr_name);
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-13 13:24:40 +00:00
|
|
|
|
/* Set a parameter value from a Python value. Return 0 on success. Returns
|
|
|
|
|
-1 on error, with a python exception set. */
|
2010-04-29 15:45:57 +00:00
|
|
|
|
static int
|
|
|
|
|
set_parameter_value (parmpy_object *self, PyObject *value)
|
|
|
|
|
{
|
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
|
|
switch (self->type)
|
|
|
|
|
{
|
|
|
|
|
case var_string:
|
|
|
|
|
case var_string_noescape:
|
|
|
|
|
case var_optional_filename:
|
|
|
|
|
case var_filename:
|
|
|
|
|
if (! gdbpy_is_string (value)
|
|
|
|
|
&& (self->type == var_filename
|
|
|
|
|
|| value != Py_None))
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("String required for filename."));
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (value == Py_None)
|
|
|
|
|
{
|
2010-10-13 13:24:40 +00:00
|
|
|
|
xfree (self->value.stringval);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (self->type == var_optional_filename)
|
|
|
|
|
self->value.stringval = xstrdup ("");
|
|
|
|
|
else
|
|
|
|
|
self->value.stringval = NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
2010-10-13 13:24:40 +00:00
|
|
|
|
{
|
|
|
|
|
char *string;
|
|
|
|
|
|
|
|
|
|
string = python_string_to_host_string (value);
|
|
|
|
|
if (string == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
xfree (self->value.stringval);
|
|
|
|
|
self->value.stringval = string;
|
|
|
|
|
}
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_enum:
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
|
|
if (! gdbpy_is_string (value))
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("ENUM arguments must be a string."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
str = python_string_to_host_string (value);
|
2010-10-13 13:24:40 +00:00
|
|
|
|
if (str == NULL)
|
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
for (i = 0; self->enumeration[i]; ++i)
|
|
|
|
|
if (! strcmp (self->enumeration[i], str))
|
|
|
|
|
break;
|
|
|
|
|
xfree (str);
|
|
|
|
|
if (! self->enumeration[i])
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("The value must be member of an enumeration."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
self->value.cstringval = self->enumeration[i];
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case var_boolean:
|
|
|
|
|
if (! PyBool_Check (value))
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("A boolean argument is required."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
cmp = PyObject_IsTrue (value);
|
2013-11-29 20:00:47 +00:00
|
|
|
|
if (cmp < 0)
|
2010-04-29 15:45:57 +00:00
|
|
|
|
return -1;
|
|
|
|
|
self->value.intval = cmp;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_auto_boolean:
|
|
|
|
|
if (! PyBool_Check (value) && value != Py_None)
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("A boolean or None is required"));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (value == Py_None)
|
|
|
|
|
self->value.autoboolval = AUTO_BOOLEAN_AUTO;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
cmp = PyObject_IsTrue (value);
|
|
|
|
|
if (cmp < 0 )
|
2013-11-29 20:00:47 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (cmp == 1)
|
|
|
|
|
self->value.autoboolval = AUTO_BOOLEAN_TRUE;
|
2013-11-29 20:00:47 +00:00
|
|
|
|
else
|
2010-04-29 15:45:57 +00:00
|
|
|
|
self->value.autoboolval = AUTO_BOOLEAN_FALSE;
|
|
|
|
|
}
|
2011-02-28 18:28:19 +00:00
|
|
|
|
break;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
case var_integer:
|
|
|
|
|
case var_zinteger:
|
|
|
|
|
case var_uinteger:
|
|
|
|
|
{
|
|
|
|
|
long l;
|
|
|
|
|
int ok;
|
|
|
|
|
|
|
|
|
|
if (! PyInt_Check (value))
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("The value must be integer."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 20:53:45 +00:00
|
|
|
|
if (! gdb_py_int_as_long (value, &l))
|
|
|
|
|
return -1;
|
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (self->type == var_uinteger)
|
|
|
|
|
{
|
|
|
|
|
ok = (l >= 0 && l <= UINT_MAX);
|
|
|
|
|
if (l == 0)
|
|
|
|
|
l = UINT_MAX;
|
|
|
|
|
}
|
|
|
|
|
else if (self->type == var_integer)
|
|
|
|
|
{
|
|
|
|
|
ok = (l >= INT_MIN && l <= INT_MAX);
|
|
|
|
|
if (l == 0)
|
|
|
|
|
l = INT_MAX;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
ok = (l >= INT_MIN && l <= INT_MAX);
|
|
|
|
|
|
|
|
|
|
if (! ok)
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("Range exceeded."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self->value.intval = (int) l;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("Unhandled type in parameter value."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-13 13:24:40 +00:00
|
|
|
|
/* Set an attribute. Returns -1 on error, with a python exception set. */
|
2010-04-29 15:45:57 +00:00
|
|
|
|
static int
|
|
|
|
|
set_attr (PyObject *obj, PyObject *attr_name, PyObject *val)
|
|
|
|
|
{
|
|
|
|
|
if (PyString_Check (attr_name)
|
2012-12-12 16:47:30 +00:00
|
|
|
|
#ifdef IS_PY3K
|
|
|
|
|
&& ! PyUnicode_CompareWithASCIIString (attr_name, "value"))
|
|
|
|
|
#else
|
2010-04-29 15:45:57 +00:00
|
|
|
|
&& ! strcmp (PyString_AsString (attr_name), "value"))
|
2012-12-12 16:47:30 +00:00
|
|
|
|
#endif
|
2010-04-29 15:45:57 +00:00
|
|
|
|
{
|
|
|
|
|
if (!val)
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("Cannot delete a parameter's value."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return set_parameter_value ((parmpy_object *) obj, val);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return PyObject_GenericSetAttr (obj, attr_name, val);
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-10 12:29:08 +00:00
|
|
|
|
/* A helper function which returns a documentation string for an
|
|
|
|
|
object. */
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
get_doc_string (PyObject *object, PyObject *attr)
|
|
|
|
|
{
|
|
|
|
|
char *result = NULL;
|
|
|
|
|
|
|
|
|
|
if (PyObject_HasAttr (object, attr))
|
|
|
|
|
{
|
|
|
|
|
PyObject *ds_obj = PyObject_GetAttr (object, attr);
|
|
|
|
|
|
|
|
|
|
if (ds_obj && gdbpy_is_string (ds_obj))
|
|
|
|
|
{
|
|
|
|
|
result = python_string_to_host_string (ds_obj);
|
|
|
|
|
if (result == NULL)
|
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
}
|
|
|
|
|
Py_XDECREF (ds_obj);
|
|
|
|
|
}
|
|
|
|
|
if (! result)
|
|
|
|
|
result = xstrdup (_("This command is not documented."));
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Helper function which will execute a METHOD in OBJ passing the
|
|
|
|
|
argument ARG. ARG can be NULL. METHOD should return a Python
|
|
|
|
|
string. If this function returns NULL, there has been an error and
|
|
|
|
|
the appropriate exception set. */
|
|
|
|
|
static char *
|
|
|
|
|
call_doc_function (PyObject *obj, PyObject *method, PyObject *arg)
|
|
|
|
|
{
|
|
|
|
|
char *data = NULL;
|
|
|
|
|
PyObject *result = PyObject_CallMethodObjArgs (obj, method, arg, NULL);
|
|
|
|
|
|
|
|
|
|
if (! result)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
if (gdbpy_is_string (result))
|
|
|
|
|
{
|
|
|
|
|
data = python_string_to_host_string (result);
|
2011-10-24 11:39:50 +00:00
|
|
|
|
Py_DECREF (result);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
if (! data)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("Parameter must return a string value."));
|
2011-10-24 11:39:50 +00:00
|
|
|
|
Py_DECREF (result);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A callback function that is registered against the respective
|
|
|
|
|
add_setshow_* set_doc prototype. This function will either call
|
|
|
|
|
the Python function "get_set_string" or extract the Python
|
|
|
|
|
attribute "set_doc" and return the contents as a string. If
|
|
|
|
|
neither exist, insert a string indicating the Parameter is not
|
|
|
|
|
documented. */
|
|
|
|
|
static void
|
|
|
|
|
get_set_value (char *args, int from_tty,
|
|
|
|
|
struct cmd_list_element *c)
|
|
|
|
|
{
|
|
|
|
|
PyObject *obj = (PyObject *) get_cmd_context (c);
|
|
|
|
|
char *set_doc_string;
|
|
|
|
|
struct cleanup *cleanup = ensure_python_env (get_current_arch (),
|
|
|
|
|
current_language);
|
|
|
|
|
PyObject *set_doc_func = PyString_FromString ("get_set_string");
|
|
|
|
|
|
|
|
|
|
if (! set_doc_func)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
if (PyObject_HasAttr (obj, set_doc_func))
|
|
|
|
|
{
|
|
|
|
|
set_doc_string = call_doc_function (obj, set_doc_func, NULL);
|
|
|
|
|
if (! set_doc_string)
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We have to preserve the existing < GDB 7.3 API. If a
|
|
|
|
|
callback function does not exist, then attempt to read the
|
|
|
|
|
set_doc attribute. */
|
|
|
|
|
set_doc_string = get_doc_string (obj, set_doc_cst);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
make_cleanup (xfree, set_doc_string);
|
|
|
|
|
fprintf_filtered (gdb_stdout, "%s\n", set_doc_string);
|
|
|
|
|
|
2013-05-20 20:34:49 +00:00
|
|
|
|
Py_XDECREF (set_doc_func);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
error:
|
2013-05-20 20:34:49 +00:00
|
|
|
|
Py_XDECREF (set_doc_func);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A callback function that is registered against the respective
|
|
|
|
|
add_setshow_* show_doc prototype. This function will either call
|
|
|
|
|
the Python function "get_show_string" or extract the Python
|
|
|
|
|
attribute "show_doc" and return the contents as a string. If
|
|
|
|
|
neither exist, insert a string indicating the Parameter is not
|
|
|
|
|
documented. */
|
|
|
|
|
static void
|
|
|
|
|
get_show_value (struct ui_file *file, int from_tty,
|
|
|
|
|
struct cmd_list_element *c,
|
|
|
|
|
const char *value)
|
|
|
|
|
{
|
|
|
|
|
PyObject *obj = (PyObject *) get_cmd_context (c);
|
|
|
|
|
char *show_doc_string = NULL;
|
|
|
|
|
struct cleanup *cleanup = ensure_python_env (get_current_arch (),
|
|
|
|
|
current_language);
|
|
|
|
|
PyObject *show_doc_func = PyString_FromString ("get_show_string");
|
|
|
|
|
|
|
|
|
|
if (! show_doc_func)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
if (PyObject_HasAttr (obj, show_doc_func))
|
|
|
|
|
{
|
|
|
|
|
PyObject *val_obj = PyString_FromString (value);
|
|
|
|
|
|
|
|
|
|
if (! val_obj)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
show_doc_string = call_doc_function (obj, show_doc_func, val_obj);
|
2013-05-20 20:34:49 +00:00
|
|
|
|
Py_DECREF (val_obj);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
if (! show_doc_string)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
make_cleanup (xfree, show_doc_string);
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (file, "%s\n", show_doc_string);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We have to preserve the existing < GDB 7.3 API. If a
|
|
|
|
|
callback function does not exist, then attempt to read the
|
|
|
|
|
show_doc attribute. */
|
|
|
|
|
show_doc_string = get_doc_string (obj, show_doc_cst);
|
|
|
|
|
make_cleanup (xfree, show_doc_string);
|
|
|
|
|
fprintf_filtered (file, "%s %s\n", show_doc_string, value);
|
|
|
|
|
}
|
|
|
|
|
|
2013-05-20 20:34:49 +00:00
|
|
|
|
Py_XDECREF (show_doc_func);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
error:
|
2013-05-20 20:34:49 +00:00
|
|
|
|
Py_XDECREF (show_doc_func);
|
2011-03-10 12:29:08 +00:00
|
|
|
|
gdbpy_print_stack ();
|
|
|
|
|
do_cleanups (cleanup);
|
|
|
|
|
return;
|
|
|
|
|
}
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* A helper function that dispatches to the appropriate add_setshow
|
|
|
|
|
function. */
|
|
|
|
|
static void
|
|
|
|
|
add_setshow_generic (int parmclass, enum command_class cmdclass,
|
|
|
|
|
char *cmd_name, parmpy_object *self,
|
|
|
|
|
char *set_doc, char *show_doc, char *help_doc,
|
|
|
|
|
struct cmd_list_element **set_list,
|
|
|
|
|
struct cmd_list_element **show_list)
|
|
|
|
|
{
|
2011-03-10 12:29:08 +00:00
|
|
|
|
struct cmd_list_element *param = NULL;
|
Constify strings in tracepoint.c, lookup_cmd and the completers.
This is sort of a continuation of Keith's parse_exp_1 constification
patch. It started out by undoing these bits:
@@ -754,9 +754,12 @@ validate_actionline (char **line, struct
tmp_p = p;
for (loc = t->base.loc; loc; loc = loc->next)
{
- p = tmp_p;
- exp = parse_exp_1 (&p, loc->address,
+ const char *q;
+
+ q = tmp_p;
+ exp = parse_exp_1 (&q, loc->address,
block_for_pc (loc->address), 1);
+ p = (char *) q;
and progressively making more things const upwards, fixing fallout,
rinse repeat, until GDB built again (--enable-targets=all).
That ended up constifying lookup_cmd/add_cmd and (lots of) friends,
and the completers.
I didn't try to constify the command hooks themselves, because I know
upfront there are commands that write to the command string argument,
and I think I managed to stop at a nice non-hacky split point already.
I think the only non-really-super-obvious changes are
tracepoint.c:validate_actionline, and tracepoint.c:trace_dump_actions.
The rest is just mostly about 'char *' => 'const char *', 'char **'=>
'const char **', and the occasional (e.g., deprecated_cmd_warning)
case of 'char **'=> 'const char *', where/when I noticed that nothing
actually cares about the pointer to pointer output.
Tested on x86_64 Fedora 17, native and gdbserver.
gdb/
2013-03-13 Pedro Alves <palves@redhat.com>
* ada-lang.c (struct add_partial_datum) <text, text0, word>: Make
fields const.
(ada_make_symbol_completion_list): Make "text0" parameter const.
* ax-gdb.c (agent_eval_command_one): Make "exp" parameter const.
* breakpoint.c (condition_completer): Make "text" and "word"
parameters const. Adjust.
(check_tracepoint_command): Adjust to validate_actionline
prototype change.
(catch_syscall_completer): Make "text" and "word" parameters
const.
* cli/cli-cmds.c (show_user): Make "comname" local const.
(valid_command_p): Make "command" parameter const.
(alias_command): Make "alias_prefix" and "command_prefix" locals
const.
* cli/cli-decode.c (add_cmd): Make "name" parameter const.
(add_alias_cmd): Make "name" and "oldname" parameters const.
Adjust. No longer make copy of OLDNAME.
(add_prefix_cmd, add_abbrev_prefix_cmd, add_set_or_show_cmd)
(add_setshow_cmd_full, add_setshow_enum_cmd)
(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
(add_setshow_filename_cmd, add_setshow_string_cmd)
(add_setshow_string_noescape_cmd)
(add_setshow_optional_filename_cmd, add_setshow_integer_cmd)
(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd)
(add_setshow_zuinteger_unlimited_cmd, add_setshow_zuinteger_cmd)
(delete_cmd, add_info, add_info_alias, add_com, add_com_alias):
Make "name" parameter const.
(help_cmd): Rename "command" parameter to "arg". New const local
"command".
(find_cmd): Make "command" parameter const.
(lookup_cmd_1): Make "text" parameter pointer to const. Adjust to
deprecated_cmd_warning prototype change.
(undef_cmd_error): Make "cmdtype" parameter const.
(lookup_cmd): Make "line" parameter const.
(deprecated_cmd_warning): Change type of "text" parameter to
pointer to const char, from pointer to pointer to char. Adjust.
(lookup_cmd_composition): Make "text" parameter const.
(complete_on_cmdlist, complete_on_enum): Make "text" and "word"
parameters const.
* cli/cli-decode.h (struct cmd_list_element) <name>: Make field
const.
* cli/cli-script.c (validate_comname): Make "tem" local const.
(define_command): New const local "tem_c". Use it in calls to
lookup_cmd.
(document_command): Make "tem" and "comfull" locals const.
(show_user_1): Make "prefix" and "name" parameters const.
* cli-script.h (show_user_1): Make "prefix" and "name" parameters
const.
* command.h (add_cmd, add_alias_cmd, add_prefix_cmd)
(add_abbrev_prefix_cmd, completer_ftype, lookup_cmd, lookup_cmd_1)
(deprecated_cmd_warning, lookup_cmd_composition, add_com)
(add_com_alias, add_info, add_info_alias, complete_on_cmdlist)
(complete_on_enum, add_setshow_enum_cmd)
(add_setshow_auto_boolean_cmd, add_setshow_boolean_cmd)
(add_setshow_filename_cmd, add_setshow_string_cmd)
(add_setshow_string_noescape_cmd)
(add_setshow_optional_filename_cmd, add_setshow_integer_cmd)
(add_setshow_uinteger_cmd, add_setshow_zinteger_cmd)
(add_setshow_zuinteger_cmd, add_setshow_zuinteger_unlimited_cmd):
Change prototypes, constifying strings.
* completer.c (noop_completer, filename_completer): Make "text"
and "prefix" parameters const.
(location_completer, expression_completer)
(complete_line_internal): Make "text" and "prefix" parameters
const and adjust.
(command_completer, signal_completer): Make "text" and "prefix"
parameters const.
* completer.h (noop_completer, filename_completer)
(expression_completer, location_completer, command_completer)
(signal_completer): Change prototypes.
* corefile.c (complete_set_gnutarget): Make "text" and "word"
parameters const.
* cp-abi.c (cp_abi_completer): Likewise.
* expression.h (parse_expression_for_completion): Change
prototype.
* f-lang.c (f_make_symbol_completion_list): Make "text" and "word"
parameters const.
* infcmd.c (_initialize_infcmd): Make "cmd_name" local const.
* infrun.c (handle_completer): Make "text" and "word" parameters
const.
* interps.c (interpreter_completer): Make "text" and "word"
parameters const.
* language.h (struct language_defn)
<la_make_symbol_completion_list>: Make "text" and "word"
parameters const.
* parse.c (parse_exp_1): Move const hack to parse_exp_in_context.
(parse_exp_in_context): Rename to ...
(parse_exp_in_context_1): ... this.
(parse_exp_in_context): Reimplement, with const hack from
parse_exp_1.
(parse_expression_for_completion): Make "string" parameter const.
* printcmd.c (decode_format): Make "string_ptr" parameter pointer
to pointer to const char. Adjust.
(print_command_1): Make "exp" parameter const.
(output_command): Rename to ...
(output_command_const): ... this. Make "exp" parameter const.
(output_command): Reimplement.
(x_command): Adjust.
(display_command): Rename "exp" parameter to "arg". New "exp"
local, const version of "arg".
* python/py-auto-load.c (gdbpy_initialize_auto_load): Make
"cmd_name" local const.
* python/py-cmd.c (cmdpy_destroyer): Cast const away in xfree
call.
(cmdpy_completer): Make "text" and "word" parameters const.
(gdbpy_parse_command_name): Make "prefix_text2" local const.
* python/py-param.c (add_setshow_generic): Make "tmp_name" local
const.
* remote.c (_initialize_remote): Make "cmd_name" local const.
* symtab.c (language_search_unquoted_string): Make "text" and "p"
parameters const. Adjust.
(completion_list_add_fields): Make "sym_text", "text" and "word"
parameters const.
(struct add_name_data) <sym_text, text, word>: Make fields const.
(default_make_symbol_completion_list_break_on): Make "text" and
"word" parameters const. Adjust locals.
(default_make_symbol_completion_list)
(make_symbol_completion_list, make_symbol_completion_type)
(make_symbol_completion_list_fn): Make "text" and "word"
parameters const.
(make_file_symbol_completion_list): Make "text", "word" and
"srcfile" parameters const. Adjust locals.
(add_filename_to_list): Make "text" and "word" parameters const.
(struct add_partial_filename_data) <text, word>: Make fields
const.
(make_source_files_completion_list): Make "text" and "word"
parameters const.
* symtab.h (default_make_symbol_completion_list_break_on)
(default_make_symbol_completion_list, make_symbol_completion_list)
(make_symbol_completion_type enum type_code)
(make_symbol_completion_list_fn make_file_symbol_completion_list)
(make_source_files_completion_list): Change prototype.
* top.c (execute_command): Adjust to pass pointer to pointer to
const char to lookup_cmd, and to deprecated_cmd_warning prototype
change.
(set_verbose): Make "cmdname" local const.
* tracepoint.c (decode_agent_options): Make "exp" parameter const,
and adjust.
(validate_actionline): Make "line" parameter a pointer to const
char, and adjust.
(encode_actions_1): Make "action_exp" local const, and adjust.
(encode_actions): Adjust.
(replace_comma): Delete.
(trace_dump_actions): Make "action_exp" and "next_comma" locals
const, and adjust. Don't frob the action string while splitting
it at commas. Instead, make a copy of each split substring in
turn.
(trace_dump_command): Adjust to validate_actionline prototype
change.
* tracepoint.h (decode_agent_options, decode_agent_options)
(encode_actions, validate_actionline): Change prototypes.
* valprint.h (output_command): Delete declaration.
(output_command_const): Declare.
* value.c (function_destroyer): Cast const away in xfree call.
2013-03-13 18:34:55 +00:00
|
|
|
|
const char *tmp_name = NULL;
|
2011-03-10 12:29:08 +00:00
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
switch (parmclass)
|
|
|
|
|
{
|
|
|
|
|
case var_boolean:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
|
|
|
|
|
add_setshow_boolean_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.intval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_auto_boolean:
|
|
|
|
|
add_setshow_auto_boolean_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.autoboolval,
|
|
|
|
|
set_doc, show_doc, help_doc,
|
2011-03-10 12:29:08 +00:00
|
|
|
|
get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_uinteger:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
add_setshow_uinteger_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.uintval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_integer:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
add_setshow_integer_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.intval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list); break;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
case var_string:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
add_setshow_string_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.stringval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list); break;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
case var_string_noescape:
|
|
|
|
|
add_setshow_string_noescape_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.stringval,
|
|
|
|
|
set_doc, show_doc, help_doc,
|
2011-03-10 12:29:08 +00:00
|
|
|
|
get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_optional_filename:
|
|
|
|
|
add_setshow_optional_filename_cmd (cmd_name, cmdclass,
|
2011-03-10 12:29:08 +00:00
|
|
|
|
&self->value.stringval, set_doc,
|
|
|
|
|
show_doc, help_doc, get_set_value,
|
|
|
|
|
get_show_value, set_list,
|
|
|
|
|
show_list);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_filename:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
add_setshow_filename_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.stringval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list); break;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
case var_zinteger:
|
2011-03-10 12:29:08 +00:00
|
|
|
|
add_setshow_zinteger_cmd (cmd_name, cmdclass,
|
|
|
|
|
&self->value.intval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case var_enum:
|
|
|
|
|
add_setshow_enum_cmd (cmd_name, cmdclass, self->enumeration,
|
2011-03-10 12:29:08 +00:00
|
|
|
|
&self->value.cstringval, set_doc, show_doc,
|
|
|
|
|
help_doc, get_set_value, get_show_value,
|
|
|
|
|
set_list, show_list);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
/* Initialize the value, just in case. */
|
|
|
|
|
self->value.cstringval = self->enumeration[0];
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-03-10 12:29:08 +00:00
|
|
|
|
|
|
|
|
|
/* Lookup created parameter, and register Python object against the
|
|
|
|
|
parameter context. Perform this task against both lists. */
|
|
|
|
|
tmp_name = cmd_name;
|
|
|
|
|
param = lookup_cmd (&tmp_name, *show_list, "", 0, 1);
|
|
|
|
|
if (param)
|
|
|
|
|
set_cmd_context (param, self);
|
|
|
|
|
|
|
|
|
|
tmp_name = cmd_name;
|
|
|
|
|
param = lookup_cmd (&tmp_name, *set_list, "", 0, 1);
|
|
|
|
|
if (param)
|
|
|
|
|
set_cmd_context (param, self);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-10-13 13:24:40 +00:00
|
|
|
|
/* A helper which computes enum values. Returns 1 on success. Returns 0 on
|
|
|
|
|
error, with a python exception set. */
|
2010-04-29 15:45:57 +00:00
|
|
|
|
static int
|
|
|
|
|
compute_enum_values (parmpy_object *self, PyObject *enum_values)
|
|
|
|
|
{
|
|
|
|
|
Py_ssize_t size, i;
|
2010-10-13 13:24:40 +00:00
|
|
|
|
struct cleanup *back_to;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
if (! enum_values)
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("An enumeration is required for PARAM_ENUM."));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! PySequence_Check (enum_values))
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("The enumeration is not a sequence."));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size = PySequence_Size (enum_values);
|
|
|
|
|
if (size < 0)
|
|
|
|
|
return 0;
|
|
|
|
|
if (size == 0)
|
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("The enumeration is empty."));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self->enumeration = xmalloc ((size + 1) * sizeof (char *));
|
2010-10-13 13:24:40 +00:00
|
|
|
|
back_to = make_cleanup (free_current_contents, &self->enumeration);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
memset (self->enumeration, 0, (size + 1) * sizeof (char *));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < size; ++i)
|
|
|
|
|
{
|
|
|
|
|
PyObject *item = PySequence_GetItem (enum_values, i);
|
2010-05-17 21:23:25 +00:00
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (! item)
|
2010-10-13 13:24:40 +00:00
|
|
|
|
{
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (! gdbpy_is_string (item))
|
|
|
|
|
{
|
2013-05-20 20:30:24 +00:00
|
|
|
|
Py_DECREF (item);
|
2010-10-13 13:24:40 +00:00
|
|
|
|
do_cleanups (back_to);
|
2013-11-29 20:00:47 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
_("The enumeration item not a string."));
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
self->enumeration[i] = python_string_to_host_string (item);
|
2013-05-20 20:30:24 +00:00
|
|
|
|
Py_DECREF (item);
|
2010-10-13 13:24:40 +00:00
|
|
|
|
if (self->enumeration[i] == NULL)
|
|
|
|
|
{
|
|
|
|
|
do_cleanups (back_to);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
make_cleanup (xfree, (char *) self->enumeration[i]);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-10-13 13:24:40 +00:00
|
|
|
|
discard_cleanups (back_to);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Object initializer; sets up gdb-side structures for command.
|
|
|
|
|
|
|
|
|
|
Use: __init__(NAME, CMDCLASS, PARMCLASS, [ENUM])
|
|
|
|
|
|
|
|
|
|
NAME is the name of the parameter. It may consist of multiple
|
|
|
|
|
words, in which case the final word is the name of the new command,
|
|
|
|
|
and earlier words must be prefix commands.
|
|
|
|
|
|
|
|
|
|
CMDCLASS is the kind of command. It should be one of the COMMAND_*
|
|
|
|
|
constants defined in the gdb module.
|
|
|
|
|
|
|
|
|
|
PARMCLASS is the type of the parameter. It should be one of the
|
|
|
|
|
PARAM_* constants defined in the gdb module.
|
|
|
|
|
|
|
|
|
|
If PARMCLASS is PARAM_ENUM, then the final argument should be a
|
|
|
|
|
collection of strings. These strings are the valid values for this
|
|
|
|
|
parameter.
|
|
|
|
|
|
|
|
|
|
The documentation for the parameter is taken from the doc string
|
|
|
|
|
for the python class.
|
2010-10-13 13:24:40 +00:00
|
|
|
|
|
|
|
|
|
Returns -1 on error, with a python exception set. */
|
|
|
|
|
|
2010-04-29 15:45:57 +00:00
|
|
|
|
static int
|
|
|
|
|
parmpy_init (PyObject *self, PyObject *args, PyObject *kwds)
|
|
|
|
|
{
|
|
|
|
|
parmpy_object *obj = (parmpy_object *) self;
|
2011-06-24 19:47:37 +00:00
|
|
|
|
const char *name;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
char *set_doc, *show_doc, *doc;
|
|
|
|
|
char *cmd_name;
|
|
|
|
|
int parmclass, cmdtype;
|
|
|
|
|
PyObject *enum_values = NULL;
|
|
|
|
|
struct cmd_list_element **set_list, **show_list;
|
|
|
|
|
volatile struct gdb_exception except;
|
|
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple (args, "sii|O", &name, &cmdtype, &parmclass,
|
|
|
|
|
&enum_values))
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (cmdtype != no_class && cmdtype != class_run
|
|
|
|
|
&& cmdtype != class_vars && cmdtype != class_stack
|
|
|
|
|
&& cmdtype != class_files && cmdtype != class_support
|
|
|
|
|
&& cmdtype != class_info && cmdtype != class_breakpoint
|
|
|
|
|
&& cmdtype != class_trace && cmdtype != class_obscure
|
|
|
|
|
&& cmdtype != class_maintenance)
|
|
|
|
|
{
|
|
|
|
|
PyErr_Format (PyExc_RuntimeError, _("Invalid command class argument."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-30 16:22:42 +00:00
|
|
|
|
if (parmclass != var_boolean /* ARI: var_boolean */
|
|
|
|
|
&& parmclass != var_auto_boolean
|
2010-04-29 15:45:57 +00:00
|
|
|
|
&& parmclass != var_uinteger && parmclass != var_integer
|
|
|
|
|
&& parmclass != var_string && parmclass != var_string_noescape
|
|
|
|
|
&& parmclass != var_optional_filename && parmclass != var_filename
|
|
|
|
|
&& parmclass != var_zinteger && parmclass != var_enum)
|
|
|
|
|
{
|
2011-01-06 00:57:05 +00:00
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("Invalid parameter class argument."));
|
2010-04-29 15:45:57 +00:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (enum_values && parmclass != var_enum)
|
|
|
|
|
{
|
|
|
|
|
PyErr_SetString (PyExc_RuntimeError,
|
|
|
|
|
_("Only PARAM_ENUM accepts a fourth argument."));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (parmclass == var_enum)
|
|
|
|
|
{
|
|
|
|
|
if (! compute_enum_values (obj, enum_values))
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
obj->enumeration = NULL;
|
|
|
|
|
obj->type = (enum var_types) parmclass;
|
|
|
|
|
memset (&obj->value, 0, sizeof (obj->value));
|
|
|
|
|
|
2011-09-08 19:51:27 +00:00
|
|
|
|
cmd_name = gdbpy_parse_command_name (name, &set_list,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
&setlist);
|
|
|
|
|
|
|
|
|
|
if (! cmd_name)
|
2011-09-08 19:51:27 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
xfree (cmd_name);
|
2011-09-08 19:51:27 +00:00
|
|
|
|
cmd_name = gdbpy_parse_command_name (name, &show_list,
|
2010-04-29 15:45:57 +00:00
|
|
|
|
&showlist);
|
|
|
|
|
if (! cmd_name)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
set_doc = get_doc_string (self, set_doc_cst);
|
|
|
|
|
show_doc = get_doc_string (self, show_doc_cst);
|
|
|
|
|
doc = get_doc_string (self, gdbpy_doc_cst);
|
|
|
|
|
|
|
|
|
|
Py_INCREF (self);
|
|
|
|
|
|
|
|
|
|
TRY_CATCH (except, RETURN_MASK_ALL)
|
|
|
|
|
{
|
|
|
|
|
add_setshow_generic (parmclass, (enum command_class) cmdtype,
|
|
|
|
|
cmd_name, obj,
|
|
|
|
|
set_doc, show_doc,
|
|
|
|
|
doc, set_list, show_list);
|
|
|
|
|
}
|
|
|
|
|
if (except.reason < 0)
|
|
|
|
|
{
|
|
|
|
|
xfree (cmd_name);
|
|
|
|
|
xfree (set_doc);
|
|
|
|
|
xfree (show_doc);
|
|
|
|
|
xfree (doc);
|
|
|
|
|
Py_DECREF (self);
|
|
|
|
|
PyErr_Format (except.reason == RETURN_QUIT
|
|
|
|
|
? PyExc_KeyboardInterrupt : PyExc_RuntimeError,
|
|
|
|
|
"%s", except.message);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize the 'parameters' module. */
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
|
int
|
2010-04-29 15:45:57 +00:00
|
|
|
|
gdbpy_initialize_parameters (void)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2011-08-05 14:24:10 +00:00
|
|
|
|
parmpy_object_type.tp_new = PyType_GenericNew;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
if (PyType_Ready (&parmpy_object_type) < 0)
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
set_doc_cst = PyString_FromString ("set_doc");
|
|
|
|
|
if (! set_doc_cst)
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
show_doc_cst = PyString_FromString ("show_doc");
|
|
|
|
|
if (! show_doc_cst)
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
|
|
|
|
|
for (i = 0; parm_constants[i].name; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (PyModule_AddIntConstant (gdb_module,
|
|
|
|
|
parm_constants[i].name,
|
|
|
|
|
parm_constants[i].value) < 0)
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
|
return -1;
|
2010-04-29 15:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-05-20 20:36:19 +00:00
|
|
|
|
return gdb_pymodule_addobject (gdb_module, "Parameter",
|
|
|
|
|
(PyObject *) &parmpy_object_type);
|
2010-04-29 15:45:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fix redefinition errors in C++ mode
In C, we can forward declare static structure instances. That doesn't
work in C++ though. C++ treats these as definitions. So then the
compiler complains about symbol redefinition, like:
src/gdb/elfread.c:1569:29: error: redefinition of ‘const sym_fns elf_sym_fns_lazy_psyms’
src/gdb/elfread.c:53:29: error: ‘const sym_fns elf_sym_fns_lazy_psyms’ previously declared here
The intent of static here is naturally to avoid making these objects
visible outside the compilation unit. The equivalent in C++ would be
to instead define the objects in the anonymous namespace. But given
that it's desirable to leave the codebase compiling as both C and C++
for a while, this just makes the objects extern.
(base_breakpoint_ops is already declared in breakpoint.h, so we can
just remove the forward declare from breakpoint.c)
gdb/ChangeLog:
2015-02-11 Tom Tromey <tromey@redhat.com>
Pedro Alves <palves@redhat.com>
* breakpoint.c (base_breakpoint_ops): Delete.
* dwarf2loc.c (dwarf_expr_ctx_funcs): Make extern.
* elfread.c (elf_sym_fns_gdb_index, elf_sym_fns_lazy_psyms): Make extern.
* guile/guile.c (guile_extension_script_ops, guile_extension_ops): Make extern.
* ppcnbsd-tdep.c (ppcnbsd2_sigtramp): Make extern.
* python/py-arch.c (arch_object_type): Make extern.
* python/py-block.c (block_syms_iterator_object_type): Make extern.
* python/py-bpevent.c (breakpoint_event_object_type): Make extern.
* python/py-cmd.c (cmdpy_object_type): Make extern.
* python/py-continueevent.c (continue_event_object_type)
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Remove 'qual'
parameter. Update all callers.
* python/py-evtregistry.c (eventregistry_object_type): Make extern.
* python/py-exitedevent.c (exited_event_object_type): Make extern.
* python/py-finishbreakpoint.c (finish_breakpoint_object_type): Make extern.
* python/py-function.c (fnpy_object_type): Make extern.
* python/py-inferior.c (inferior_object_type, membuf_object_type): Make extern.
* python/py-infevents.c (call_pre_event_object_type)
(inferior_call_post_event_object_type).
(memory_changed_event_object_type): Make extern.
* python/py-infthread.c (thread_object_type): Make extern.
* python/py-lazy-string.c (lazy_string_object_type): Make extern.
* python/py-linetable.c (linetable_entry_object_type)
(linetable_object_type, ltpy_iterator_object_type): Make extern.
* python/py-newobjfileevent.c (new_objfile_event_object_type)
(clear_objfiles_event_object_type): Make extern.
* python/py-objfile.c (objfile_object_type): Make extern.
* python/py-param.c (parmpy_object_type): Make extern.
* python/py-progspace.c (pspace_object_type): Make extern.
* python/py-signalevent.c (signal_event_object_type): Make extern.
* python/py-symtab.c (symtab_object_type, sal_object_type): Make extern.
* python/py-type.c (type_object_type, field_object_type)
(type_iterator_object_type): Make extern.
* python/python.c (python_extension_script_ops)
(python_extension_ops): Make extern.
* stap-probe.c (stap_probe_ops): Make extern.
2015-02-11 11:20:21 +00:00
|
|
|
|
PyTypeObject parmpy_object_type =
|
2010-04-29 15:45:57 +00:00
|
|
|
|
{
|
2012-12-12 16:47:30 +00:00
|
|
|
|
PyVarObject_HEAD_INIT (NULL, 0)
|
2010-04-29 15:45:57 +00:00
|
|
|
|
"gdb.Parameter", /*tp_name*/
|
|
|
|
|
sizeof (parmpy_object), /*tp_basicsize*/
|
|
|
|
|
0, /*tp_itemsize*/
|
|
|
|
|
0, /*tp_dealloc*/
|
|
|
|
|
0, /*tp_print*/
|
|
|
|
|
0, /*tp_getattr*/
|
|
|
|
|
0, /*tp_setattr*/
|
|
|
|
|
0, /*tp_compare*/
|
|
|
|
|
0, /*tp_repr*/
|
|
|
|
|
0, /*tp_as_number*/
|
|
|
|
|
0, /*tp_as_sequence*/
|
|
|
|
|
0, /*tp_as_mapping*/
|
|
|
|
|
0, /*tp_hash */
|
|
|
|
|
0, /*tp_call*/
|
|
|
|
|
0, /*tp_str*/
|
|
|
|
|
get_attr, /*tp_getattro*/
|
|
|
|
|
set_attr, /*tp_setattro*/
|
|
|
|
|
0, /*tp_as_buffer*/
|
|
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
|
|
|
|
|
"GDB parameter object", /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
0, /* tp_methods */
|
|
|
|
|
0, /* tp_members */
|
|
|
|
|
0, /* tp_getset */
|
|
|
|
|
0, /* tp_base */
|
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
|
parmpy_init, /* tp_init */
|
|
|
|
|
0, /* tp_alloc */
|
|
|
|
|
};
|