From bf862c537bfd76233e3938cb3811f0fa2d27de25 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 30 Aug 2017 11:10:18 +0000 Subject: [PATCH] [16/77] Add scalar_int_mode_pod This patch adds a POD class for scalar integers, as an instance of a new pod_mode template. Later patches will use pod_mode in situations that really do need to be POD; this patch is simply using PODs to remove load-time initialisation. 2017-08-30 Richard Sandiford Alan Hayward David Sherwood gcc/ * coretypes.h (pod_mode): New type. (scalar_int_mode_pod): New typedef. * machmode.h (pod_mode): New class. (int_n_data_t::m): Change type to scalar_int_mode_pod. * genmodes.c (emit_mode_int_n): Update accordingly. * lower-subreg.h (target_lower_subreg): Change type to scalar_int_mode_pod. * gdbhooks.py (build_pretty_printer): Handle pod_mode and scalar_int_mode_pod. Co-Authored-By: Alan Hayward Co-Authored-By: David Sherwood From-SVN: r251468 --- gcc/ChangeLog | 14 ++++++++++++++ gcc/coretypes.h | 2 ++ gcc/gdbhooks.py | 4 ++++ gcc/genmodes.c | 2 +- gcc/lower-subreg.h | 2 +- gcc/machmode.h | 15 ++++++++++++++- 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2f8f97045bf..d7e70be58d6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,17 @@ +2017-08-30 Richard Sandiford + Alan Hayward + David Sherwood + + * coretypes.h (pod_mode): New type. + (scalar_int_mode_pod): New typedef. + * machmode.h (pod_mode): New class. + (int_n_data_t::m): Change type to scalar_int_mode_pod. + * genmodes.c (emit_mode_int_n): Update accordingly. + * lower-subreg.h (target_lower_subreg): Change type to + scalar_int_mode_pod. + * gdbhooks.py (build_pretty_printer): Handle pod_mode and + scalar_int_mode_pod. + 2017-08-30 Richard Sandiford Alan Hayward David Sherwood diff --git a/gcc/coretypes.h b/gcc/coretypes.h index 6e01a5069bf..37c836d87fa 100644 --- a/gcc/coretypes.h +++ b/gcc/coretypes.h @@ -60,6 +60,8 @@ class scalar_float_mode; template class opt_mode; typedef opt_mode opt_scalar_int_mode; typedef opt_mode opt_scalar_float_mode; +template class pod_mode; +typedef pod_mode scalar_int_mode_pod; /* Subclasses of rtx_def, using indentation to show the class hierarchy, along with the relevant invariant. diff --git a/gcc/gdbhooks.py b/gcc/gdbhooks.py index 782e93f9fbc..678698df9c8 100644 --- a/gcc/gdbhooks.py +++ b/gcc/gdbhooks.py @@ -545,6 +545,10 @@ def build_pretty_printer(): pp.add_printer_for_types(['opt_scalar_int_mode', 'opt_scalar_float_mode'], 'opt_mode', OptMachineModePrinter) + pp.add_printer_for_regex(r'pod_mode<(\S+)>', + 'pod_mode', MachineModePrinter) + pp.add_printer_for_types(['scalar_int_mode_pod'], + 'pod_mode', MachineModePrinter) for mode in 'scalar_int_mode', 'scalar_float_mode': pp.add_printer_for_types([mode], mode, MachineModePrinter) diff --git a/gcc/genmodes.c b/gcc/genmodes.c index c7d8c75dbeb..3eb9b44c74b 100644 --- a/gcc/genmodes.c +++ b/gcc/genmodes.c @@ -1799,7 +1799,7 @@ emit_mode_int_n (void) m = mode_sort[i]; printf(" {\n"); tagged_printf ("%u", m->int_n, m->name); - printf ("E_%smode,", m->name); + printf ("{ E_%smode },", m->name); printf(" },\n"); } diff --git a/gcc/lower-subreg.h b/gcc/lower-subreg.h index 4aed62f71e8..69e8c29173a 100644 --- a/gcc/lower-subreg.h +++ b/gcc/lower-subreg.h @@ -43,7 +43,7 @@ struct lower_subreg_choices { /* Target-specific information for the subreg lowering pass. */ struct target_lower_subreg { /* An integer mode that is twice as wide as word_mode. */ - machine_mode x_twice_word_mode; + scalar_int_mode_pod x_twice_word_mode; /* What we have decided to do when optimizing for size (index 0) and speed (index 1). */ diff --git a/gcc/machmode.h b/gcc/machmode.h index dda7c0aed41..25e72a83330 100644 --- a/gcc/machmode.h +++ b/gcc/machmode.h @@ -293,6 +293,19 @@ opt_mode::exists (U *mode) const return false; } +/* A POD version of mode class T. */ + +template +struct pod_mode +{ + typedef typename mode_traits::from_int from_int; + + machine_mode m_mode; + ALWAYS_INLINE operator machine_mode () const { return m_mode; } + ALWAYS_INLINE operator T () const { return from_int (m_mode); } + ALWAYS_INLINE pod_mode &operator = (const T &m) { m_mode = m; return *this; } +}; + /* Return true if mode M has type T. */ template @@ -647,7 +660,7 @@ extern void init_adjust_machine_modes (void); struct int_n_data_t { /* These parts are initailized by genmodes output */ unsigned int bitsize; - machine_mode m; + scalar_int_mode_pod m; /* RID_* is RID_INTN_BASE + index into this array */ }; -- 2.30.2