This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Split rank_one_type_parm_enum from rank_one_type
- From: Simon Marchi <simark at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 9 Mar 2019 13:30:26 -0000
- Subject: [binutils-gdb] Split rank_one_type_parm_enum from rank_one_type
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=793cd1d2a12e9741e01f5df702e493f5e9ba0dea
commit 793cd1d2a12e9741e01f5df702e493f5e9ba0dea
Author: Simon Marchi <simon.marchi@efficios.com>
Date: Fri Mar 8 10:15:09 2019 -0500
Split rank_one_type_parm_enum from rank_one_type
gdb/ChangeLog:
* gdbtypes.c (rank_one_type_parm_enum): New function extracted
from...
(rank_one_type): ... this.
Diff:
---
gdb/ChangeLog | 6 ++++++
gdb/gdbtypes.c | 39 +++++++++++++++++++++++----------------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ed24fa..be4e883 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2019-03-08 Simon Marchi <simon.marchi@efficios.com>
+ * gdbtypes.c (rank_one_type_parm_enum): New function extracted
+ from...
+ (rank_one_type): ... this.
+
+2019-03-08 Simon Marchi <simon.marchi@efficios.com>
+
* gdbtypes.c (rank_one_type_parm_int): New function extracted
from...
(rank_one_type): ... this.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index efef999..b691999 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3976,6 +3976,28 @@ rank_one_type_parm_int (struct type *parm, struct type *arg, struct value *value
}
}
+/* rank_one_type helper for when PARM's type code is TYPE_CODE_ENUM. */
+
+static struct rank
+rank_one_type_parm_enum (struct type *parm, struct type *arg, struct value *value)
+{
+ switch (TYPE_CODE (arg))
+ {
+ case TYPE_CODE_INT:
+ case TYPE_CODE_CHAR:
+ case TYPE_CODE_RANGE:
+ case TYPE_CODE_BOOL:
+ case TYPE_CODE_ENUM:
+ if (TYPE_DECLARED_CLASS (parm) || TYPE_DECLARED_CLASS (arg))
+ return INCOMPATIBLE_TYPE_BADNESS;
+ return INTEGER_CONVERSION_BADNESS;
+ case TYPE_CODE_FLT:
+ return INT_FLOAT_CONVERSION_BADNESS;
+ default:
+ return INCOMPATIBLE_TYPE_BADNESS;
+ }
+}
+
/* Compare one type (PARM) for compatibility with another (ARG).
* PARM is intended to be the parameter type of a function; and
* ARG is the supplied argument's type. This function tests if
@@ -4074,22 +4096,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
case TYPE_CODE_INT:
return rank_one_type_parm_int (parm, arg, value);
case TYPE_CODE_ENUM:
- switch (TYPE_CODE (arg))
- {
- case TYPE_CODE_INT:
- case TYPE_CODE_CHAR:
- case TYPE_CODE_RANGE:
- case TYPE_CODE_BOOL:
- case TYPE_CODE_ENUM:
- if (TYPE_DECLARED_CLASS (parm) || TYPE_DECLARED_CLASS (arg))
- return INCOMPATIBLE_TYPE_BADNESS;
- return INTEGER_CONVERSION_BADNESS;
- case TYPE_CODE_FLT:
- return INT_FLOAT_CONVERSION_BADNESS;
- default:
- return INCOMPATIBLE_TYPE_BADNESS;
- }
- break;
+ return rank_one_type_parm_enum (parm, arg, value);
case TYPE_CODE_CHAR:
switch (TYPE_CODE (arg))
{