aboutsummaryrefslogtreecommitdiff
path: root/gdb/valarith.c
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2020-05-14 13:46:38 -0400
committerSimon Marchi <simon.marchi@efficios.com>2020-05-14 13:46:38 -0400
commit7813437494ac39f3aef392d06ed5416e84fe386b (patch)
tree15290bf5b2bd9d23c59103a6a42b99adc0111d6d /gdb/valarith.c
parent67607e24d0413828acdfa9bc38f6fbac40b860b9 (diff)
downloadgdb-7813437494ac39f3aef392d06ed5416e84fe386b.zip
gdb-7813437494ac39f3aef392d06ed5416e84fe386b.tar.gz
gdb-7813437494ac39f3aef392d06ed5416e84fe386b.tar.bz2
gdb: remove TYPE_CODE macro
Remove TYPE_CODE, changing all the call sites to use type::code directly. This is quite a big diff, but this was mostly done using sed and coccinelle. A few call sites were done by hand. gdb/ChangeLog: * gdbtypes.h (TYPE_CODE): Remove. Change all call sites to use type::code instead.
Diffstat (limited to 'gdb/valarith.c')
-rw-r--r--gdb/valarith.c120
1 files changed, 60 insertions, 60 deletions
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 504264b..f1e1d6e 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -48,13 +48,13 @@ find_size_for_pointer_math (struct type *ptr_type)
LONGEST sz = -1;
struct type *ptr_target;
- gdb_assert (TYPE_CODE (ptr_type) == TYPE_CODE_PTR);
+ gdb_assert (ptr_type->code () == TYPE_CODE_PTR);
ptr_target = check_typedef (TYPE_TARGET_TYPE (ptr_type));
sz = type_length_units (ptr_target);
if (sz == 0)
{
- if (TYPE_CODE (ptr_type) == TYPE_CODE_VOID)
+ if (ptr_type->code () == TYPE_CODE_VOID)
sz = 1;
else
{
@@ -107,8 +107,8 @@ value_ptrdiff (struct value *arg1, struct value *arg2)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- gdb_assert (TYPE_CODE (type1) == TYPE_CODE_PTR);
- gdb_assert (TYPE_CODE (type2) == TYPE_CODE_PTR);
+ gdb_assert (type1->code () == TYPE_CODE_PTR);
+ gdb_assert (type2->code () == TYPE_CODE_PTR);
if (TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)))
!= TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type2))))
@@ -146,8 +146,8 @@ value_subscript (struct value *array, LONGEST index)
array = coerce_ref (array);
tarray = check_typedef (value_type (array));
- if (TYPE_CODE (tarray) == TYPE_CODE_ARRAY
- || TYPE_CODE (tarray) == TYPE_CODE_STRING)
+ if (tarray->code () == TYPE_CODE_ARRAY
+ || tarray->code () == TYPE_CODE_STRING)
{
struct type *range_type = TYPE_INDEX_TYPE (tarray);
LONGEST lowerbound, upperbound;
@@ -248,8 +248,8 @@ binop_types_user_defined_p (enum exp_opcode op,
if (TYPE_IS_REFERENCE (type2))
type2 = check_typedef (TYPE_TARGET_TYPE (type2));
- return (TYPE_CODE (type1) == TYPE_CODE_STRUCT
- || TYPE_CODE (type2) == TYPE_CODE_STRUCT);
+ return (type1->code () == TYPE_CODE_STRUCT
+ || type2->code () == TYPE_CODE_STRUCT);
}
/* Check to see if either argument is a structure, or a reference to
@@ -281,7 +281,7 @@ unop_user_defined_p (enum exp_opcode op, struct value *arg1)
type1 = check_typedef (value_type (arg1));
if (TYPE_IS_REFERENCE (type1))
type1 = check_typedef (TYPE_TARGET_TYPE (type1));
- return TYPE_CODE (type1) == TYPE_CODE_STRUCT;
+ return type1->code () == TYPE_CODE_STRUCT;
}
/* Try to find an operator named OPERATOR which takes NARGS arguments
@@ -364,7 +364,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
/* now we know that what we have to do is construct our
arg vector and find the right function to call it with. */
- if (TYPE_CODE (check_typedef (value_type (arg1))) != TYPE_CODE_STRUCT)
+ if (check_typedef (value_type (arg1))->code () != TYPE_CODE_STRUCT)
error (_("Can't do that binary op on that type")); /* FIXME be explicit */
value *argvec_storage[3];
@@ -491,7 +491,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
argvec[1] = argvec[0];
argvec = argvec.slice (1);
}
- if (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_XMETHOD)
+ if (value_type (argvec[0])->code () == TYPE_CODE_XMETHOD)
{
/* Static xmethods are not supported yet. */
gdb_assert (static_memfuncp == 0);
@@ -540,7 +540,7 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
/* now we know that what we have to do is construct our
arg vector and find the right function to call it with. */
- if (TYPE_CODE (check_typedef (value_type (arg1))) != TYPE_CODE_STRUCT)
+ if (check_typedef (value_type (arg1))->code () != TYPE_CODE_STRUCT)
error (_("Can't do that unary op on that type")); /* FIXME be explicit */
value *argvec_storage[3];
@@ -605,7 +605,7 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
argvec[1] = argvec[0];
argvec = argvec.slice (1);
}
- if (TYPE_CODE (value_type (argvec[0])) == TYPE_CODE_XMETHOD)
+ if (value_type (argvec[0])->code () == TYPE_CODE_XMETHOD)
{
/* Static xmethods are not supported yet. */
gdb_assert (static_memfuncp == 0);
@@ -675,7 +675,7 @@ value_concat (struct value *arg1, struct value *arg2)
to the second of the two concatenated values or the value to be
repeated. */
- if (TYPE_CODE (type2) == TYPE_CODE_INT)
+ if (type2->code () == TYPE_CODE_INT)
{
struct type *tmp = type1;
@@ -692,17 +692,17 @@ value_concat (struct value *arg1, struct value *arg2)
/* Now process the input values. */
- if (TYPE_CODE (type1) == TYPE_CODE_INT)
+ if (type1->code () == TYPE_CODE_INT)
{
/* We have a repeat count. Validate the second value and then
construct a value repeated that many times. */
- if (TYPE_CODE (type2) == TYPE_CODE_STRING
- || TYPE_CODE (type2) == TYPE_CODE_CHAR)
+ if (type2->code () == TYPE_CODE_STRING
+ || type2->code () == TYPE_CODE_CHAR)
{
count = longest_to_int (value_as_long (inval1));
inval2len = TYPE_LENGTH (type2);
std::vector<char> ptr (count * inval2len);
- if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
+ if (type2->code () == TYPE_CODE_CHAR)
{
char_type = type2;
@@ -725,7 +725,7 @@ value_concat (struct value *arg1, struct value *arg2)
}
outval = value_string (ptr.data (), count * inval2len, char_type);
}
- else if (TYPE_CODE (type2) == TYPE_CODE_BOOL)
+ else if (type2->code () == TYPE_CODE_BOOL)
{
error (_("unimplemented support for boolean repeats"));
}
@@ -734,19 +734,19 @@ value_concat (struct value *arg1, struct value *arg2)
error (_("can't repeat values of that type"));
}
}
- else if (TYPE_CODE (type1) == TYPE_CODE_STRING
- || TYPE_CODE (type1) == TYPE_CODE_CHAR)
+ else if (type1->code () == TYPE_CODE_STRING
+ || type1->code () == TYPE_CODE_CHAR)
{
/* We have two character strings to concatenate. */
- if (TYPE_CODE (type2) != TYPE_CODE_STRING
- && TYPE_CODE (type2) != TYPE_CODE_CHAR)
+ if (type2->code () != TYPE_CODE_STRING
+ && type2->code () != TYPE_CODE_CHAR)
{
error (_("Strings can only be concatenated with other strings."));
}
inval1len = TYPE_LENGTH (type1);
inval2len = TYPE_LENGTH (type2);
std::vector<char> ptr (inval1len + inval2len);
- if (TYPE_CODE (type1) == TYPE_CODE_CHAR)
+ if (type1->code () == TYPE_CODE_CHAR)
{
char_type = type1;
@@ -758,7 +758,7 @@ value_concat (struct value *arg1, struct value *arg2)
memcpy (ptr.data (), value_contents (inval1), inval1len);
}
- if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
+ if (type2->code () == TYPE_CODE_CHAR)
{
ptr[inval1len] =
(char) unpack_long (type2, value_contents (inval2));
@@ -769,10 +769,10 @@ value_concat (struct value *arg1, struct value *arg2)
}
outval = value_string (ptr.data (), inval1len + inval2len, char_type);
}
- else if (TYPE_CODE (type1) == TYPE_CODE_BOOL)
+ else if (type1->code () == TYPE_CODE_BOOL)
{
/* We have two bitstrings to concatenate. */
- if (TYPE_CODE (type2) != TYPE_CODE_BOOL)
+ if (type2->code () != TYPE_CODE_BOOL)
{
error (_("Booleans can only be concatenated "
"with other bitstrings or booleans."));
@@ -865,7 +865,7 @@ value_args_as_target_float (struct value *arg1, struct value *arg2,
gdb_assert (is_floating_type (type1) || is_floating_type (type2));
if (is_floating_type (type1) && is_floating_type (type2)
- && TYPE_CODE (type1) != TYPE_CODE (type2))
+ && type1->code () != type2->code ())
/* The DFP extension to the C language does not allow mixing of
* decimal float types with other float types in expressions
* (see WDTR 24732, page 12). */
@@ -962,7 +962,7 @@ complex_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
struct type *arg2_type = check_typedef (value_type (arg2));
struct value *arg1_real, *arg1_imag, *arg2_real, *arg2_imag;
- if (TYPE_CODE (arg1_type) == TYPE_CODE_COMPLEX)
+ if (arg1_type->code () == TYPE_CODE_COMPLEX)
{
arg1_real = value_real_part (arg1);
arg1_imag = value_imaginary_part (arg1);
@@ -972,7 +972,7 @@ complex_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
arg1_real = arg1;
arg1_imag = value_zero (arg1_type, not_lval);
}
- if (TYPE_CODE (arg2_type) == TYPE_CODE_COMPLEX)
+ if (arg2_type->code () == TYPE_CODE_COMPLEX)
{
arg2_real = value_real_part (arg2);
arg2_imag = value_imaginary_part (arg2);
@@ -1015,7 +1015,7 @@ complex_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
case BINOP_DIV:
{
- if (TYPE_CODE (arg2_type) == TYPE_CODE_COMPLEX)
+ if (arg2_type->code () == TYPE_CODE_COMPLEX)
{
struct value *conjugate = value_complement (arg2);
/* We have to reconstruct ARG1, in case the type was
@@ -1080,8 +1080,8 @@ scalar_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- if (TYPE_CODE (type1) == TYPE_CODE_COMPLEX
- || TYPE_CODE (type2) == TYPE_CODE_COMPLEX)
+ if (type1->code () == TYPE_CODE_COMPLEX
+ || type2->code () == TYPE_CODE_COMPLEX)
return complex_binop (arg1, arg2, op);
if ((!is_floating_value (arg1) && !is_integral_type (type1))
@@ -1105,8 +1105,8 @@ scalar_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
v2.data (), eff_type_v2,
value_contents_raw (val), result_type);
}
- else if (TYPE_CODE (type1) == TYPE_CODE_BOOL
- || TYPE_CODE (type2) == TYPE_CODE_BOOL)
+ else if (type1->code () == TYPE_CODE_BOOL
+ || type2->code () == TYPE_CODE_BOOL)
{
LONGEST v1, v2, v = 0;
@@ -1438,7 +1438,7 @@ value_vector_widen (struct value *scalar_value, struct type *vector_type)
vector_type = check_typedef (vector_type);
- gdb_assert (TYPE_CODE (vector_type) == TYPE_CODE_ARRAY
+ gdb_assert (vector_type->code () == TYPE_CODE_ARRAY
&& TYPE_VECTOR (vector_type));
if (!get_array_bounds (vector_type, &low_bound, &high_bound))
@@ -1478,9 +1478,9 @@ vector_binop (struct value *val1, struct value *val2, enum exp_opcode op)
type1 = check_typedef (value_type (val1));
type2 = check_typedef (value_type (val2));
- t1_is_vec = (TYPE_CODE (type1) == TYPE_CODE_ARRAY
+ t1_is_vec = (type1->code () == TYPE_CODE_ARRAY
&& TYPE_VECTOR (type1)) ? 1 : 0;
- t2_is_vec = (TYPE_CODE (type2) == TYPE_CODE_ARRAY
+ t2_is_vec = (type2->code () == TYPE_CODE_ARRAY
&& TYPE_VECTOR (type2)) ? 1 : 0;
if (!t1_is_vec || !t2_is_vec)
@@ -1494,7 +1494,7 @@ vector_binop (struct value *val1, struct value *val2, enum exp_opcode op)
eltype2 = check_typedef (TYPE_TARGET_TYPE (type2));
elsize = TYPE_LENGTH (eltype1);
- if (TYPE_CODE (eltype1) != TYPE_CODE (eltype2)
+ if (eltype1->code () != eltype2->code ()
|| elsize != TYPE_LENGTH (eltype2)
|| TYPE_UNSIGNED (eltype1) != TYPE_UNSIGNED (eltype2)
|| low_bound1 != low_bound2 || high_bound1 != high_bound2)
@@ -1523,9 +1523,9 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
struct value *val;
struct type *type1 = check_typedef (value_type (arg1));
struct type *type2 = check_typedef (value_type (arg2));
- int t1_is_vec = (TYPE_CODE (type1) == TYPE_CODE_ARRAY
+ int t1_is_vec = (type1->code () == TYPE_CODE_ARRAY
&& TYPE_VECTOR (type1));
- int t2_is_vec = (TYPE_CODE (type2) == TYPE_CODE_ARRAY
+ int t2_is_vec = (type2->code () == TYPE_CODE_ARRAY
&& TYPE_VECTOR (type2));
if (!t1_is_vec && !t2_is_vec)
@@ -1538,8 +1538,8 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
struct value **v = t1_is_vec ? &arg2 : &arg1;
struct type *t = t1_is_vec ? type2 : type1;
- if (TYPE_CODE (t) != TYPE_CODE_FLT
- && TYPE_CODE (t) != TYPE_CODE_DECFLOAT
+ if (t->code () != TYPE_CODE_FLT
+ && t->code () != TYPE_CODE_DECFLOAT
&& !is_integral_type (t))
error (_("Argument to operation not a number or boolean."));
@@ -1628,8 +1628,8 @@ value_equal (struct value *arg1, struct value *arg2)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- code1 = TYPE_CODE (type1);
- code2 = TYPE_CODE (type2);
+ code1 = type1->code ();
+ code2 = type2->code ();
is_int1 = is_integral_type (type1);
is_int2 = is_integral_type (type2);
@@ -1692,7 +1692,7 @@ value_equal_contents (struct value *arg1, struct value *arg2)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- return (TYPE_CODE (type1) == TYPE_CODE (type2)
+ return (type1->code () == type2->code ()
&& TYPE_LENGTH (type1) == TYPE_LENGTH (type2)
&& memcmp (value_contents (arg1), value_contents (arg2),
TYPE_LENGTH (type1)) == 0);
@@ -1714,8 +1714,8 @@ value_less (struct value *arg1, struct value *arg2)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- code1 = TYPE_CODE (type1);
- code2 = TYPE_CODE (type2);
+ code1 = type1->code ();
+ code2 = type2->code ();
is_int1 = is_integral_type (type1);
is_int2 = is_integral_type (type2);
@@ -1766,8 +1766,8 @@ value_pos (struct value *arg1)
type = check_typedef (value_type (arg1));
if (is_integral_type (type) || is_floating_value (arg1)
- || (TYPE_CODE (type) == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
- || TYPE_CODE (type) == TYPE_CODE_COMPLEX)
+ || (type->code () == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
+ || type->code () == TYPE_CODE_COMPLEX)
return value_from_contents (type, value_contents (arg1));
else
error (_("Argument to positive operation not a number."));
@@ -1783,7 +1783,7 @@ value_neg (struct value *arg1)
if (is_integral_type (type) || is_floating_type (type))
return value_binop (value_from_longest (type, 0), arg1, BINOP_SUB);
- else if (TYPE_CODE (type) == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
+ else if (type->code () == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
{
struct value *tmp, *val = allocate_value (type);
struct type *eltype = check_typedef (TYPE_TARGET_TYPE (type));
@@ -1801,7 +1801,7 @@ value_neg (struct value *arg1)
}
return val;
}
- else if (TYPE_CODE (type) == TYPE_CODE_COMPLEX)
+ else if (type->code () == TYPE_CODE_COMPLEX)
{
struct value *real = value_real_part (arg1);
struct value *imag = value_imaginary_part (arg1);
@@ -1825,7 +1825,7 @@ value_complement (struct value *arg1)
if (is_integral_type (type))
val = value_from_longest (type, ~value_as_long (arg1));
- else if (TYPE_CODE (type) == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
+ else if (type->code () == TYPE_CODE_ARRAY && TYPE_VECTOR (type))
{
struct value *tmp;
struct type *eltype = check_typedef (TYPE_TARGET_TYPE (type));
@@ -1843,7 +1843,7 @@ value_complement (struct value *arg1)
value_contents_all (tmp), TYPE_LENGTH (eltype));
}
}
- else if (TYPE_CODE (type) == TYPE_CODE_COMPLEX)
+ else if (type->code () == TYPE_CODE_COMPLEX)
{
/* GCC has an extension that treats ~complex as the complex
conjugate. */
@@ -1892,14 +1892,14 @@ value_in (struct value *element, struct value *set)
struct type *settype = check_typedef (value_type (set));
struct type *eltype = check_typedef (value_type (element));
- if (TYPE_CODE (eltype) == TYPE_CODE_RANGE)
+ if (eltype->code () == TYPE_CODE_RANGE)
eltype = TYPE_TARGET_TYPE (eltype);
- if (TYPE_CODE (settype) != TYPE_CODE_SET)
+ if (settype->code () != TYPE_CODE_SET)
error (_("Second argument of 'IN' has wrong type"));
- if (TYPE_CODE (eltype) != TYPE_CODE_INT
- && TYPE_CODE (eltype) != TYPE_CODE_CHAR
- && TYPE_CODE (eltype) != TYPE_CODE_ENUM
- && TYPE_CODE (eltype) != TYPE_CODE_BOOL)
+ if (eltype->code () != TYPE_CODE_INT
+ && eltype->code () != TYPE_CODE_CHAR
+ && eltype->code () != TYPE_CODE_ENUM
+ && eltype->code () != TYPE_CODE_BOOL)
error (_("First argument of 'IN' has wrong type"));
member = value_bit_index (settype, value_contents (set),
value_as_long (element));