From patchwork Tue Mar 28 15:49:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67027 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F37B3850235 for ; Tue, 28 Mar 2023 15:50:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5F37B3850235 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680018608; bh=bev0VIcRjybmu3It+NCMV9vCPpwP52R4v+nvVdKcDvE=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sJYpN/5x0KklDjN0jdakt7hpI+T8MKZV86WBMVI1BR22pjmT+iSUoXCU9VWJnFmqF EcvGL0bDwODFb3oIXsWq4bSJvygprpdKLSH37FijtSiPf2Lfwf5AxYGX8NxjEAHGMk /mPsdQAHD14AhTevnqb2ATd7KkPn1fZpqPaUsOqA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id 6E7E33858413 for ; Tue, 28 Mar 2023 15:49:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E7E33858413 Received: by mail-io1-xd2b.google.com with SMTP id k17so5557109iob.1 for ; Tue, 28 Mar 2023 08:49:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680018580; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bev0VIcRjybmu3It+NCMV9vCPpwP52R4v+nvVdKcDvE=; b=f40ljvCW49Bn+252BuTbv5kI8fDqH2buSjJ1pCywh3LntCBL6qqV72Vc4sGDr3Nuj1 apfRDSvB8CfRXUty7kjW3FzfK2TzYMEzfsJK+2V5VrkTIP2FBwCCotBKAiejFs413vP8 DUfuQ5B3hU8r+9f8Mnhs6J/2weS1h34v7EiEeXyuV7SBl1f+HLlnh+LY1hyUZCcbz5n2 DmtsAZuPRhRN7NcyJ97XPQFxm3ZfyTwZd79H1CQ8htzNyabODTYRZZy8klQ6s+jWD0L/ WJLY3qtIP9IYCBfVnM+g/c5FDOdZaptW4q2q50H7UDcnVJjQ1cwEx5QZa/ln6NnEJvF0 XFSQ== X-Gm-Message-State: AO0yUKWK4YbkMygM69Wj9agdhUmjuxl7DGQP9eAvmNL18h90ME4niXtk 3Ddiwl+jqL7oWvfi2Ely8kSQnbtYTnTspeys3cKYZw== X-Google-Smtp-Source: AK7set9NxuGX6ywQMHNq4aR9VeP9XiWtCAsmppAk+2lTa3YHnna7wgBkPYnN4cozDUytSxTppjVpsw== X-Received: by 2002:a05:6602:228a:b0:758:917b:c313 with SMTP id d10-20020a056602228a00b00758917bc313mr12084713iod.13.1680018580710; Tue, 28 Mar 2023 08:49:40 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id u5-20020a5ec005000000b0075c37601b5csm1684522iol.4.2023.03.28.08.49.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 08:49:40 -0700 (PDT) Date: Tue, 28 Mar 2023 09:49:38 -0600 Subject: [PATCH 2/6] Convert long_const_operation to use gdb_mpz MIME-Version: 1.0 Message-Id: <20230328-expr-128-bit-v1-2-f9eeb0143318@adacore.com> References: <20230328-expr-128-bit-v1-0-f9eeb0143318@adacore.com> In-Reply-To: <20230328-expr-128-bit-v1-0-f9eeb0143318@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This changes long_const_operation to use gdb_mpz for its storage. --- gdb/ada-lang.c | 4 ++-- gdb/ax-gdb.c | 4 ++-- gdb/expop.h | 26 +++++++++++++++++++++++--- gdb/expprint.c | 6 ++++++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 5301c72d514..e51fd082d73 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10612,10 +10612,10 @@ ada_char_operation::replace (operation_up &&owner, if (context_type != nullptr && context_type->code () == TYPE_CODE_ENUM) { + LONGEST val = as_longest (); gdb_assert (result.get () == this); std::get<0> (m_storage) = context_type; - std::get<1> (m_storage) - = convert_char_literal (context_type, std::get<1> (m_storage)); + std::get<1> (m_storage) = convert_char_literal (context_type, val); } return result; diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 1ed648ce002..9dda7fe524d 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -1630,8 +1630,8 @@ long_const_operation::do_generate_ax (struct expression *exp, struct axs_value *value, struct type *cast_type) { - gen_int_literal (ax, value, std::get<1> (m_storage), - std::get<0> (m_storage)); + LONGEST val = as_longest (); + gen_int_literal (ax, value, val, std::get<0> (m_storage)); } void diff --git a/gdb/expop.h b/gdb/expop.h index d973d2314bb..854945c8688 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -274,6 +274,12 @@ check_objfile (ULONGEST val, struct objfile *objfile) return false; } +static inline bool +check_objfile (const gdb_mpz &val, struct objfile *objfile) +{ + return false; +} + template static inline bool check_objfile (enum_flags val, struct objfile *objfile) @@ -319,6 +325,8 @@ extern void dump_for_expression (struct ui_file *stream, int depth, struct type *type); extern void dump_for_expression (struct ui_file *stream, int depth, CORE_ADDR addr); +extern void dump_for_expression (struct ui_file *stream, int depth, + const gdb_mpz &addr); extern void dump_for_expression (struct ui_file *stream, int depth, internalvar *ivar); extern void dump_for_expression (struct ui_file *stream, int depth, @@ -468,6 +476,12 @@ check_constant (ULONGEST cst) return true; } +static inline bool +check_constant (const gdb_mpz &cst) +{ + return true; +} + static inline bool check_constant (struct symbol *sym) { @@ -665,18 +679,21 @@ class var_value_operation }; class long_const_operation - : public tuple_holding_operation + : public tuple_holding_operation { public: using tuple_holding_operation::tuple_holding_operation; + long_const_operation (struct type *type, LONGEST val) + : long_const_operation (type, gdb_mpz (val)) + { } + value *evaluate (struct type *expect_type, struct expression *exp, enum noside noside) override { - return value_from_longest (std::get<0> (m_storage), - std::get<1> (m_storage)); + return value_from_mpz (std::get<0> (m_storage), std::get<1> (m_storage)); } enum exp_opcode opcode () const override @@ -687,6 +704,9 @@ class long_const_operation protected: + LONGEST as_longest () const + { return std::get<1> (m_storage).as_integer_truncate (); } + void do_generate_ax (struct expression *exp, struct agent_expr *ax, struct axs_value *value, diff --git a/gdb/expprint.c b/gdb/expprint.c index 0c7cc754179..e0ec25573c2 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -108,6 +108,12 @@ dump_for_expression (struct ui_file *stream, int depth, CORE_ADDR addr) core_addr_to_string (addr)); } +void +dump_for_expression (struct ui_file *stream, int depth, const gdb_mpz &val) +{ + gdb_printf (stream, _("%*sConstant: %s\n"), depth, "", val.str ().c_str ()); +} + void dump_for_expression (struct ui_file *stream, int depth, internalvar *ivar) {