/* Perform arithmetic and other operations on values, for GDB.
- Copyright (C) 1986-2020 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
This file is part of GDB.
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
{
const char *name;
- name = TYPE_NAME (ptr_target);
+ name = ptr_target->name ();
if (name == NULL)
error (_("Cannot perform pointer math on incomplete types, "
"try casting to a known type, or void *."));
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))))
if (sz == 0)
{
warning (_("Type size unknown, assuming 1. "
- "Try casting to a known type, or void *."));
+ "Try casting to a known type, or void *."));
sz = 1;
}
struct value *
value_subscript (struct value *array, LONGEST index)
{
- int c_style = current_language->c_style_arrays;
+ bool c_style = current_language->c_style_arrays_p ();
struct type *tarray;
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;
+ struct type *range_type = tarray->index_type ();
+ gdb::optional<LONGEST> lowerbound = get_discrete_low_bound (range_type);
+ if (!lowerbound.has_value ())
+ lowerbound = 0;
- get_discrete_bounds (range_type, &lowerbound, &upperbound);
if (VALUE_LVAL (array) != lval_memory)
- return value_subscripted_rvalue (array, index, lowerbound);
+ return value_subscripted_rvalue (array, index, *lowerbound);
- if (c_style == 0)
+ if (!c_style)
{
- if (index >= lowerbound && index <= upperbound)
- return value_subscripted_rvalue (array, index, lowerbound);
+ gdb::optional<LONGEST> upperbound
+ = get_discrete_high_bound (range_type);
+
+ if (!upperbound.has_value ())
+ upperbound = 0;
+
+ if (index >= *lowerbound && index <= *upperbound)
+ return value_subscripted_rvalue (array, index, *lowerbound);
+
/* Emit warning unless we have an array of unknown size.
An array of unknown size has lowerbound 0 and upperbound -1. */
- if (upperbound > -1)
+ if (*upperbound > -1)
warning (_("array or string index out of range"));
/* fall doing C stuff */
- c_style = 1;
+ c_style = true;
}
- index -= lowerbound;
+ index -= *lowerbound;
array = value_coerce_array (array);
}
/* Fetch the bit stride and convert it to a byte stride, assuming 8 bits
in a byte. */
- LONGEST stride = TYPE_ARRAY_BIT_STRIDE (array_type);
+ LONGEST stride = array_type->bit_stride ();
if (stride != 0)
{
- struct gdbarch *arch = get_type_arch (elt_type);
+ struct gdbarch *arch = elt_type->arch ();
int unit_size = gdbarch_addressable_memory_unit_size (arch);
elt_size = stride / (unit_size * 8);
}
LONGEST elt_offs = elt_size * (index - lowerbound);
+ bool array_upper_bound_undefined
+ = array_type->bounds ()->high.kind () == PROP_UNDEFINED;
if (index < lowerbound
- || (!TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (array_type)
- && elt_offs >= type_length_units (array_type))
- || (VALUE_LVAL (array) != lval_memory
- && TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (array_type)))
+ || (!array_upper_bound_undefined
+ && elt_offs >= type_length_units (array_type))
+ || (VALUE_LVAL (array) != lval_memory && array_upper_bound_undefined))
{
if (type_not_associated (array_type))
- error (_("no such vector element (vector not associated)"));
+ error (_("no such vector element (vector not associated)"));
else if (type_not_allocated (array_type))
- error (_("no such vector element (vector not allocated)"));
+ error (_("no such vector element (vector not allocated)"));
else
- error (_("no such vector element"));
+ error (_("no such vector element"));
}
if (is_dynamic_type (elt_type))
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
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
static struct value *
value_user_defined_cpp_op (gdb::array_view<value *> args, char *oper,
- int *static_memfuncp, enum noside noside)
+ int *static_memfuncp, enum noside noside)
{
struct symbol *symp = NULL;
struct value *valp = NULL;
find_overload_match (args, oper, BOTH /* could be method */,
- &args[0] /* objp */,
- NULL /* pass NULL symbol since symbol is unknown */,
- &valp, &symp, static_memfuncp, 0, noside);
+ &args[0] /* objp */,
+ NULL /* pass NULL symbol since symbol is unknown */,
+ &valp, &symp, static_memfuncp, 0, noside);
if (valp)
return valp;
if (symp)
{
/* This is a non member function and does not
- expect a reference as its first argument
- rather the explicit structure. */
+ expect a reference as its first argument
+ rather the explicit structure. */
args[0] = value_ind (args[0]);
return value_of_variable (symp, 0);
}
noside);
}
else
- result = value_struct_elt (argp, args.data (), name, static_memfuncp,
+ result = value_struct_elt (argp, args, name, static_memfuncp,
"structure");
return result;
/* 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];
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);
argvec.slice (1, 2 - static_memfuncp));
}
throw_error (NOT_FOUND_ERROR,
- _("member function %s not found"), tstr);
+ _("member function %s not found"), tstr);
}
/* We know that arg1 is a structure, so try to find a unary user
struct value *
value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
{
- struct gdbarch *gdbarch = get_type_arch (value_type (arg1));
+ struct gdbarch *gdbarch = value_type (arg1)->arch ();
char *ptr;
char tstr[13], mangle_tstr[13];
int static_memfuncp, nargs;
/* 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];
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);
argvec.slice (1, nargs));
}
throw_error (NOT_FOUND_ERROR,
- _("member function %s not found"), tstr);
+ _("member function %s not found"), tstr);
}
\f
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;
/* 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)
+ construct a value repeated that many times. */
+ 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;
inchar = (char) unpack_long (type2,
- value_contents (inval2));
+ value_contents (inval2).data ());
for (idx = 0; idx < count; idx++)
{
ptr[idx] = inchar;
char_type = TYPE_TARGET_TYPE (type2);
for (idx = 0; idx < count; idx++)
- {
- memcpy (&ptr[idx * inval2len], value_contents (inval2),
- inval2len);
- }
+ memcpy (&ptr[idx * inval2len], value_contents (inval2).data (),
+ inval2len);
}
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"));
}
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;
- ptr[0] = (char) unpack_long (type1, value_contents (inval1));
+ ptr[0] = (char) unpack_long (type1, value_contents (inval1).data ());
}
else
{
char_type = TYPE_TARGET_TYPE (type1);
- memcpy (ptr.data (), value_contents (inval1), inval1len);
+ memcpy (ptr.data (), value_contents (inval1).data (), inval1len);
}
- if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
+ if (type2->code () == TYPE_CODE_CHAR)
{
ptr[inval1len] =
- (char) unpack_long (type2, value_contents (inval2));
+ (char) unpack_long (type2, value_contents (inval2).data ());
}
else
{
- memcpy (&ptr[inval1len], value_contents (inval2), inval2len);
+ memcpy (&ptr[inval1len], value_contents (inval2).data (), inval2len);
}
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."));
}
}
-/* Integer exponentiation: V1**V2, where both arguments are
- integers. Requires V1 != 0 if V2 < 0. Returns 1 for 0 ** 0. */
-
-static ULONGEST
-uinteger_pow (ULONGEST v1, LONGEST v2)
-{
- if (v2 < 0)
- {
- if (v1 == 0)
- error (_("Attempt to raise 0 to negative power."));
- else
- return 0;
- }
- else
- {
- /* The Russian Peasant's Algorithm. */
- ULONGEST v;
-
- v = 1;
- for (;;)
- {
- if (v2 & 1L)
- v *= v1;
- v2 >>= 1;
- if (v2 == 0)
- return v;
- v1 *= v1;
- }
- }
-}
-
/* Obtain argument values for binary operation, converting from
other types if one of them is not floating point. */
static void
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). */
if (is_floating_type (type1))
{
*eff_type_x = type1;
- memcpy (x, value_contents (arg1), TYPE_LENGTH (type1));
+ memcpy (x, value_contents (arg1).data (), TYPE_LENGTH (type1));
}
else if (is_integral_type (type1))
{
*eff_type_x = type2;
- if (TYPE_UNSIGNED (type1))
+ if (type1->is_unsigned ())
target_float_from_ulongest (x, *eff_type_x, value_as_long (arg1));
else
target_float_from_longest (x, *eff_type_x, value_as_long (arg1));
}
else
- error (_("Don't know how to convert from %s to %s."), TYPE_NAME (type1),
- TYPE_NAME (type2));
+ error (_("Don't know how to convert from %s to %s."), type1->name (),
+ type2->name ());
/* Obtain value of arg2, converting from other types if necessary. */
if (is_floating_type (type2))
{
*eff_type_y = type2;
- memcpy (y, value_contents (arg2), TYPE_LENGTH (type2));
+ memcpy (y, value_contents (arg2).data (), TYPE_LENGTH (type2));
}
else if (is_integral_type (type2))
{
*eff_type_y = type1;
- if (TYPE_UNSIGNED (type2))
+ if (type2->is_unsigned ())
target_float_from_ulongest (y, *eff_type_y, value_as_long (arg2));
else
target_float_from_longest (y, *eff_type_y, value_as_long (arg2));
}
else
- error (_("Don't know how to convert from %s to %s."), TYPE_NAME (type1),
- TYPE_NAME (type2));
+ error (_("Don't know how to convert from %s to %s."), type1->name (),
+ type2->name ());
+}
+
+/* Assuming at last one of ARG1 or ARG2 is a fixed point value,
+ perform the binary operation OP on these two operands, and return
+ the resulting value (also as a fixed point). */
+
+static struct value *
+fixed_point_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
+{
+ struct type *type1 = check_typedef (value_type (arg1));
+ struct type *type2 = check_typedef (value_type (arg2));
+ const struct language_defn *language = current_language;
+
+ struct gdbarch *gdbarch = type1->arch ();
+ struct value *val;
+
+ gdb_mpq v1, v2, res;
+
+ gdb_assert (is_fixed_point_type (type1) || is_fixed_point_type (type2));
+ if (op == BINOP_MUL || op == BINOP_DIV)
+ {
+ v1 = value_to_gdb_mpq (arg1);
+ v2 = value_to_gdb_mpq (arg2);
+
+ /* The code below uses TYPE1 for the result type, so make sure
+ it is set properly. */
+ if (!is_fixed_point_type (type1))
+ type1 = type2;
+ }
+ else
+ {
+ if (!is_fixed_point_type (type1))
+ {
+ arg1 = value_cast (type2, arg1);
+ type1 = type2;
+ }
+ if (!is_fixed_point_type (type2))
+ {
+ arg2 = value_cast (type1, arg2);
+ type2 = type1;
+ }
+
+ v1.read_fixed_point (gdb::make_array_view (value_contents (arg1).data (),
+ TYPE_LENGTH (type1)),
+ type_byte_order (type1), type1->is_unsigned (),
+ type1->fixed_point_scaling_factor ());
+ v2.read_fixed_point (gdb::make_array_view (value_contents (arg2).data (),
+ TYPE_LENGTH (type2)),
+ type_byte_order (type2), type2->is_unsigned (),
+ type2->fixed_point_scaling_factor ());
+ }
+
+ auto fixed_point_to_value = [type1] (const gdb_mpq &fp)
+ {
+ value *fp_val = allocate_value (type1);
+
+ fp.write_fixed_point
+ (gdb::make_array_view (value_contents_raw (fp_val).data (),
+ TYPE_LENGTH (type1)),
+ type_byte_order (type1),
+ type1->is_unsigned (),
+ type1->fixed_point_scaling_factor ());
+
+ return fp_val;
+ };
+
+ switch (op)
+ {
+ case BINOP_ADD:
+ mpq_add (res.val, v1.val, v2.val);
+ val = fixed_point_to_value (res);
+ break;
+
+ case BINOP_SUB:
+ mpq_sub (res.val, v1.val, v2.val);
+ val = fixed_point_to_value (res);
+ break;
+
+ case BINOP_MIN:
+ val = fixed_point_to_value (mpq_cmp (v1.val, v2.val) < 0 ? v1 : v2);
+ break;
+
+ case BINOP_MAX:
+ val = fixed_point_to_value (mpq_cmp (v1.val, v2.val) > 0 ? v1 : v2);
+ break;
+
+ case BINOP_MUL:
+ mpq_mul (res.val, v1.val, v2.val);
+ val = fixed_point_to_value (res);
+ break;
+
+ case BINOP_DIV:
+ if (mpq_sgn (v2.val) == 0)
+ error (_("Division by zero"));
+ mpq_div (res.val, v1.val, v2.val);
+ val = fixed_point_to_value (res);
+ break;
+
+ case BINOP_EQUAL:
+ val = value_from_ulongest (language_bool_type (language, gdbarch),
+ mpq_cmp (v1.val, v2.val) == 0 ? 1 : 0);
+ break;
+
+ case BINOP_LESS:
+ val = value_from_ulongest (language_bool_type (language, gdbarch),
+ mpq_cmp (v1.val, v2.val) < 0 ? 1 : 0);
+ break;
+
+ default:
+ error (_("Integer-only operation on fixed point number."));
+ }
+
+ return val;
}
/* A helper function that finds the type to use for a binary operation
result_type = type1;
else if (TYPE_LENGTH (type2) > TYPE_LENGTH (type1))
result_type = type2;
- else if (TYPE_UNSIGNED (type1))
+ else if (type1->is_unsigned ())
result_type = type1;
- else if (TYPE_UNSIGNED (type2))
+ else if (type2->is_unsigned ())
result_type = type2;
else
result_type = type1;
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);
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);
struct type *comp_type = promotion_type (value_type (arg1_real),
value_type (arg2_real));
+ if (!can_create_complex_type (comp_type))
+ error (_("Argument to complex arithmetic operation not supported."));
+
arg1_real = value_cast (comp_type, arg1_real);
arg1_imag = value_cast (comp_type, arg1_imag);
arg2_real = value_cast (comp_type, arg2_real);
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
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))
- || (!is_floating_value (arg2) && !is_integral_type (type2)))
+ if ((!is_floating_value (arg1)
+ && !is_integral_type (type1)
+ && !is_fixed_point_type (type1))
+ || (!is_floating_value (arg2)
+ && !is_integral_type (type2)
+ && !is_fixed_point_type (type2)))
error (_("Argument to arithmetic operation not a number or boolean."));
+ if (is_fixed_point_type (type1) || is_fixed_point_type (type2))
+ return fixed_point_binop (arg1, arg2, op);
+
if (is_floating_type (type1) || is_floating_type (type2))
{
result_type = promotion_type (type1, type2);
v2.data (), &eff_type_v2);
target_float_binop (op, v1.data (), eff_type_v1,
v2.data (), eff_type_v2,
- value_contents_raw (val), result_type);
+ value_contents_raw (val).data (), 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;
case BINOP_BITWISE_XOR:
v = v1 ^ v2;
- break;
-
- case BINOP_EQUAL:
- v = v1 == v2;
- break;
-
- case BINOP_NOTEQUAL:
- v = v1 != v2;
+ break;
+
+ case BINOP_EQUAL:
+ v = v1 == v2;
+ break;
+
+ case BINOP_NOTEQUAL:
+ v = v1 != v2;
break;
default:
result_type = type1;
val = allocate_value (result_type);
- store_signed_integer (value_contents_raw (val),
+ store_signed_integer (value_contents_raw (val).data (),
TYPE_LENGTH (result_type),
type_byte_order (result_type),
v);
else
result_type = promotion_type (type1, type2);
- if (TYPE_UNSIGNED (result_type))
+ if (result_type->is_unsigned ())
{
LONGEST v2_signed = value_as_long (arg2);
ULONGEST v1, v2, v = 0;
break;
case BINOP_EXP:
- v = uinteger_pow (v1, v2_signed);
+ v = uinteger_pow (v1, v2_signed);
break;
case BINOP_REM:
case BINOP_MOD:
/* Knuth 1.2.4, integer only. Note that unlike the C '%' op,
- v1 mod 0 has a defined value, v1. */
+ v1 mod 0 has a defined value, v1. */
if (v2 == 0)
{
v = v1;
v = v1 == v2;
break;
- case BINOP_NOTEQUAL:
- v = v1 != v2;
- break;
+ case BINOP_NOTEQUAL:
+ v = v1 != v2;
+ break;
case BINOP_LESS:
v = v1 < v2;
}
val = allocate_value (result_type);
- store_unsigned_integer (value_contents_raw (val),
+ store_unsigned_integer (value_contents_raw (val).data (),
TYPE_LENGTH (value_type (val)),
type_byte_order (result_type),
v);
v = v1 / v2;
else
error (_("Division by zero"));
- break;
+ break;
case BINOP_EXP:
- v = integer_pow (v1, v2);
+ v = integer_pow (v1, v2);
break;
case BINOP_REM:
case BINOP_MOD:
/* Knuth 1.2.4, integer only. Note that unlike the C '%' op,
- X mod 0 has a defined value, X. */
+ X mod 0 has a defined value, X. */
if (v2 == 0)
{
v = v1;
v = v1 == v2;
break;
- case BINOP_NOTEQUAL:
- v = v1 != v2;
- break;
+ case BINOP_NOTEQUAL:
+ v = v1 != v2;
+ break;
case BINOP_LESS:
v = v1 < v2;
}
val = allocate_value (result_type);
- store_signed_integer (value_contents_raw (val),
+ store_signed_integer (value_contents_raw (val).data (),
TYPE_LENGTH (value_type (val)),
type_byte_order (result_type),
v);
vector_type = check_typedef (vector_type);
- gdb_assert (TYPE_CODE (vector_type) == TYPE_CODE_ARRAY
- && TYPE_VECTOR (vector_type));
+ gdb_assert (vector_type->code () == TYPE_CODE_ARRAY
+ && vector_type->is_vector ());
if (!get_array_bounds (vector_type, &low_bound, &high_bound))
error (_("Could not determine the vector bounds"));
val = allocate_value (vector_type);
for (i = 0; i < high_bound - low_bound + 1; i++)
/* Duplicate the contents of elval into the destination vector. */
- memcpy (value_contents_writeable (val) + (i * TYPE_LENGTH (eltype)),
- value_contents_all (elval), TYPE_LENGTH (eltype));
+ memcpy (value_contents_writeable (val).data () + (i * TYPE_LENGTH (eltype)),
+ value_contents_all (elval).data (), TYPE_LENGTH (eltype));
return val;
}
type1 = check_typedef (value_type (val1));
type2 = check_typedef (value_type (val2));
- t1_is_vec = (TYPE_CODE (type1) == TYPE_CODE_ARRAY
- && TYPE_VECTOR (type1)) ? 1 : 0;
- t2_is_vec = (TYPE_CODE (type2) == TYPE_CODE_ARRAY
- && TYPE_VECTOR (type2)) ? 1 : 0;
+ t1_is_vec = (type1->code () == TYPE_CODE_ARRAY
+ && type1->is_vector ()) ? 1 : 0;
+ t2_is_vec = (type2->code () == TYPE_CODE_ARRAY
+ && type2->is_vector ()) ? 1 : 0;
if (!t1_is_vec || !t2_is_vec)
error (_("Vector operations are only supported among vectors"));
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)
+ || eltype1->is_unsigned () != eltype2->is_unsigned ()
|| low_bound1 != low_bound2 || high_bound1 != high_bound2)
error (_("Cannot perform operation on vectors with different types"));
{
tmp = value_binop (value_subscript (val1, i),
value_subscript (val2, i), op);
- memcpy (value_contents_writeable (val) + i * elsize,
- value_contents_all (tmp),
+ memcpy (value_contents_writeable (val).data () + i * elsize,
+ value_contents_all (tmp).data (),
elsize);
}
value_free_to_mark (mark);
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
- && TYPE_VECTOR (type1));
- int t2_is_vec = (TYPE_CODE (type2) == TYPE_CODE_ARRAY
- && TYPE_VECTOR (type2));
+ int t1_is_vec = (type1->code () == TYPE_CODE_ARRAY
+ && type1->is_vector ());
+ int t2_is_vec = (type2->code () == TYPE_CODE_ARRAY
+ && type2->is_vector ());
if (!t1_is_vec && !t2_is_vec)
val = scalar_binop (arg1, arg2, 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."));
return val;
}
\f
-/* Simulate the C operator ! -- return 1 if ARG1 contains zero. */
+/* See value.h. */
-int
+bool
value_logical_not (struct value *arg1)
{
int len;
type1 = check_typedef (value_type (arg1));
if (is_floating_value (arg1))
- return target_float_is_zero (value_contents (arg1), type1);
+ return target_float_is_zero (value_contents (arg1).data (), type1);
len = TYPE_LENGTH (type1);
- p = value_contents (arg1);
+ p = value_contents (arg1).data ();
while (--len >= 0)
{
{
int len1 = TYPE_LENGTH (value_type (arg1));
int len2 = TYPE_LENGTH (value_type (arg2));
- const gdb_byte *s1 = value_contents (arg1);
- const gdb_byte *s2 = value_contents (arg2);
+ const gdb_byte *s1 = value_contents (arg1).data ();
+ const gdb_byte *s2 = value_contents (arg2).data ();
int i, len = len1 < len2 ? len1 : len2;
for (i = 0; i < len; i++)
{
if (s1[i] < s2[i])
- return -1;
+ return -1;
else if (s1[i] > s2[i])
- return 1;
+ return 1;
else
- continue;
+ continue;
}
if (len1 < len2)
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);
&& ((len = (int) TYPE_LENGTH (type1))
== (int) TYPE_LENGTH (type2)))
{
- p1 = value_contents (arg1);
- p2 = value_contents (arg2);
+ p1 = value_contents (arg1).data ();
+ p2 = value_contents (arg2).data ();
while (--len >= 0)
{
if (*p1++ != *p2++)
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),
+ && memcmp (value_contents (arg1).data (),
+ value_contents (arg2).data (),
TYPE_LENGTH (type1)) == 0);
}
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);
- if (is_int1 && is_int2)
+ if ((is_int1 && is_int2)
+ || (is_fixed_point_type (type1) && is_fixed_point_type (type2)))
return longest_to_int (value_as_long (value_binop (arg1, arg2,
BINOP_LESS)));
else if ((is_floating_value (arg1) || is_int1)
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)
- return value_from_contents (type, value_contents (arg1));
+ || (type->code () == TYPE_CODE_ARRAY && type->is_vector ())
+ || type->code () == TYPE_CODE_COMPLEX)
+ return value_from_contents (type, value_contents (arg1).data ());
else
error (_("Argument to positive operation not a number."));
}
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 (is_fixed_point_type (type))
+ return value_binop (value_zero (type, not_lval), arg1, BINOP_SUB);
+ else if (type->code () == TYPE_CODE_ARRAY && type->is_vector ())
{
struct value *tmp, *val = allocate_value (type);
struct type *eltype = check_typedef (TYPE_TARGET_TYPE (type));
for (i = 0; i < high_bound - low_bound + 1; i++)
{
tmp = value_neg (value_subscript (arg1, i));
- memcpy (value_contents_writeable (val) + i * TYPE_LENGTH (eltype),
- value_contents_all (tmp), TYPE_LENGTH (eltype));
+ memcpy ((value_contents_writeable (val).data ()
+ + i * TYPE_LENGTH (eltype)),
+ value_contents_all (tmp).data (), TYPE_LENGTH (eltype));
}
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);
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->is_vector ())
{
struct value *tmp;
struct type *eltype = check_typedef (TYPE_TARGET_TYPE (type));
val = allocate_value (type);
for (i = 0; i < high_bound - low_bound + 1; i++)
- {
- tmp = value_complement (value_subscript (arg1, i));
- memcpy (value_contents_writeable (val) + i * TYPE_LENGTH (eltype),
- value_contents_all (tmp), TYPE_LENGTH (eltype));
- }
+ {
+ tmp = value_complement (value_subscript (arg1, i));
+ memcpy ((value_contents_writeable (val).data ()
+ + i * TYPE_LENGTH (eltype)),
+ value_contents_all (tmp).data (), 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. */
int
value_bit_index (struct type *type, const gdb_byte *valaddr, int index)
{
- struct gdbarch *gdbarch = get_type_arch (type);
+ struct gdbarch *gdbarch = type->arch ();
LONGEST low_bound, high_bound;
LONGEST word;
unsigned rel_index;
- struct type *range = TYPE_INDEX_TYPE (type);
+ struct type *range = type->index_type ();
- if (get_discrete_bounds (range, &low_bound, &high_bound) < 0)
+ if (!get_discrete_bounds (range, &low_bound, &high_bound))
return -2;
if (index < low_bound || index > high_bound)
return -1;
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),
+ member = value_bit_index (settype, value_contents (set).data (),
value_as_long (element));
if (member < 0)
error (_("First argument of 'IN' not in range"));