Convert long_const_operation to use gdb_mpz

This changes long_const_operation to use gdb_mpz for its storage.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index d2d7dca5c1e523d0a73676d3457b49c9a3e133cd..2a25d42338e24615a5596d0e910da8f03a5b8c20 100644 (file)
--- 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 1ed648ce002f7644b8b680343326668b37abc6ae..9dda7fe524d76b7eeca1f5d21b476e92038ac134 100644 (file)
--- 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 d973d2314bb1c79499d7a195235782797567bcf5..854945c86880dd260401c0826a1630ef502d942d 100644 (file)
--- 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 0c7cc754179f60e1d246540657ca25a648635c3a..e0ec25573c25d0776916d5c5c2ecfdcce0a111f4 100644 (file)
--- 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)
 {