You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "value.h"
#include "target.h"
#include "language.h"
#include "demangle.h"
-#include <string.h>
+#include "gdb_string.h"
/* Define whether or not the C operator '/' truncates towards zero for
differently signed operands (truncation direction is undefined in C). */
#define TRUNCATION_TOWARDS_ZERO ((-5 / 2) == -2)
#endif
-static value_ptr value_subscripted_rvalue PARAMS ((value_ptr, value_ptr));
+static value_ptr value_subscripted_rvalue PARAMS ((value_ptr, value_ptr, int));
\f
value_ptr
{
register value_ptr valint, valptr;
register int len;
+ struct type *type1, *type2, *valptrtype;
- COERCE_ARRAY (arg1);
- COERCE_ARRAY (arg2);
+ COERCE_NUMBER (arg1);
+ COERCE_NUMBER (arg2);
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
- if ((TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_PTR
- || TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_PTR)
+ if ((TYPE_CODE (type1) == TYPE_CODE_PTR
+ || TYPE_CODE (type2) == TYPE_CODE_PTR)
&&
- (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_INT
- || TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_INT))
+ (TYPE_CODE (type1) == TYPE_CODE_INT
+ || TYPE_CODE (type2) == TYPE_CODE_INT))
/* Exactly one argument is a pointer, and one is an integer. */
{
- if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_PTR)
+ if (TYPE_CODE (type1) == TYPE_CODE_PTR)
{
valptr = arg1;
valint = arg2;
+ valptrtype = type1;
}
else
{
valptr = arg2;
valint = arg1;
+ valptrtype = type2;
}
- len = TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (valptr)));
+ len = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (valptrtype)));
if (len == 0) len = 1; /* For (void *) */
- return value_from_longest (VALUE_TYPE (valptr),
+ return value_from_longest (valptrtype,
value_as_long (valptr)
+ (len * value_as_long (valint)));
}
value_sub (arg1, arg2)
value_ptr arg1, arg2;
{
+ struct type *type1, *type2;
+ COERCE_NUMBER (arg1);
+ COERCE_NUMBER (arg2);
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
- COERCE_ARRAY (arg1);
- COERCE_ARRAY (arg2);
-
- if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_PTR)
+ if (TYPE_CODE (type1) == TYPE_CODE_PTR)
{
- if (TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_INT)
+ if (TYPE_CODE (type2) == TYPE_CODE_INT)
{
/* pointer - integer. */
+ LONGEST sz = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)));
return value_from_longest
(VALUE_TYPE (arg1),
- value_as_long (arg1)
- - (TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (arg1)))
- * value_as_long (arg2)));
+ value_as_long (arg1) - (sz * value_as_long (arg2)));
}
- else if (TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_PTR
- && TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (arg1)))
- == TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (arg2))))
+ else if (TYPE_CODE (type2) == TYPE_CODE_PTR
+ && TYPE_LENGTH (TYPE_TARGET_TYPE (type1))
+ == TYPE_LENGTH (TYPE_TARGET_TYPE (type2)))
{
/* pointer to <type x> - pointer to <type x>. */
+ LONGEST sz = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)));
return value_from_longest
(builtin_type_long, /* FIXME -- should be ptrdiff_t */
- (value_as_long (arg1) - value_as_long (arg2))
- / (LONGEST) (TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (arg1)))));
+ (value_as_long (arg1) - value_as_long (arg2)) / sz);
}
else
{
value_subscript (array, idx)
value_ptr array, idx;
{
- int lowerbound;
value_ptr bound;
- struct type *range_type;
+ int c_style = current_language->c_style_arrays;
+ struct type *tarray, *tint;
COERCE_REF (array);
+ tarray = check_typedef (VALUE_TYPE (array));
+ COERCE_VARYING_ARRAY (array, tarray);
- if (TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_ARRAY
- || TYPE_CODE (VALUE_TYPE (array)) == TYPE_CODE_STRING)
+ if (TYPE_CODE (tarray) == TYPE_CODE_ARRAY
+ || TYPE_CODE (tarray) == TYPE_CODE_STRING)
{
- range_type = TYPE_FIELD_TYPE (VALUE_TYPE (array), 0);
- lowerbound = TYPE_FIELD_BITPOS (range_type, 0);
+ struct type *range_type = TYPE_INDEX_TYPE (tarray);
+ LONGEST lowerbound, upperbound;
+ get_discrete_bounds (range_type, &lowerbound, &upperbound);
+
+ if (VALUE_LVAL (array) != lval_memory)
+ return value_subscripted_rvalue (array, idx, lowerbound);
+
+ if (c_style == 0)
+ {
+ LONGEST index = value_as_long (idx);
+ if (index >= lowerbound && index <= upperbound)
+ return value_subscripted_rvalue (array, idx, lowerbound);
+ warning ("array or string index out of range");
+ /* fall doing C stuff */
+ c_style = 1;
+ }
+
if (lowerbound != 0)
{
bound = value_from_longest (builtin_type_int, (LONGEST) lowerbound);
idx = value_sub (idx, bound);
}
- if (VALUE_LVAL (array) != lval_memory)
- {
- return value_subscripted_rvalue (array, idx);
- }
+
array = value_coerce_array (array);
}
- return value_ind (value_add (array, idx));
+
+ if (TYPE_CODE (tarray) == TYPE_CODE_BITSTRING)
+ {
+ struct type *range_type = TYPE_INDEX_TYPE (tarray);
+ LONGEST index = value_as_long (idx);
+ value_ptr v;
+ int offset, byte, bit_index;
+ LONGEST lowerbound, upperbound, word;
+ get_discrete_bounds (range_type, &lowerbound, &upperbound);
+ if (index < lowerbound || index > upperbound)
+ error ("bitstring index out of range");
+ index -= lowerbound;
+ offset = index / TARGET_CHAR_BIT;
+ byte = *((char*)VALUE_CONTENTS (array) + offset);
+ bit_index = index % TARGET_CHAR_BIT;
+ byte >>= (BITS_BIG_ENDIAN ? TARGET_CHAR_BIT - 1 - bit_index : bit_index);
+ v = value_from_longest (LA_BOOL_TYPE, byte & 1);
+ VALUE_BITPOS (v) = bit_index;
+ VALUE_BITSIZE (v) = 1;
+ VALUE_LVAL (v) = VALUE_LVAL (array);
+ if (VALUE_LVAL (array) == lval_internalvar)
+ VALUE_LVAL (v) = lval_internalvar_component;
+ VALUE_ADDRESS (v) = VALUE_ADDRESS (array);
+ VALUE_OFFSET (v) = offset + VALUE_OFFSET (array);
+ return v;
+ }
+
+ if (c_style)
+ return value_ind (value_add (array, idx));
+ else
+ error ("not an array or string");
}
/* Return the value of EXPR[IDX], expr an aggregate rvalue
to doubles, but no longer does. */
static value_ptr
-value_subscripted_rvalue (array, idx)
+value_subscripted_rvalue (array, idx, lowerbound)
value_ptr array, idx;
+ int lowerbound;
{
- struct type *elt_type = TYPE_TARGET_TYPE (VALUE_TYPE (array));
+ struct type *array_type = check_typedef (VALUE_TYPE (array));
+ struct type *elt_type = check_typedef (TYPE_TARGET_TYPE (array_type));
int elt_size = TYPE_LENGTH (elt_type);
- int elt_offs = elt_size * longest_to_int (value_as_long (idx));
+ LONGEST index = value_as_long (idx);
+ int elt_offs = elt_size * longest_to_int (index - lowerbound);
value_ptr v;
- if (elt_offs >= TYPE_LENGTH (VALUE_TYPE (array)))
+ if (index < lowerbound || elt_offs >= TYPE_LENGTH (array_type))
error ("no such vector element");
v = allocate_value (elt_type);
- memcpy (VALUE_CONTENTS (v), VALUE_CONTENTS (array) + elt_offs, elt_size);
+ if (VALUE_LAZY (array))
+ VALUE_LAZY (v) = 1;
+ else
+ memcpy (VALUE_CONTENTS (v), VALUE_CONTENTS (array) + elt_offs, elt_size);
if (VALUE_LVAL (array) == lval_internalvar)
VALUE_LVAL (v) = lval_internalvar_component;
else
- VALUE_LVAL (v) = not_lval;
+ VALUE_LVAL (v) = VALUE_LVAL (array);
VALUE_ADDRESS (v) = VALUE_ADDRESS (array);
VALUE_OFFSET (v) = VALUE_OFFSET (array) + elt_offs;
- VALUE_BITSIZE (v) = elt_size * 8;
return v;
}
\f
enum exp_opcode op;
value_ptr arg1, arg2;
{
- if (op == BINOP_ASSIGN)
+ struct type *type1, *type2;
+ if (op == BINOP_ASSIGN || op == BINOP_CONCAT)
return 0;
- return (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_STRUCT
- || TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_STRUCT
- || (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_REF
- && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (arg1))) == TYPE_CODE_STRUCT)
- || (TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_REF
- && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (arg2))) == TYPE_CODE_STRUCT));
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
+ return (TYPE_CODE (type1) == TYPE_CODE_STRUCT
+ || TYPE_CODE (type2) == TYPE_CODE_STRUCT
+ || (TYPE_CODE (type1) == TYPE_CODE_REF
+ && TYPE_CODE (TYPE_TARGET_TYPE (type1)) == TYPE_CODE_STRUCT)
+ || (TYPE_CODE (type2) == TYPE_CODE_REF
+ && TYPE_CODE (TYPE_TARGET_TYPE (type2)) == TYPE_CODE_STRUCT));
}
/* Check to see if argument is a structure. This is called so
enum exp_opcode op;
value_ptr arg1;
{
+ struct type *type1;
if (op == UNOP_ADDR)
return 0;
- return (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_STRUCT
- || (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_REF
- && TYPE_CODE (TYPE_TARGET_TYPE (VALUE_TYPE (arg1))) == TYPE_CODE_STRUCT));
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ for (;;)
+ {
+ if (TYPE_CODE (type1) == TYPE_CODE_STRUCT)
+ return 1;
+ else if (TYPE_CODE (type1) == TYPE_CODE_REF)
+ type1 = TYPE_TARGET_TYPE (type1);
+ else
+ return 0;
+ }
}
/* We know either arg1 or arg2 is a structure, so try to find the right
/* 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 (VALUE_TYPE (arg1)) != TYPE_CODE_STRUCT)
+ if (TYPE_CODE (check_typedef (VALUE_TYPE (arg1))) != TYPE_CODE_STRUCT)
error ("Can't do that binary op on that type"); /* FIXME be explicit */
argvec = (value_ptr *) alloca (sizeof (value_ptr) * 4);
char tstr[13], mangle_tstr[13];
int static_memfuncp;
+ COERCE_REF (arg1);
COERCE_ENUM (arg1);
/* 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 (VALUE_TYPE (arg1)) != TYPE_CODE_STRUCT)
+ if (TYPE_CODE (check_typedef (VALUE_TYPE (arg1))) != TYPE_CODE_STRUCT)
error ("Can't do that unary op on that type"); /* FIXME be explicit */
argvec = (value_ptr *) alloca (sizeof (value_ptr) * 3);
int count, idx;
char *ptr;
char inchar;
+ struct type *type1 = check_typedef (VALUE_TYPE (arg1));
+ struct type *type2 = check_typedef (VALUE_TYPE (arg2));
+
+ COERCE_VARYING_ARRAY (arg1, type1);
+ COERCE_VARYING_ARRAY (arg2, type2);
/* First figure out if we are dealing with two values to be concatenated
or a repeat count and a value to be repeated. INVAL1 is set to the
to the second of the two concatenated values or the value to be
repeated. */
- if (TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_INT)
+ if (TYPE_CODE (type2) == TYPE_CODE_INT)
{
+ struct type *tmp = type1;
+ type1 = tmp;
+ tmp = type2;
inval1 = arg2;
inval2 = arg1;
}
/* Now process the input values. */
- if (TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_INT)
+ if (TYPE_CODE (type1) == TYPE_CODE_INT)
{
/* We have a repeat count. Validate the second value and then
construct a value repeated that many times. */
- if (TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_STRING
- || TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_CHAR)
+ if (TYPE_CODE (type2) == TYPE_CODE_STRING
+ || TYPE_CODE (type2) == TYPE_CODE_CHAR)
{
count = longest_to_int (value_as_long (inval1));
- inval2len = TYPE_LENGTH (VALUE_TYPE (inval2));
+ inval2len = TYPE_LENGTH (type2);
ptr = (char *) alloca (count * inval2len);
- if (TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_CHAR)
+ if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
{
- inchar = (char) unpack_long (VALUE_TYPE (inval2),
+ inchar = (char) unpack_long (type2,
VALUE_CONTENTS (inval2));
for (idx = 0; idx < count; idx++)
{
}
outval = value_string (ptr, count * inval2len);
}
- else if (TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_BITSTRING
- || TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_BOOL)
+ else if (TYPE_CODE (type2) == TYPE_CODE_BITSTRING
+ || TYPE_CODE (type2) == TYPE_CODE_BOOL)
{
error ("unimplemented support for bitstring/boolean repeats");
}
error ("can't repeat values of that type");
}
}
- else if (TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_STRING
- || TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_CHAR)
+ else if (TYPE_CODE (type1) == TYPE_CODE_STRING
+ || TYPE_CODE (type1) == TYPE_CODE_CHAR)
{
/* We have two character strings to concatenate. */
- if (TYPE_CODE (VALUE_TYPE (inval2)) != TYPE_CODE_STRING
- && TYPE_CODE (VALUE_TYPE (inval2)) != TYPE_CODE_CHAR)
+ if (TYPE_CODE (type2) != TYPE_CODE_STRING
+ && TYPE_CODE (type2) != TYPE_CODE_CHAR)
{
error ("Strings can only be concatenated with other strings.");
}
- inval1len = TYPE_LENGTH (VALUE_TYPE (inval1));
- inval2len = TYPE_LENGTH (VALUE_TYPE (inval2));
+ inval1len = TYPE_LENGTH (type1);
+ inval2len = TYPE_LENGTH (type2);
ptr = (char *) alloca (inval1len + inval2len);
- if (TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_CHAR)
+ if (TYPE_CODE (type1) == TYPE_CODE_CHAR)
{
- *ptr = (char) unpack_long (VALUE_TYPE (inval1), VALUE_CONTENTS (inval1));
+ *ptr = (char) unpack_long (type1, VALUE_CONTENTS (inval1));
}
else
{
memcpy (ptr, VALUE_CONTENTS (inval1), inval1len);
}
- if (TYPE_CODE (VALUE_TYPE (inval2)) == TYPE_CODE_CHAR)
+ if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
{
*(ptr + inval1len) =
- (char) unpack_long (VALUE_TYPE (inval2), VALUE_CONTENTS (inval2));
+ (char) unpack_long (type2, VALUE_CONTENTS (inval2));
}
else
{
}
outval = value_string (ptr, inval1len + inval2len);
}
- else if (TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_BITSTRING
- || TYPE_CODE (VALUE_TYPE (inval1)) == TYPE_CODE_BOOL)
+ else if (TYPE_CODE (type1) == TYPE_CODE_BITSTRING
+ || TYPE_CODE (type1) == TYPE_CODE_BOOL)
{
/* We have two bitstrings to concatenate. */
- if (TYPE_CODE (VALUE_TYPE (inval2)) != TYPE_CODE_BITSTRING
- && TYPE_CODE (VALUE_TYPE (inval2)) != TYPE_CODE_BOOL)
+ if (TYPE_CODE (type2) != TYPE_CODE_BITSTRING
+ && TYPE_CODE (type2) != TYPE_CODE_BOOL)
{
error ("Bitstrings or booleans can only be concatenated with other bitstrings or booleans.");
}
enum exp_opcode op;
{
register value_ptr val;
+ struct type *type1, *type2;
+ COERCE_REF (arg1);
+ COERCE_REF (arg2);
COERCE_ENUM (arg1);
COERCE_ENUM (arg2);
-
- if ((TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_FLT
- && TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_CHAR
- && TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_INT
- && TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_BOOL
- && TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_RANGE)
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
+
+ if ((TYPE_CODE (type1) != TYPE_CODE_FLT
+ && TYPE_CODE (type1) != TYPE_CODE_CHAR
+ && TYPE_CODE (type1) != TYPE_CODE_INT
+ && TYPE_CODE (type1) != TYPE_CODE_BOOL
+ && TYPE_CODE (type1) != TYPE_CODE_RANGE)
||
- (TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_FLT
- && TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_CHAR
- && TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_INT
- && TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_BOOL
- && TYPE_CODE (VALUE_TYPE (arg2)) != TYPE_CODE_RANGE))
+ (TYPE_CODE (type2) != TYPE_CODE_FLT
+ && TYPE_CODE (type2) != TYPE_CODE_CHAR
+ && TYPE_CODE (type2) != TYPE_CODE_INT
+ && TYPE_CODE (type2) != TYPE_CODE_BOOL
+ && TYPE_CODE (type2) != TYPE_CODE_RANGE))
error ("Argument to arithmetic operation not a number or boolean.");
- if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_FLT
+ if (TYPE_CODE (type1) == TYPE_CODE_FLT
||
- TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_FLT)
+ TYPE_CODE (type2) == TYPE_CODE_FLT)
{
/* FIXME-if-picky-about-floating-accuracy: Should be doing this
in target format. real.c in GCC probably has the necessary
code. */
- double v1, v2, v;
+ DOUBLEST v1, v2, v;
v1 = value_as_double (arg1);
v2 = value_as_double (arg2);
switch (op)
error ("Integer-only operation on floating point number.");
}
- val = allocate_value (builtin_type_double);
+ /* If either arg was long double, make sure that value is also long
+ double. */
+
+ if (TYPE_LENGTH(type1) * 8 > TARGET_DOUBLE_BIT
+ || TYPE_LENGTH(type2) * 8 > TARGET_DOUBLE_BIT)
+ val = allocate_value (builtin_type_long_double);
+ else
+ val = allocate_value (builtin_type_double);
+
store_floating (VALUE_CONTENTS_RAW (val), TYPE_LENGTH (VALUE_TYPE (val)),
v);
}
- else if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_BOOL
+ else if (TYPE_CODE (type1) == TYPE_CODE_BOOL
&&
- TYPE_CODE (VALUE_TYPE (arg2)) == TYPE_CODE_BOOL)
+ TYPE_CODE (type2) == TYPE_CODE_BOOL)
{
LONGEST v1, v2, v;
v1 = value_as_long (arg1);
error ("Invalid operation on booleans.");
}
- val = allocate_value (builtin_type_chill_bool);
+ val = allocate_value (type1);
store_signed_integer (VALUE_CONTENTS_RAW (val),
- TYPE_LENGTH (VALUE_TYPE (val)),
+ TYPE_LENGTH (type1),
v);
}
else
/* FIXME: This implements ANSI C rules (also correct for C++).
What about FORTRAN and chill? */
{
- struct type *type1 = VALUE_TYPE (arg1);
- struct type *type2 = VALUE_TYPE (arg2);
int promoted_len1 = TYPE_LENGTH (type1);
int promoted_len2 = TYPE_LENGTH (type2);
int is_unsigned1 = TYPE_UNSIGNED (type1);
{
register int len;
register char *p;
+ struct type *type1;
- COERCE_ARRAY (arg1);
+ COERCE_NUMBER (arg1);
+ type1 = check_typedef (VALUE_TYPE (arg1));
- if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_FLT)
+ if (TYPE_CODE (type1) == TYPE_CODE_FLT)
return 0 == value_as_double (arg1);
- len = TYPE_LENGTH (VALUE_TYPE (arg1));
+ len = TYPE_LENGTH (type1);
p = VALUE_CONTENTS (arg1);
while (--len >= 0)
{
register int len;
register char *p1, *p2;
+ struct type *type1, *type2;
enum type_code code1;
enum type_code code2;
- COERCE_ARRAY (arg1);
- COERCE_ARRAY (arg2);
+ COERCE_NUMBER (arg1);
+ COERCE_NUMBER (arg2);
- code1 = TYPE_CODE (VALUE_TYPE (arg1));
- code2 = TYPE_CODE (VALUE_TYPE (arg2));
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
+ code1 = TYPE_CODE (type1);
+ code2 = TYPE_CODE (type2);
if (code1 == TYPE_CODE_INT && code2 == TYPE_CODE_INT)
return longest_to_int (value_as_long (value_binop (arg1, arg2,
return (CORE_ADDR) value_as_long (arg1) == value_as_pointer (arg2);
else if (code1 == code2
- && ((len = TYPE_LENGTH (VALUE_TYPE (arg1)))
- == TYPE_LENGTH (VALUE_TYPE (arg2))))
+ && ((len = TYPE_LENGTH (type1))
+ == TYPE_LENGTH (type2)))
{
p1 = VALUE_CONTENTS (arg1);
p2 = VALUE_CONTENTS (arg2);
{
register enum type_code code1;
register enum type_code code2;
+ struct type *type1, *type2;
- COERCE_ARRAY (arg1);
- COERCE_ARRAY (arg2);
+ COERCE_NUMBER (arg1);
+ COERCE_NUMBER (arg2);
- code1 = TYPE_CODE (VALUE_TYPE (arg1));
- code2 = TYPE_CODE (VALUE_TYPE (arg2));
+ type1 = check_typedef (VALUE_TYPE (arg1));
+ type2 = check_typedef (VALUE_TYPE (arg2));
+ code1 = TYPE_CODE (type1);
+ code2 = TYPE_CODE (type2);
if (code1 == TYPE_CODE_INT && code2 == TYPE_CODE_INT)
return longest_to_int (value_as_long (value_binop (arg1, arg2,
{
register struct type *type;
+ COERCE_REF (arg1);
COERCE_ENUM (arg1);
- type = VALUE_TYPE (arg1);
+ type = check_typedef (VALUE_TYPE (arg1));
if (TYPE_CODE (type) == TYPE_CODE_FLT)
return value_from_double (type, - value_as_double (arg1));
value_complement (arg1)
register value_ptr arg1;
{
+ COERCE_REF (arg1);
COERCE_ENUM (arg1);
- if (TYPE_CODE (VALUE_TYPE (arg1)) != TYPE_CODE_INT)
+ if (TYPE_CODE (check_typedef (VALUE_TYPE (arg1))) != TYPE_CODE_INT)
error ("Argument to complement operation not an integer.");
return value_from_longest (VALUE_TYPE (arg1), ~ value_as_long (arg1));
char *valaddr;
int index;
{
- struct type *range;
- int low_bound, high_bound;
+ LONGEST low_bound, high_bound;
LONGEST word;
unsigned rel_index;
- range = TYPE_FIELD_TYPE (type, 0);
- if (TYPE_CODE (range) != TYPE_CODE_RANGE)
+ struct type *range = TYPE_FIELD_TYPE (type, 0);
+ if (get_discrete_bounds (range, &low_bound, &high_bound) < 0)
return -2;
- low_bound = TYPE_LOW_BOUND (range);
- high_bound = TYPE_HIGH_BOUND (range);
if (index < low_bound || index > high_bound)
return -1;
rel_index = index - low_bound;
value_ptr element, set;
{
int member;
- if (TYPE_CODE (VALUE_TYPE (set)) != TYPE_CODE_SET)
+ struct type *settype = check_typedef (VALUE_TYPE (set));
+ struct type *eltype = check_typedef (VALUE_TYPE (element));
+ if (TYPE_CODE (eltype) == TYPE_CODE_RANGE)
+ eltype = TYPE_TARGET_TYPE (eltype);
+ if (TYPE_CODE (settype) != TYPE_CODE_SET)
error ("Second argument of 'IN' has wrong type");
- if (TYPE_CODE (VALUE_TYPE (element)) != TYPE_CODE_INT
- && TYPE_CODE (VALUE_TYPE (element)) != TYPE_CODE_CHAR
- && TYPE_CODE (VALUE_TYPE (element)) != TYPE_CODE_ENUM
- && TYPE_CODE (VALUE_TYPE (element)) != TYPE_CODE_BOOL)
+ 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)
error ("First argument of 'IN' has wrong type");
- member = value_bit_index (VALUE_TYPE (set), VALUE_CONTENTS (set),
+ member = value_bit_index (settype, VALUE_CONTENTS (set),
value_as_long (element));
if (member < 0)
error ("First argument of 'IN' not in range");
- return value_from_longest (builtin_type_int, member);
+ return value_from_longest (builtin_type_chill_bool, member);
}
void
projects / deliverable / binutils-gdb.git / blobdiff