This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC/PATCH] Clean up features/*.c unused vars
- From: Sergio Durigan Junior <sergiodj at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 25 Apr 2012 01:39:37 -0300
- Subject: [RFC/PATCH] Clean up features/*.c unused vars
Hi,
This is a continuation for my cleanup series. This time, I edited the
files present in the `features' directory (by actually editing the
`target-descriptions.c' file. I don't have all of the necessary
architectures to test this, but I think it's pretty much trivial.
However, if you want, I can arrange some way of testing this per-arch.
The logic I used was that the variables `field_type' and `type' were
only being generated inside an specific loop, so I replicated the loop
and checked some conditions in order to decide if the generation was
going to occur. It should not be hard to follow the algorithm.
OK to apply?
--
Sergio
2012-04-25 Sergio Durigan Junior <sergiodj@redhat.com>
* features/arm-with-iwmmxt.c: Regenerate.
* features/arm-with-m-fpa-layout.c: Likewise.
* features/arm-with-m.c: Likewise.
* features/arm-with-neon.c: Likewise.
* features/arm-with-vfpv2.c: Likewise.
* features/arm-with-vfpv3.c: Likewise.
* features/mips-dsp-linux.c: Likewise.
* features/mips-linux.c: Likewise.
* features/mips64-dsp-linux.c: Likewise.
* features/mips64-linux.c: Likewise.
* features/s390-linux32.c: Likewise.
* features/s390-linux32v1.c: Likewise.
* features/s390-linux32v2.c: Likewise.
* features/s390-linux64.c: Likewise.
* features/s390-linux64v1.c: Likewise.
* features/s390-linux64v2.c: Likewise.
* features/s390x-linux64.c: Likewise.
* features/s390x-linux64v1.c: Likewise.
* features/s390x-linux64v2.c: Likewise.
* features/tic6x-c62x-linux.c: Likewise.
* features/tic6x-c62x.c: Likewise.
* features/tic6x-c64x-linux.c: Likewise.
* features/tic6x-c64x.c: Likewise.
* features/tic6x-c64xp-linux.c: Likewise.
* features/tic6x-c64xp.c: Likewise.
* target-descriptions.c: Only generate `field_type' and `type'
variables when needed.
---
gdb/features/arm-with-iwmmxt.c | 3 ++-
gdb/features/arm-with-m-fpa-layout.c | 1 -
gdb/features/arm-with-m.c | 1 -
gdb/features/arm-with-neon.c | 1 -
gdb/features/arm-with-vfpv2.c | 1 -
gdb/features/arm-with-vfpv3.c | 1 -
gdb/features/mips-dsp-linux.c | 1 -
gdb/features/mips-linux.c | 1 -
gdb/features/mips64-dsp-linux.c | 1 -
gdb/features/mips64-linux.c | 1 -
gdb/features/s390-linux32.c | 1 -
gdb/features/s390-linux32v1.c | 1 -
gdb/features/s390-linux32v2.c | 1 -
gdb/features/s390-linux64.c | 1 -
gdb/features/s390-linux64v1.c | 1 -
gdb/features/s390-linux64v2.c | 1 -
gdb/features/s390x-linux64.c | 1 -
gdb/features/s390x-linux64v1.c | 1 -
gdb/features/s390x-linux64v2.c | 1 -
gdb/features/tic6x-c62x-linux.c | 1 -
gdb/features/tic6x-c62x.c | 1 -
gdb/features/tic6x-c64x-linux.c | 1 -
gdb/features/tic6x-c64x.c | 1 -
gdb/features/tic6x-c64xp-linux.c | 1 -
gdb/features/tic6x-c64xp.c | 1 -
gdb/target-descriptions.c | 32 +++++++++++++++++++++++++++++++-
26 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/gdb/features/arm-with-iwmmxt.c b/gdb/features/arm-with-iwmmxt.c
index f3918bb..d3b5fe9 100644
--- a/gdb/features/arm-with-iwmmxt.c
+++ b/gdb/features/arm-with-iwmmxt.c
@@ -10,7 +10,8 @@ initialize_tdesc_arm_with_iwmmxt (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
+ struct tdesc_type *field_type;
+ struct tdesc_type *type;
set_tdesc_architecture (result, bfd_scan_arch ("iwmmxt"));
diff --git a/gdb/features/arm-with-m-fpa-layout.c b/gdb/features/arm-with-m-fpa-layout.c
index ad9b75d..6531c3d 100644
--- a/gdb/features/arm-with-m-fpa-layout.c
+++ b/gdb/features/arm-with-m-fpa-layout.c
@@ -10,7 +10,6 @@ initialize_tdesc_arm_with_m_fpa_layout (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile");
tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int");
diff --git a/gdb/features/arm-with-m.c b/gdb/features/arm-with-m.c
index b188f57..2ac3df9 100644
--- a/gdb/features/arm-with-m.c
+++ b/gdb/features/arm-with-m.c
@@ -10,7 +10,6 @@ initialize_tdesc_arm_with_m (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile");
tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int");
diff --git a/gdb/features/arm-with-neon.c b/gdb/features/arm-with-neon.c
index c1eeb0b..d7df4e9 100644
--- a/gdb/features/arm-with-neon.c
+++ b/gdb/features/arm-with-neon.c
@@ -10,7 +10,6 @@ initialize_tdesc_arm_with_neon (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm-with-vfpv2.c
index ad872f8..7b014cd 100644
--- a/gdb/features/arm-with-vfpv2.c
+++ b/gdb/features/arm-with-vfpv2.c
@@ -10,7 +10,6 @@ initialize_tdesc_arm_with_vfpv2 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
diff --git a/gdb/features/arm-with-vfpv3.c b/gdb/features/arm-with-vfpv3.c
index 2d5b5a8..f66524c 100644
--- a/gdb/features/arm-with-vfpv3.c
+++ b/gdb/features/arm-with-vfpv3.c
@@ -10,7 +10,6 @@ initialize_tdesc_arm_with_vfpv3 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
diff --git a/gdb/features/mips-dsp-linux.c b/gdb/features/mips-dsp-linux.c
index 0644cd6..20e4ee3 100644
--- a/gdb/features/mips-dsp-linux.c
+++ b/gdb/features/mips-dsp-linux.c
@@ -10,7 +10,6 @@ initialize_tdesc_mips_dsp_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("mips"));
diff --git a/gdb/features/mips-linux.c b/gdb/features/mips-linux.c
index 2af6b84..b0181eb 100644
--- a/gdb/features/mips-linux.c
+++ b/gdb/features/mips-linux.c
@@ -9,7 +9,6 @@ initialize_tdesc_mips_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("mips"));
diff --git a/gdb/features/mips64-dsp-linux.c b/gdb/features/mips64-dsp-linux.c
index e8db243..3e67990 100644
--- a/gdb/features/mips64-dsp-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -10,7 +10,6 @@ initialize_tdesc_mips64_dsp_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("mips"));
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-linux.c
index 73dce6d..f214d12 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-linux.c
@@ -9,7 +9,6 @@ initialize_tdesc_mips64_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("mips"));
diff --git a/gdb/features/s390-linux32.c b/gdb/features/s390-linux32.c
index 0c5069f..57ade3b 100644
--- a/gdb/features/s390-linux32.c
+++ b/gdb/features/s390-linux32.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux32 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390-linux32v1.c b/gdb/features/s390-linux32v1.c
index d04641d..f1637cb 100644
--- a/gdb/features/s390-linux32v1.c
+++ b/gdb/features/s390-linux32v1.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux32v1 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390-linux32v2.c b/gdb/features/s390-linux32v2.c
index 76620f0..75db548 100644
--- a/gdb/features/s390-linux32v2.c
+++ b/gdb/features/s390-linux32v2.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux32v2 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390-linux64.c b/gdb/features/s390-linux64.c
index b8c4b16..bd6972e 100644
--- a/gdb/features/s390-linux64.c
+++ b/gdb/features/s390-linux64.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux64 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390-linux64v1.c b/gdb/features/s390-linux64v1.c
index 0e6865f..4936a7f 100644
--- a/gdb/features/s390-linux64v1.c
+++ b/gdb/features/s390-linux64v1.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux64v1 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390-linux64v2.c b/gdb/features/s390-linux64v2.c
index 13a6587..955b635 100644
--- a/gdb/features/s390-linux64v2.c
+++ b/gdb/features/s390-linux64v2.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390_linux64v2 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:31-bit"));
diff --git a/gdb/features/s390x-linux64.c b/gdb/features/s390x-linux64.c
index 9f95619..9cb8958 100644
--- a/gdb/features/s390x-linux64.c
+++ b/gdb/features/s390x-linux64.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390x_linux64 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit"));
diff --git a/gdb/features/s390x-linux64v1.c b/gdb/features/s390x-linux64v1.c
index b838c34..c41ff76 100644
--- a/gdb/features/s390x-linux64v1.c
+++ b/gdb/features/s390x-linux64v1.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390x_linux64v1 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit"));
diff --git a/gdb/features/s390x-linux64v2.c b/gdb/features/s390x-linux64v2.c
index 90a25d8..fb93d68 100644
--- a/gdb/features/s390x-linux64v2.c
+++ b/gdb/features/s390x-linux64v2.c
@@ -10,7 +10,6 @@ initialize_tdesc_s390x_linux64v2 (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("s390:64-bit"));
diff --git a/gdb/features/tic6x-c62x-linux.c b/gdb/features/tic6x-c62x-linux.c
index df82fc2..288309f 100644
--- a/gdb/features/tic6x-c62x-linux.c
+++ b/gdb/features/tic6x-c62x-linux.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c62x_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/features/tic6x-c62x.c b/gdb/features/tic6x-c62x.c
index 6e3a9c8..0a2f958 100644
--- a/gdb/features/tic6x-c62x.c
+++ b/gdb/features/tic6x-c62x.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c62x (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/features/tic6x-c64x-linux.c b/gdb/features/tic6x-c64x-linux.c
index 39f9e95..59e1ced 100644
--- a/gdb/features/tic6x-c64x-linux.c
+++ b/gdb/features/tic6x-c64x-linux.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c64x_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/features/tic6x-c64x.c b/gdb/features/tic6x-c64x.c
index 90f1785..f0fcdce 100644
--- a/gdb/features/tic6x-c64x.c
+++ b/gdb/features/tic6x-c64x.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c64x (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/features/tic6x-c64xp-linux.c b/gdb/features/tic6x-c64xp-linux.c
index a959ec6..927f8da 100644
--- a/gdb/features/tic6x-c64xp-linux.c
+++ b/gdb/features/tic6x-c64xp-linux.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c64xp_linux (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/features/tic6x-c64xp.c b/gdb/features/tic6x-c64xp.c
index 90cacb9..cd4de3a 100644
--- a/gdb/features/tic6x-c64xp.c
+++ b/gdb/features/tic6x-c64xp.c
@@ -10,7 +10,6 @@ initialize_tdesc_tic6x_c64xp (void)
{
struct target_desc *result = allocate_target_description ();
struct tdesc_feature *feature;
- struct tdesc_type *field_type, *type;
set_tdesc_architecture (result, bfd_scan_arch ("tic6x"));
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 0b12e3e..813e8c5 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -1550,6 +1550,7 @@ maint_print_c_tdesc_cmd (char *args, int from_tty)
struct tdesc_type_field *f;
struct tdesc_type_flag *flag;
int ix, ix2, ix3;
+ int printed_field_type = 0;
/* Use the global target-supplied description, not the current
architecture's. This lets a GDB for one architecture generate C
@@ -1588,7 +1589,36 @@ maint_print_c_tdesc_cmd (char *args, int from_tty)
printf_unfiltered
(" struct target_desc *result = allocate_target_description ();\n");
printf_unfiltered (" struct tdesc_feature *feature;\n");
- printf_unfiltered (" struct tdesc_type *field_type, *type;\n");
+
+ for (ix = 0;
+ VEC_iterate (tdesc_feature_p, tdesc->features, ix, feature);
+ ix++)
+ {
+ int printed_desc_type = 0;
+
+ for (ix2 = 0;
+ VEC_iterate (tdesc_type_p, feature->types, ix2, type);
+ ix2++)
+ {
+ if (!printed_field_type)
+ {
+ printf_unfiltered (" struct tdesc_type *field_type;\n");
+ printed_field_type = 1;
+ }
+
+ if (type->kind == TDESC_TYPE_UNION
+ && VEC_length (tdesc_type_field, type->u.u.fields) > 0)
+ {
+ printf_unfiltered (" struct tdesc_type *type;\n");
+ printed_desc_type = 1;
+ break;
+ }
+ }
+
+ if (printed_desc_type)
+ break;
+ }
+
printf_unfiltered ("\n");
if (tdesc_architecture (tdesc) != NULL)
--
1.7.7.6