From: Joel Brobecker <brobecker@adacore.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simark@simark.ca>, Joel Brobecker <brobecker@adacore.com>
Subject: [RFA 5/6] Make function fixed_point_scaling_factor a method of struct type
Date: Sun, 15 Nov 2020 03:49:43 -0500 [thread overview]
Message-ID: <1605430184-81335-6-git-send-email-brobecker@adacore.com> (raw)
In-Reply-To: <1605430184-81335-1-git-send-email-brobecker@adacore.com>
This logically connects this function to the object it inspects.
gdb/ChangeLog:
* gdbtypes.h (struct type) <fixed_point_scaling_factor>: New method,
replacing fixed_point_scaling_factor. All callers updated
throughout this project.
(fixed_point_scaling_factor): Delete declaration.
* gdbtypes.c (type::fixed_point_scaling_factor): Replaces
fixed_point_scaling_factor. Adjust implementation accordingly.
---
gdb/gdbtypes.c | 6 +++---
gdb/gdbtypes.h | 8 +++++---
gdb/typeprint.c | 2 +-
gdb/valarith.c | 6 +++---
gdb/valops.c | 6 +++---
gdb/valprint.c | 2 +-
gdb/value.c | 2 +-
7 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index eb176c9..79c8121 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4922,7 +4922,7 @@ static void
print_fixed_point_type_info (struct type *type, int spaces)
{
printfi_filtered (spaces + 2, "scaling factor: %s\n",
- fixed_point_scaling_factor (type).str ().c_str ());
+ type->fixed_point_scaling_factor ().str ().c_str ());
}
static struct obstack dont_print_type_obstack;
@@ -5876,9 +5876,9 @@ type::fixed_point_type_base_type ()
/* See gdbtypes.h. */
const gdb_mpq &
-fixed_point_scaling_factor (struct type *type)
+type::fixed_point_scaling_factor ()
{
- type = type->fixed_point_type_base_type ();
+ struct type *type = this->fixed_point_type_base_type ();
return type->fixed_point_info ().scaling_factor;
}
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 19f95f4..dc37f63 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1224,6 +1224,11 @@ struct type
struct type *fixed_point_type_base_type ();
+ /* * Assuming that THIS is a TYPE_CODE_FIXED_POINT, return its scaling
+ factor. */
+
+ const gdb_mpq &fixed_point_scaling_factor ();
+
/* * Return the dynamic property of the requested KIND from this type's
list of dynamic properties. */
dynamic_prop *dyn_prop (dynamic_prop_node_kind kind) const;
@@ -2589,9 +2594,6 @@ extern int type_not_associated (const struct type *type);
a range type whose base type is a TYPE_CODE_FIXED_POINT. */
extern bool is_fixed_point_type (struct type *type);
-/* Given TYPE, which is a fixed point type, return its scaling factor. */
-extern const gdb_mpq &fixed_point_scaling_factor (struct type *type);
-
/* Allocate a fixed-point type info for TYPE. This should only be
called by INIT_FIXED_POINT_SPECIFIC. */
extern void allocate_fixed_point_type_info (struct type *type);
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 0dd3b1c..a3fc9cc 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -667,7 +667,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
void
print_type_fixed_point (struct type *type, struct ui_file *stream)
{
- std::string small_img = fixed_point_scaling_factor (type).str ();
+ std::string small_img = type->fixed_point_scaling_factor ().str ();
fprintf_filtered (stream, "%s-byte fixed point (small = %s)",
pulongest (TYPE_LENGTH (type)), small_img.c_str ());
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 8c47249..1c6ef2c 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -911,11 +911,11 @@ fixed_point_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
v1.read_fixed_point (gdb::array_view <const gdb_byte> (value_contents (arg1),
TYPE_LENGTH (type1)),
type_byte_order (type1), type1->is_unsigned (),
- fixed_point_scaling_factor (type1));
+ type1->fixed_point_scaling_factor ());
v2.read_fixed_point (gdb::array_view <const gdb_byte> (value_contents (arg2),
TYPE_LENGTH (type2)),
type_byte_order (type2), type2->is_unsigned (),
- fixed_point_scaling_factor (type2));
+ type2->fixed_point_scaling_factor ());
#define INIT_VAL_WITH_FIXED_POINT_VAL(RESULT) \
do { \
@@ -924,7 +924,7 @@ fixed_point_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
(gdb::array_view <gdb_byte> (value_contents_raw (val), \
TYPE_LENGTH (type1)), \
type_byte_order (type1), type1->is_unsigned (), \
- fixed_point_scaling_factor (type1)); \
+ type1->fixed_point_scaling_factor ()); \
} while (0)
switch (op)
diff --git a/gdb/valops.c b/gdb/valops.c
index b4c6d88..bfddf62 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -363,7 +363,7 @@ value_cast_to_fixed_point (struct type *to_type, struct value *from_val)
mpq_set_z (vq.val, vz.val);
if (is_fixed_point_type (from_type))
- mpq_mul (vq.val, vq.val, fixed_point_scaling_factor (from_type).val);
+ mpq_mul (vq.val, vq.val, from_type->fixed_point_scaling_factor ().val);
}
else
@@ -373,7 +373,7 @@ value_cast_to_fixed_point (struct type *to_type, struct value *from_val)
/* Divide that value by the scaling factor to obtain the unscaled
value, first in rational form, and then in integer form. */
- mpq_div (vq.val, vq.val, fixed_point_scaling_factor (to_type).val);
+ mpq_div (vq.val, vq.val, to_type->fixed_point_scaling_factor ().val);
gdb_mpz unscaled = vq.get_rounded ();
/* Finally, create the result value, and pack the unscaled value
@@ -528,7 +528,7 @@ value_cast (struct type *type, struct value *arg2)
(gdb::array_view<const gdb_byte> (value_contents (arg2),
TYPE_LENGTH (type2)),
type_byte_order (type2), type2->is_unsigned (),
- fixed_point_scaling_factor (type2));
+ type2->fixed_point_scaling_factor ());
struct value *v = allocate_value (to_type);
target_float_from_host_double (value_contents_raw (v),
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 66f8de9..0d66ed4 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -812,7 +812,7 @@ generic_val_print_fixed_point (struct value *val, struct ui_file *stream,
f.read_fixed_point (gdb::array_view<const gdb_byte> (valaddr,
TYPE_LENGTH (type)),
type_byte_order (type), type->is_unsigned (),
- fixed_point_scaling_factor (type));
+ type->fixed_point_scaling_factor ());
const char *fmt = TYPE_LENGTH (type) < 4 ? "%.11Fg" : "%.17Fg";
std::string str = gmp_string_asprintf (fmt, f.val);
diff --git a/gdb/value.c b/gdb/value.c
index f3f5169..0b3d463 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2814,7 +2814,7 @@ unpack_long (struct type *type, const gdb_byte *valaddr)
gdb_mpq vq;
vq.read_fixed_point (gdb::array_view<const gdb_byte> (valaddr, len),
byte_order, nosign,
- fixed_point_scaling_factor (type));
+ type->fixed_point_scaling_factor ());
gdb_mpz vz;
mpz_tdiv_q (vz.val, mpq_numref (vq.val), mpq_denref (vq.val));
--
2.1.4
next prev parent reply other threads:[~2020-11-15 8:49 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 6:30 RFA: Add support for DWARF-based fixed point types Joel Brobecker
2020-11-08 6:30 ` [PATCH 1/9] gdb/configure: Add --with-libgmp-prefix option Joel Brobecker
2020-11-08 6:30 ` [PATCH 2/9] gdb: Make GMP a required dependency for building GDB Joel Brobecker
2020-12-15 6:55 ` Sebastian Huber
2020-12-15 8:57 ` Joel Brobecker
2020-11-08 6:30 ` [PATCH 3/9] gmp-utils: New API to simply use of GMP's integer/rational/float objects Joel Brobecker
2020-11-10 20:15 ` Simon Marchi
2020-11-13 8:12 ` Joel Brobecker
2020-11-13 15:04 ` Tom Tromey
2020-11-13 15:06 ` Simon Marchi
2020-11-16 16:18 ` Tom Tromey
2020-11-16 16:34 ` Luis Machado
2020-11-18 3:52 ` Joel Brobecker
2020-11-08 6:30 ` [PATCH 4/9] Move uinteger_pow gdb/valarith.c to gdb/utils.c and make it public Joel Brobecker
2020-11-08 6:30 ` [PATCH 5/9] Add support for printing value of DWARF-based fixed-point type objects Joel Brobecker
2020-11-10 21:06 ` Simon Marchi
2020-11-14 10:48 ` Joel Brobecker
2020-11-14 13:20 ` Simon Marchi
2020-11-14 11:30 ` Joel Brobecker
2020-11-14 16:14 ` Simon Marchi
2020-11-15 5:30 ` Joel Brobecker
2020-11-15 6:33 ` Joel Brobecker
2020-11-16 0:13 ` Simon Marchi
2020-11-08 6:30 ` [PATCH 6/9] fix printing of DWARF fixed-point type objects with format modifier Joel Brobecker
2020-11-10 22:50 ` Simon Marchi
2020-11-08 6:30 ` [PATCH 7/9] Add ptype support for DWARF-based fixed-point types Joel Brobecker
2020-11-10 23:00 ` Simon Marchi
2020-11-15 6:57 ` Joel Brobecker
2020-11-15 7:09 ` Joel Brobecker
2020-11-16 0:16 ` Simon Marchi
2020-11-16 4:03 ` Joel Brobecker
2020-11-08 6:30 ` [PATCH 8/9] Add support for fixed-point type arithmetic Joel Brobecker
2020-11-10 23:18 ` Simon Marchi
2020-11-08 6:30 ` [PATCH 9/9] Add support for fixed-point type comparison operators Joel Brobecker
2020-11-10 23:21 ` RFA: Add support for DWARF-based fixed point types Simon Marchi
2020-11-11 4:53 ` Joel Brobecker
2020-11-15 8:35 ` pushed: " Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 1/9] gdb/configure: Add --with-libgmp-prefix option Joel Brobecker
2020-11-15 15:52 ` Bernd Edlinger
2020-11-16 3:45 ` Joel Brobecker
2020-11-16 14:20 ` Bernd Edlinger
2020-11-17 7:41 ` [PATCH] Enable GDB build with in-tree GMP and MPFR Bernd Edlinger
2020-11-18 3:44 ` Joel Brobecker
2020-11-18 8:14 ` Bernd Edlinger
2020-12-01 19:29 ` Bernd Edlinger
2020-12-01 19:32 ` Simon Marchi
2020-12-01 19:38 ` Bernd Edlinger
2020-12-01 20:29 ` Bernd Edlinger
2020-12-01 20:30 ` Simon Marchi
2020-12-02 3:21 ` Joel Brobecker
2020-12-08 20:39 ` [PING] " Bernd Edlinger
2020-12-14 17:40 ` [PATCH v2] " Bernd Edlinger
2020-12-14 18:47 ` Simon Marchi
2020-12-14 21:35 ` Tom Tromey
2020-12-14 22:17 ` Simon Marchi
2020-12-15 2:33 ` Joel Brobecker
2020-12-15 14:39 ` Simon Marchi
2020-12-15 16:24 ` Bernd Edlinger
2020-12-16 7:33 ` Joel Brobecker
2020-12-16 18:16 ` Bernd Edlinger
2020-12-25 12:05 ` Bernd Edlinger
2020-12-27 22:01 ` Simon Marchi
2020-12-29 8:36 ` Bernd Edlinger
2020-12-29 14:50 ` Simon Marchi
2021-01-10 14:12 ` Bernd Edlinger
2021-01-10 15:32 ` Simon Marchi
2021-01-11 3:22 ` Joel Brobecker
2021-01-16 18:01 ` Bernd Edlinger
2020-12-15 15:33 ` Bernd Edlinger
2020-12-15 15:10 ` Bernd Edlinger
2020-11-15 8:35 ` [pushed/v2 2/9] gdb: Make GMP a required dependency for building GDB Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 3/9] gmp-utils: New API to simply use of GMP's integer/rational/float objects Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 4/9] Move uinteger_pow gdb/valarith.c to gdb/utils.c and make it public Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 5/9] Add support for printing value of DWARF-based fixed-point type objects Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 6/9] fix printing of DWARF fixed-point type objects with format modifier Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 7/9] Add ptype support for DWARF-based fixed-point types Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 8/9] Add support for fixed-point type arithmetic Joel Brobecker
2020-11-15 8:35 ` [pushed/v2 9/9] Add support for fixed-point type comparison operators Joel Brobecker
2020-11-16 23:48 ` pushed: Add support for DWARF-based fixed point types Pedro Alves
2020-11-17 14:25 ` Simon Marchi
2020-11-18 3:47 ` Joel Brobecker
2020-11-22 13:12 ` [RFA] Add TYPE_CODE_FIXED_POINT handling in print_type_scalar Joel Brobecker
2020-11-22 14:35 ` Simon Marchi
2020-11-24 3:04 ` Joel Brobecker
2020-11-22 14:00 ` pushed: Add support for DWARF-based fixed point types Joel Brobecker
2020-11-22 20:11 ` Simon Marchi
2020-11-23 4:27 ` Joel Brobecker
2020-11-23 16:12 ` Simon Marchi
2020-11-24 2:39 ` Joel Brobecker
2020-11-29 15:45 ` RFA: wrap mpz_export into gdb_mpz::safe_export Joel Brobecker
2020-11-29 15:45 ` [RFA 1/2] Fix TARGET_CHAR_BIT/HOST_CHAR_BIT confusion in gmp-utils.c Joel Brobecker
2020-11-30 15:42 ` Simon Marchi
2020-12-05 8:05 ` Joel Brobecker
2020-11-29 15:45 ` [RFA 2/2] gmp-utils: protect gdb_mpz exports against out-of-range values Joel Brobecker
2020-11-30 15:56 ` Simon Marchi
2020-12-01 3:37 ` Joel Brobecker
2020-12-01 4:02 ` Simon Marchi
2020-12-01 7:11 ` Joel Brobecker
2020-12-05 8:10 ` [RFAv2 " Joel Brobecker
2020-12-05 23:26 ` Simon Marchi
2020-12-06 4:58 ` Joel Brobecker
2020-11-30 12:44 ` RFA: wrap mpz_export into gdb_mpz::safe_export Christian Biesinger
2020-11-20 14:08 ` pushed: Add support for DWARF-based fixed point types Pedro Alves
2020-11-20 14:14 ` Joel Brobecker
2020-11-22 11:56 ` RFA/doco: Various changes related to GMP and fixed point type support Joel Brobecker
2020-11-22 11:56 ` [RFA/doco 1/4] gdb/NEWS: Document that building GDB now requires GMP Joel Brobecker
2020-11-22 15:31 ` Eli Zaretskii
2020-11-24 3:11 ` Joel Brobecker
2020-11-22 11:56 ` [RFA/doco 2/4] gdb/NEWS: Document that GDB now supports DWARF-based fixed point types Joel Brobecker
2020-11-22 15:33 ` Eli Zaretskii
2020-11-24 3:12 ` Joel Brobecker
2020-11-22 11:56 ` [RFA/doco 3/4] gdb/README: Document the --with-libgmp-prefix configure option Joel Brobecker
2020-11-22 15:32 ` Eli Zaretskii
2020-11-24 3:11 ` Joel Brobecker
2020-11-22 11:56 ` [RFA/doco 4/4] gdb/README: Fix the URL of the MPFR website (now https) Joel Brobecker
2020-11-22 15:33 ` Eli Zaretskii
2020-11-24 3:11 ` Joel Brobecker
2020-11-15 8:49 ` RFA: Various enhancements to the fixed-point support implementation Joel Brobecker
2020-11-15 8:49 ` [RFA 1/6] change gmp_string_asprintf to return an std::string Joel Brobecker
2020-11-16 0:41 ` Simon Marchi
2020-11-16 3:55 ` Joel Brobecker
2020-11-16 20:10 ` Simon Marchi
2020-11-15 8:49 ` [RFA 2/6] gmp-utils: Convert the read/write methods to using gdb::array_view Joel Brobecker
2020-11-16 0:52 ` Simon Marchi
2020-11-16 23:05 ` Pedro Alves
2020-11-17 14:32 ` Simon Marchi
2020-11-15 8:49 ` [RFA 3/6] gdbtypes.h: Get rid of the TYPE_FIXED_POINT_INFO macro Joel Brobecker
2020-11-15 8:49 ` [RFA 4/6] Make fixed_point_type_base_type a method of struct type Joel Brobecker
2020-11-15 8:49 ` Joel Brobecker [this message]
2020-11-15 8:49 ` [RFA 6/6] valarith.c: Replace INIT_VAL_WITH_FIXED_POINT_VAL macro by lambda Joel Brobecker
2020-11-16 1:01 ` RFA: Various enhancements to the fixed-point support implementation Simon Marchi
2020-11-22 11:14 ` RFA v2: " Joel Brobecker
2020-11-22 11:14 ` [RFA v2 1/6] change and rename gmp_string_asprintf to return an std::string Joel Brobecker
2020-11-22 11:14 ` [RFA v2 2/6] gmp-utils: Convert the read/write methods to using gdb::array_view Joel Brobecker
2020-11-22 11:14 ` [RFA v2 3/6] gdbtypes.h: Get rid of the TYPE_FIXED_POINT_INFO macro Joel Brobecker
2020-11-22 11:14 ` [RFA v2 4/6] Make fixed_point_type_base_type a method of struct type Joel Brobecker
2020-11-22 11:14 ` [RFA v2 5/6] Make function fixed_point_scaling_factor " Joel Brobecker
2020-11-22 11:14 ` [RFA v2 6/6] valarith.c: Replace INIT_VAL_WITH_FIXED_POINT_VAL macro by lambda Joel Brobecker
2020-11-23 16:46 ` RFA v2: Various enhancements to the fixed-point support implementation Simon Marchi
2020-11-24 2:56 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1605430184-81335-6-git-send-email-brobecker@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=simark@simark.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).