From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id A1EA73858008 for ; Wed, 9 Mar 2022 19:18:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A1EA73858008 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-x429.google.com with SMTP id r6so4165793wrr.2 for ; Wed, 09 Mar 2022 11:18:02 -0800 (PST) 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=4B6GYmfcF2WWWnDqdrmJCWyunPDxSnE3dFZgENNE2dY=; b=FJH0rghiAtYOtuFk1DYJt0gkzZ3IQD5WG+N+PxbSRDs8vSkb/UnasGVVMzKqEq42GU E5reF+J1zv1VhuJP4psyaWBiAcyO2eMgeAATZXv+JTvMBLP7bDDgva6HHlaqPitSQ6jK DmbhKPUtUP6epqNriCPJ0nncG/YeLpezqQHIj14vKKL4Dlj/Sn9qyMz+q6Nf6YqeG8oz jZGDpg21FUyXpBdlwnJwzGUGGxPqQyumojnlm+4CrkJz+SZbhB0eHESylRmirsqKRG/b 0L8Iy6S7UE2HPOkN9ai4x+Ggtq+5ZK5NMTUoaK0k/quA4HAxvuFm3zbfnGxaCzZMkNGl ilUQ== 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=4B6GYmfcF2WWWnDqdrmJCWyunPDxSnE3dFZgENNE2dY=; b=UUG4j6QZg+3nVwx6+2qrIK5lZOKiyexaJgwL8YSOTfODO70lD1Whsdf2sVtsJtVyXR qBCVQINN6Ba92FGA+u4Jz6sXC2MWqtahVNjqrDUskRNClr9tw/+46fMmWzjTgC/PIBDb ktISPb3oZ6vLuZL+OHxwPGwQttGa4tKDBeueV8eD1WAbNIcAuAgsQZZHOQq/dBQh94xX qjDZCPTguPPAeCPa5CXaoqPemyCfc1+M6gkK3UTxhFxzfll93+RFDAaXzhNbUW80lkwZ 06i17Zr/SXw9gLSE2uJ5TQXhfi6CAfIJmCoJmt64zHm/WSv3RfMe52oz0J8YxtVRExya DMLQ== X-Gm-Message-State: AOAM533odZJ4yzR22PItGEx1T3wYQciIRZlEwgZ8Bhgrtv9s/XZO7Ov9 YO/zfFFNjN+ZUgyoR/49BQJ78FdVwpVX4g== X-Google-Smtp-Source: ABdhPJwT7ki2uNSyx6LK/3YOfB+tzjkmzEyu2lu5shU+n7AR7R/iwS9dDHAzWxbm55asLDEWueuqlA== X-Received: by 2002:a5d:66c3:0:b0:203:7b33:30c7 with SMTP id k3-20020a5d66c3000000b002037b3330c7mr849737wrw.74.1646853481814; Wed, 09 Mar 2022 11:18:01 -0800 (PST) Received: from tpp.orcam.me.uk (tpp.orcam.me.uk. [2001:8b0:154:0:ea6a:64ff:fe24:f2fc]) by smtp.gmail.com with ESMTPSA id t184-20020a1c46c1000000b003814de297fcsm5734273wma.16.2022.03.09.11.18.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2022 11:18:01 -0800 (PST) Date: Wed, 9 Mar 2022 19:18:00 +0000 (GMT) From: "Maciej W. Rozycki" To: gdb-patches@sourceware.org cc: Andrew Burgess , Simon Marchi , Tom Tromey , Simon Sobisch Subject: [PATCH v4 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.4 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, 09 Mar 2022 19:18:03 -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. --- 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 @@ -512,9 +512,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" }