From patchwork Thu Apr 26 22:20:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 26995 Received: (qmail 93152 invoked by alias); 26 Apr 2018 22:20:11 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 93143 invoked by uid 89); 26 Apr 2018 22:20:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=unlimited, UD:python.texi, python.texi, pythontexi X-HELO: gateway20.websitewelcome.com Received: from gateway20.websitewelcome.com (HELO gateway20.websitewelcome.com) (192.185.62.46) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 26 Apr 2018 22:20:08 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway20.websitewelcome.com (Postfix) with ESMTP id AFFA7400D7490 for ; Thu, 26 Apr 2018 17:20:06 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id BpFGfaAxBA3CSBpFGffgHQ; Thu, 26 Apr 2018 17:20:06 -0500 X-Authority-Reason: nr=8 Received: from 97-122-176-117.hlrn.qwest.net ([97.122.176.117]:51784 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fBpFG-002V5G-GY; Thu, 26 Apr 2018 17:20:06 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Handle var_zuinteger and var_zuinteger_unlimited from Python Date: Thu, 26 Apr 2018 16:20:03 -0600 Message-Id: <20180426222003.9059-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fBpFG-002V5G-GY X-Source-Sender: 97-122-176-117.hlrn.qwest.net (bapiya.Home) [97.122.176.117]:51784 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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. gdb/ChangeLog 2018-04-26 Tom Tromey 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. gdb/doc/ChangeLog 2018-04-26 Tom Tromey PR python/20084: * python.texi (Parameters In Python): Document PARAM_ZUINTEGER and PARAM_ZUINTEGER_UNLIMITED. gdb/testsuite/ChangeLog 2018-04-26 Tom Tromey PR python/20084: * gdb.python/py-parameter.exp: Add PARAM_ZUINTEGER and PARAM_ZUINTEGER_UNLIMITED tests. --- gdb/ChangeLog | 12 +++++++ gdb/doc/ChangeLog | 6 ++++ gdb/doc/python.texi | 14 ++++++++ gdb/python/py-param.c | 54 +++++++++++++++++++++++++------ gdb/python/python.c | 7 ++++ gdb/testsuite/ChangeLog | 6 ++++ gdb/testsuite/gdb.python/py-parameter.exp | 21 ++++++++++++ 7 files changed, 111 insertions(+), 9 deletions(-) diff --git a/gdb/doc/python.texi b/gdb/doc/python.texi index ebd48fffe7..ca9114864b 100644 --- a/gdb/doc/python.texi +++ b/gdb/doc/python.texi @@ -3800,6 +3800,20 @@ The value is a filename. This is just like The value is an integer. This is like @code{PARAM_INTEGER}, except 0 is interpreted as itself. +@findex PARAM_ZUINTEGER +@findex gdb.PARAM_ZUINTEGER +@item gdb.PARAM_ZUINTEGER +The value is an unsigned integer. This is like @code{PARAM_INTEGER}, +except 0 is interpreted as itself, and the value cannot be negative. + +@findex PARAM_ZUINTEGER_UNLIMITED +@findex gdb.PARAM_ZUINTEGER_UNLIMITED +@item gdb.PARAM_ZUINTEGER_UNLIMITED +The value is an unsigned integer. This is like @code{PARAM_ZUINTEGER}, +except 0 is interpreted as itself, and the special value -1 should be +interpreted to mean ``unlimited''. Other negative values are not +allowed. + @findex PARAM_ENUM @findex gdb.PARAM_ENUM @item gdb.PARAM_ENUM diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index 0f8d9b6b42..22b26b26da 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 9eae8a1aef..5aa78cc25a 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, diff --git a/gdb/testsuite/gdb.python/py-parameter.exp b/gdb/testsuite/gdb.python/py-parameter.exp index 3cd1198462..111dbedcbc 100644 --- a/gdb/testsuite/gdb.python/py-parameter.exp +++ b/gdb/testsuite/gdb.python/py-parameter.exp @@ -179,3 +179,24 @@ gdb_test "python print (test_param.value)" "False" "test parameter value" gdb_test "help show print test-param" "State of the Test Parameter.*" "test show help" gdb_test "help set print test-param" "Set the state of the Test Parameter.*" "test set help" gdb_test "help set print" "set print test-param -- Set the state of the Test Parameter.*" "test general help" + +foreach kind {PARAM_ZUINTEGER PARAM_ZUINTEGER_UNLIMITED} { + gdb_py_test_multiple "Simple gdb $kind" \ + "python" "" \ + "class TestNodocParam (gdb.Parameter):" "" \ + " def __init__ (self, name):" "" \ + " super (TestNodocParam, self).__init__ (name, gdb.COMMAND_DATA, gdb.$kind)" "" \ + " self.value = 0" "" \ + "test_param_$kind = TestNodocParam ('test-$kind')" "" \ + "end" + + gdb_test "python print(gdb.parameter('test-$kind'))" "0" + + gdb_test "python test_param_$kind.value = -5" "RuntimeError: Range exceeded.*" + + if {$kind == "PARAM_ZUINTEGER"} { + gdb_test "python test_param_$kind.value = -1" "RuntimeError: Range exceeded.*" + } else { + gdb_test_no_output "python test_param_$kind.value = -1" "" + } +}