public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Convert long_const_operation to use gdb_mpz
@ 2023-04-17 17:03 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2023-04-17 17:03 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5309ce2f04d8b76ff8a8005f6115cdf544d83bf7
commit 5309ce2f04d8b76ff8a8005f6115cdf544d83bf7
Author: Tom Tromey <tromey@adacore.com>
Date: Mon Mar 27 12:54:51 2023 -0600
Convert long_const_operation to use gdb_mpz
This changes long_const_operation to use gdb_mpz for its storage.
Diff:
---
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 d2d7dca5c1e..2a25d42338e 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -10590,10 +10590,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<typename T>
static inline bool
check_objfile (enum_flags<T> 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 @@ protected:
};
class long_const_operation
- : public tuple_holding_operation<struct type *, LONGEST>
+ : public tuple_holding_operation<struct type *, gdb_mpz>
{
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 @@ public:
protected:
+ LONGEST as_longest () const
+ { return std::get<1> (m_storage).as_integer_truncate<LONGEST> (); }
+
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)
{
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-17 17:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-17 17:03 [binutils-gdb] Convert long_const_operation to use gdb_mpz Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).