From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 85B4A385AC22 for ; Wed, 30 Mar 2022 10:24:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 85B4A385AC22 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x432.google.com with SMTP id w21so24012229wra.2 for ; Wed, 30 Mar 2022 03:24:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=2dxs3KO0zEMF56SiRb0sZ5VR11XHkyfZlVQp1aLTclg=; b=dVRbCtPoNKkofqPHjXnH8Vmdkw/RonWpn/tuh5jWBtW+OX0LpQmWebWbDxsJ8tmNMw 9//QYEvjrx4EfrTAHrj/kxmHJLAeadQX2X2LJTaqnBD67GxBlWzrY0ccuGEGR5msUH4f tjjwgzfUAwL+DcoQMudRK+Q3WmP1FoaX2oz5wh+k2omDsGthmAn0jJjaLT51apAXcQEY VFtHkEkXuoTGg9I1IzPnnEad2EkelcF3wmKfkjzZUmYnKmN4xkEm+0PToSWKjV+Gyjem +7x0PX+hyebCJxOCzOgZcYfnMyHXlY/0zsrrszCc/oVWYjyJQs+4TYk7h0kS+ILcI68G iNHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=2dxs3KO0zEMF56SiRb0sZ5VR11XHkyfZlVQp1aLTclg=; b=C8pQly4c6oG42w716y6m02v0Ekf4jJbx52ktph/4bjB/TbGvrijtcvIo0yB9FSDdiJ e6Mhod5W2nl1om8ca2NhJ5CbdAacqDA9IzfNongu9ovEdZFU1+rxsY7qY/udXNfEIhU/ I0WcKbNyZZ+FTMNKUMutvBXbpxnXPQXef022awqV81H6RTw4GjaDuMcgLeuU+LKOQBIx D7Xdrb5CaQ8m9tjA5ovI1wU0vZ1YWEjgqgtQisBBYojveQFcxrThOv1k086WJXgwjJKW 2BHVvFGCSm3prsKwZU5thv39ZF5Y02LHHX9X68VlYETYfs1Vk+pSVl7RF4AMPVpCfOc0 aDVA== X-Gm-Message-State: AOAM531V4TtUDyggCigRjYarzx0UK6QdwP8LXpxcyZ/AHx1hGygb67b3 yjC8PN4V5dEl+tsCoFQo8DhAXeHPTTYPDg== X-Google-Smtp-Source: ABdhPJzm9jb25eWwlxVE0QlMuatPLGG1wDkk4NlvTit+eeEzSjdakvkiJYgsej3tOcIf6pv0FVOv3g== X-Received: by 2002:a5d:6d44:0:b0:1e4:9a6d:c171 with SMTP id k4-20020a5d6d44000000b001e49a6dc171mr35950459wri.468.1648635839357; Wed, 30 Mar 2022 03:23:59 -0700 (PDT) Received: from [192.168.0.201] ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id k2-20020a1ca102000000b0038c78fdd59asm4494329wme.39.2022.03.30.03.23.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2022 03:23:58 -0700 (PDT) Date: Wed, 30 Mar 2022 11:23:58 +0100 (BST) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Simon Marchi , Tom Tromey , Simon Sobisch Subject: [PATCH v5 2/8] GDB/Python: Use None for `var_zuinteger_unlimited' value set to `unlimited' In-Reply-To: Message-ID: References: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Mar 2022 10:24:01 -0000 Consistently with the `var_integer' and `var_uinteger' parameters return the special value of None for a `var_zuinteger_unlimited' parameter set to `unlimited' by using the Py_RETURN_NONE macro in this case, fixing commit 0489430a0e1a ("Handle var_zuinteger and var_zuinteger_unlimited from Python"); cf. PR python/20084. Adjust the testsuite accordingly. --- No change from v4. New change in v4. --- gdb/python/python.c | 10 +++++++++- gdb/testsuite/gdb.python/py-parameter.exp | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) gdb-python-var-zuinteger-unlimited-none.diff Index: src/gdb/python/python.c =================================================================== --- src.orig/gdb/python/python.c +++ src/gdb/python/python.c @@ -507,9 +507,17 @@ gdbpy_parameter_value (const setting &va Py_RETURN_NONE; /* Fall through. */ case var_zinteger: - case var_zuinteger_unlimited: return gdb_py_object_from_longest (var.get ()).release (); + case var_zuinteger_unlimited: + { + int val = var.get (); + + if (val == -1) + Py_RETURN_NONE; + return gdb_py_object_from_longest (val).release (); + } + case var_uinteger: { unsigned int val = var.get (); Index: src/gdb/testsuite/gdb.python/py-parameter.exp =================================================================== --- src.orig/gdb/testsuite/gdb.python/py-parameter.exp +++ src/gdb/testsuite/gdb.python/py-parameter.exp @@ -343,8 +343,8 @@ proc_with_prefix test_integer_parameter } elseif {$kind == "PARAM_ZUINTEGER_UNLIMITED"} { gdb_test_no_output "python test_param_$kind.value = -1" \ "check that PARAM_ZUINTEGER value can be set to -1" - gdb_test "python print(gdb.parameter('test-$kind'))" "-1" \ - "check that PARAM_ZUINTEGER value is -1 after setting" + gdb_test "python print(gdb.parameter('test-$kind'))" "None" \ + "check that PARAM_ZUINTEGER value is None after setting" } else { error "invalid kind: $kind" }