aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2019-03-08 10:15:09 -0500
committerSimon Marchi <simon.marchi@efficios.com>2019-03-09 08:09:38 -0500
commit0dd322dc1345d1b8809f20a674c977276f0c0430 (patch)
tree668a2f6996d8db7c2dc80f297a9bf7ebfc640645 /gdb
parent41ea472809e1eaabd3858b41c9189717e9c69323 (diff)
downloadgdb-0dd322dc1345d1b8809f20a674c977276f0c0430.zip
gdb-0dd322dc1345d1b8809f20a674c977276f0c0430.tar.gz
gdb-0dd322dc1345d1b8809f20a674c977276f0c0430.tar.bz2
Split rank_one_type_parm_range from rank_one_type
gdb/ChangeLog: * gdbtypes.c (rank_one_type_parm_range): New function extracted from... (rank_one_type): ... this.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/gdbtypes.c35
2 files changed, 27 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7bc3ebe..1af4ea7 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_range): New function extracted
+ from...
+ (rank_one_type): ... this.
+
+2019-03-08 Simon Marchi <simon.marchi@efficios.com>
+
* gdbtypes.c (rank_one_type_parm_char): New function extracted
from...
(rank_one_type): ... this.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 7acaf9d..df2337d 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4045,6 +4045,26 @@ rank_one_type_parm_char (struct type *parm, struct type *arg, struct value *valu
}
}
+/* rank_one_type helper for when PARM's type code is TYPE_CODE_RANGE. */
+
+static struct rank
+rank_one_type_parm_range (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:
+ 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
@@ -4147,20 +4167,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
case TYPE_CODE_CHAR:
return rank_one_type_parm_char (parm, arg, value);
case TYPE_CODE_RANGE:
- switch (TYPE_CODE (arg))
- {
- case TYPE_CODE_INT:
- case TYPE_CODE_CHAR:
- case TYPE_CODE_RANGE:
- case TYPE_CODE_BOOL:
- case TYPE_CODE_ENUM:
- return INTEGER_CONVERSION_BADNESS;
- case TYPE_CODE_FLT:
- return INT_FLOAT_CONVERSION_BADNESS;
- default:
- return INCOMPATIBLE_TYPE_BADNESS;
- }
- break;
+ return rank_one_type_parm_range (parm, arg, value);
case TYPE_CODE_BOOL:
switch (TYPE_CODE (arg))
{