diff options
author | Tom Tromey <tom@tromey.com> | 2018-04-26 16:18:07 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-05-02 10:31:55 -0600 |
commit | 0489430a0e1a3ea302c22c540f3629e471591f23 (patch) | |
tree | 160d2ad23b6002ff316fbae5d840e4a3da90ff3c /gdb/python | |
parent | d966ab2dc5c10626a1389c87e9bcf924a99e9dfb (diff) | |
download | gdb-0489430a0e1a3ea302c22c540f3629e471591f23.zip gdb-0489430a0e1a3ea302c22c540f3629e471591f23.tar.gz gdb-0489430a0e1a3ea302c22c540f3629e471591f23.tar.bz2 |
Handle var_zuinteger and var_zuinteger_unlimited from Python
PR python/20084 points out that the Python API doesn't handle the
var_zuinteger and var_zuinteger_unlimited parameter types.
This patch adds support for these types.
Regression tested on x86-64 Fedora 26.
ChangeLog
2018-05-02 Tom Tromey <tom@tromey.com>
PR python/20084:
* python/python.c (gdbpy_parameter_value): Handle var_zuinteger
and var_zuinteger_unlimited.
* python/py-param.c (struct parm_constant): Add PARAM_ZUINTEGER
and PARAM_ZUINTEGER_UNLIMITED.
(set_parameter_value): Handle var_zuinteger and
var_zuinteger_unlimited.
(add_setshow_generic): Likewise.
(parmpy_init): Likewise.
doc/ChangeLog
2018-05-02 Tom Tromey <tom@tromey.com>
PR python/20084:
* python.texi (Parameters In Python): Document PARAM_ZUINTEGER and
PARAM_ZUINTEGER_UNLIMITED.
testsuite/ChangeLog
2018-05-02 Tom Tromey <tom@tromey.com>
PR python/20084:
* gdb.python/py-parameter.exp: Add PARAM_ZUINTEGER and
PARAM_ZUINTEGER_UNLIMITED tests.
Diffstat (limited to 'gdb/python')
-rw-r--r-- | gdb/python/py-param.c | 54 | ||||
-rw-r--r-- | gdb/python/python.c | 7 |
2 files changed, 52 insertions, 9 deletions
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index 0f8d9b6..22b26b2 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -47,6 +47,8 @@ struct parm_constant parm_constants[] = { "PARAM_OPTIONAL_FILENAME", var_optional_filename }, { "PARAM_FILENAME", var_filename }, { "PARAM_ZINTEGER", var_zinteger }, + { "PARAM_ZUINTEGER", var_zuinteger }, + { "PARAM_ZUINTEGER_UNLIMITED", var_zuinteger_unlimited }, { "PARAM_ENUM", var_enum }, { NULL, 0 } }; @@ -225,6 +227,8 @@ set_parameter_value (parmpy_object *self, PyObject *value) case var_integer: case var_zinteger: case var_uinteger: + case var_zuinteger: + case var_zuinteger_unlimited: { long l; int ok; @@ -239,20 +243,33 @@ set_parameter_value (parmpy_object *self, PyObject *value) if (! gdb_py_int_as_long (value, &l)) return -1; - if (self->type == var_uinteger) + switch (self->type) { - ok = (l >= 0 && l <= UINT_MAX); + case var_uinteger: if (l == 0) l = UINT_MAX; - } - else if (self->type == var_integer) - { + /* Fall through. */ + case var_zuinteger: + ok = (l >= 0 && l <= UINT_MAX); + break; + + case var_zuinteger_unlimited: + ok = (l >= -1 && l <= INT_MAX); + break; + + case var_integer: ok = (l >= INT_MIN && l <= INT_MAX); if (l == 0) l = INT_MAX; + break; + + case var_zinteger: + ok = (l >= INT_MIN && l <= INT_MAX); + break; + + default: + gdb_assert_not_reached ("unknown var_ constant"); } - else - ok = (l >= INT_MIN && l <= INT_MAX); if (! ok) { @@ -261,7 +278,10 @@ set_parameter_value (parmpy_object *self, PyObject *value) return -1; } - self->value.intval = (int) l; + if (self->type == var_uinteger || self->type == var_zuinteger) + self->value.uintval = (unsigned) l; + else + self->value.intval = (int) l; break; } @@ -526,6 +546,21 @@ add_setshow_generic (int parmclass, enum command_class cmdclass, set_list, show_list); break; + case var_zuinteger: + add_setshow_zuinteger_cmd (cmd_name, cmdclass, + &self->value.uintval, set_doc, show_doc, + help_doc, get_set_value, get_show_value, + set_list, show_list); + break; + + case var_zuinteger_unlimited: + add_setshow_zuinteger_unlimited_cmd (cmd_name, cmdclass, + &self->value.intval, set_doc, + show_doc, help_doc, get_set_value, + get_show_value, + set_list, show_list); + break; + case var_enum: add_setshow_enum_cmd (cmd_name, cmdclass, self->enumeration, &self->value.cstringval, set_doc, show_doc, @@ -658,7 +693,8 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds) && 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) + && parmclass != var_zinteger && parmclass != var_zuinteger + && parmclass != var_zuinteger_unlimited && parmclass != var_enum) { PyErr_SetString (PyExc_RuntimeError, _("Invalid parameter class argument.")); diff --git a/gdb/python/python.c b/gdb/python/python.c index 0dd7d6a..fbd6770 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -467,6 +467,7 @@ gdbpy_parameter_value (enum var_types type, void *var) Py_RETURN_NONE; /* Fall through. */ case var_zinteger: + case var_zuinteger_unlimited: return PyLong_FromLong (* (int *) var); case var_uinteger: @@ -477,6 +478,12 @@ gdbpy_parameter_value (enum var_types type, void *var) Py_RETURN_NONE; return PyLong_FromUnsignedLong (val); } + + case var_zuinteger: + { + unsigned int val = * (unsigned int *) var; + return PyLong_FromUnsignedLong (val); + } } return PyErr_Format (PyExc_RuntimeError, |