/* Perform arithmetic and other operations on values, for GDB.
- Copyright 1986, 89, 91, 92, 93, 94, 95, 96, 97, 1998
- Free Software Foundation, Inc.
+
+ Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+ Foundation, Inc.
This file is part of GDB.
#include "expression.h"
#include "target.h"
#include "language.h"
-#include "demangle.h"
#include "gdb_string.h"
+#include "doublest.h"
+#include <math.h>
+#include "infcall.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, int));
+static struct value *value_subscripted_rvalue (struct value *, struct value *, int);
-void _initialize_valarith PARAMS ((void));
+void _initialize_valarith (void);
\f
-value_ptr
-value_add (arg1, arg2)
- value_ptr arg1, arg2;
+/* Given a pointer, return the size of its target.
+ If the pointer type is void *, then return 1.
+ If the target type is incomplete, then error out.
+ This isn't a general purpose function, but just a
+ helper for value_sub & value_add.
+*/
+
+static LONGEST
+find_size_for_pointer_math (struct type *ptr_type)
+{
+ LONGEST sz = -1;
+ struct type *ptr_target;
+
+ ptr_target = check_typedef (TYPE_TARGET_TYPE (ptr_type));
+
+ sz = TYPE_LENGTH (ptr_target);
+ if (sz == 0)
+ {
+ if (TYPE_CODE (ptr_type) == TYPE_CODE_VOID)
+ sz = 1;
+ else
+ {
+ char *name;
+
+ name = TYPE_NAME (ptr_target);
+ if (name == NULL)
+ name = TYPE_TAG_NAME (ptr_target);
+ if (name == NULL)
+ error ("Cannot perform pointer math on incomplete types, "
+ "try casting to a known type, or void *.");
+ else
+ error ("Cannot perform pointer math on incomplete type \"%s\", "
+ "try casting to a known type, or void *.", name);
+ }
+ }
+ return sz;
+}
+
+struct value *
+value_add (struct value *arg1, struct value *arg2)
{
- register value_ptr valint, valptr;
- register int len;
+ struct value *valint;
+ struct value *valptr;
+ LONGEST sz;
struct type *type1, *type2, *valptrtype;
- COERCE_NUMBER (arg1);
- COERCE_NUMBER (arg2);
+ COERCE_ARRAY (arg1);
+ COERCE_ARRAY (arg2);
type1 = check_typedef (VALUE_TYPE (arg1));
type2 = check_typedef (VALUE_TYPE (arg2));
if ((TYPE_CODE (type1) == TYPE_CODE_PTR
|| TYPE_CODE (type2) == TYPE_CODE_PTR)
&&
- (TYPE_CODE (type1) == TYPE_CODE_INT
- || TYPE_CODE (type2) == TYPE_CODE_INT))
+ (is_integral_type (type1) || is_integral_type (type2)))
/* Exactly one argument is a pointer, and one is an integer. */
{
- value_ptr retval;
+ struct value *retval;
if (TYPE_CODE (type1) == TYPE_CODE_PTR)
{
valint = arg1;
valptrtype = type2;
}
- len = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (valptrtype)));
- if (len == 0)
- len = 1; /* For (void *) */
- retval = value_from_longest (valptrtype,
- value_as_long (valptr)
- + (len * value_as_long (valint)));
+
+ sz = find_size_for_pointer_math (valptrtype);
+
+ retval = value_from_pointer (valptrtype,
+ value_as_address (valptr)
+ + (sz * value_as_long (valint)));
VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (valptr);
return retval;
}
return value_binop (arg1, arg2, BINOP_ADD);
}
-value_ptr
-value_sub (arg1, arg2)
- value_ptr arg1, arg2;
+struct value *
+value_sub (struct value *arg1, struct value *arg2)
{
struct type *type1, *type2;
- COERCE_NUMBER (arg1);
- COERCE_NUMBER (arg2);
+ COERCE_ARRAY (arg1);
+ COERCE_ARRAY (arg2);
type1 = check_typedef (VALUE_TYPE (arg1));
type2 = check_typedef (VALUE_TYPE (arg2));
if (TYPE_CODE (type1) == TYPE_CODE_PTR)
{
- if (TYPE_CODE (type2) == TYPE_CODE_INT)
+ if (is_integral_type (type2))
{
/* pointer - integer. */
- LONGEST sz = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)));
- return value_from_longest
- (VALUE_TYPE (arg1),
- value_as_long (arg1) - (sz * value_as_long (arg2)));
+ LONGEST sz = find_size_for_pointer_math (type1);
+
+ return value_from_pointer (type1,
+ (value_as_address (arg1)
+ - (sz * value_as_long (arg2))));
}
else if (TYPE_CODE (type2) == TYPE_CODE_PTR
- && TYPE_LENGTH (TYPE_TARGET_TYPE (type1))
- == TYPE_LENGTH (TYPE_TARGET_TYPE (type2)))
+ && TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)))
+ == TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type2))))
{
/* pointer to <type x> - pointer to <type x>. */
LONGEST sz = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1)));
FIXME: Perhaps we should validate that the index is valid and if
verbosity is set, warn about invalid indices (but still use them). */
-value_ptr
-value_subscript (array, idx)
- value_ptr array, idx;
+struct value *
+value_subscript (struct value *array, struct value *idx)
{
- value_ptr bound;
+ struct value *bound;
int c_style = current_language->c_style_arrays;
struct type *tarray;
{
struct type *range_type = TYPE_INDEX_TYPE (tarray);
LONGEST index = value_as_long (idx);
- value_ptr v;
+ struct value *v;
int offset, byte, bit_index;
LONGEST lowerbound, upperbound;
get_discrete_bounds (range_type, &lowerbound, &upperbound);
(eg, a vector register). This routine used to promote floats
to doubles, but no longer does. */
-static value_ptr
-value_subscripted_rvalue (array, idx, lowerbound)
- value_ptr array, idx;
- int lowerbound;
+static struct value *
+value_subscripted_rvalue (struct value *array, struct value *idx, int lowerbound)
{
struct type *array_type = check_typedef (VALUE_TYPE (array));
struct type *elt_type = check_typedef (TYPE_TARGET_TYPE (array_type));
unsigned int elt_size = TYPE_LENGTH (elt_type);
LONGEST index = value_as_long (idx);
unsigned int elt_offs = elt_size * longest_to_int (index - lowerbound);
- value_ptr v;
+ struct value *v;
if (index < lowerbound || elt_offs >= TYPE_LENGTH (array_type))
error ("no such vector element");
else
VALUE_LVAL (v) = VALUE_LVAL (array);
VALUE_ADDRESS (v) = VALUE_ADDRESS (array);
+ VALUE_REGNO (v) = VALUE_REGNO (array);
VALUE_OFFSET (v) = VALUE_OFFSET (array) + elt_offs;
return v;
}
For now, we do not overload the `=' operator. */
int
-binop_user_defined_p (op, arg1, arg2)
- enum exp_opcode op;
- value_ptr arg1, arg2;
+binop_user_defined_p (enum exp_opcode op, struct value *arg1, struct value *arg2)
{
struct type *type1, *type2;
if (op == BINOP_ASSIGN || op == BINOP_CONCAT)
For now, we do not overload the `&' operator. */
int
-unop_user_defined_p (op, arg1)
- enum exp_opcode op;
- value_ptr arg1;
+unop_user_defined_p (enum exp_opcode op, struct value *arg1)
{
struct type *type1;
if (op == UNOP_ADDR)
is the opcode saying how to modify it. Otherwise, OTHEROP is
unused. */
-value_ptr
-value_x_binop (arg1, arg2, op, otherop, noside)
- value_ptr arg1, arg2;
- enum exp_opcode op, otherop;
- enum noside noside;
+struct value *
+value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
+ enum exp_opcode otherop, enum noside noside)
{
- value_ptr *argvec;
+ struct value **argvec;
char *ptr;
char tstr[13];
int static_memfuncp;
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);
+ argvec = (struct value **) alloca (sizeof (struct value *) * 4);
argvec[1] = value_addr (arg1);
argvec[2] = arg2;
argvec[3] = 0;
and return that value (where '@' is (almost) any unary operator which
is legal for GNU C++). */
-value_ptr
-value_x_unop (arg1, op, noside)
- value_ptr arg1;
- enum exp_opcode op;
- enum noside noside;
+struct value *
+value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
{
- value_ptr *argvec;
+ struct value **argvec;
char *ptr, *mangle_ptr;
char tstr[13], mangle_tstr[13];
- int static_memfuncp;
+ int static_memfuncp, nargs;
COERCE_REF (arg1);
COERCE_ENUM (arg1);
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);
+ argvec = (struct value **) alloca (sizeof (struct value *) * 4);
argvec[1] = value_addr (arg1);
argvec[2] = 0;
+ nargs = 1;
+
/* make the right function name up */
strcpy (tstr, "operator__");
ptr = tstr + 8;
strcpy (ptr, "++");
break;
case UNOP_PREDECREMENT:
- strcpy (ptr, "++");
+ strcpy (ptr, "--");
break;
case UNOP_POSTINCREMENT:
strcpy (ptr, "++");
+ argvec[2] = value_from_longest (builtin_type_int, 0);
+ argvec[3] = 0;
+ nargs ++;
break;
case UNOP_POSTDECREMENT:
- strcpy (ptr, "++");
+ strcpy (ptr, "--");
+ argvec[2] = value_from_longest (builtin_type_int, 0);
+ argvec[3] = 0;
+ nargs ++;
break;
case UNOP_LOGICAL_NOT:
strcpy (ptr, "!");
if (static_memfuncp)
{
argvec[1] = argvec[0];
+ nargs --;
argvec++;
}
if (noside == EVAL_AVOID_SIDE_EFFECTS)
= TYPE_TARGET_TYPE (check_typedef (VALUE_TYPE (argvec[0])));
return value_zero (return_type, VALUE_LVAL (arg1));
}
- return call_function_by_hand (argvec[0], 1 - static_memfuncp, argvec + 1);
+ return call_function_by_hand (argvec[0], nargs, argvec + 1);
}
error ("member function %s not found", tstr);
return 0; /* For lint -- never reached */
string values of length 1.
*/
-value_ptr
-value_concat (arg1, arg2)
- value_ptr arg1, arg2;
+struct value *
+value_concat (struct value *arg1, struct value *arg2)
{
- register value_ptr inval1, inval2, outval;
+ struct value *inval1;
+ struct value *inval2;
+ struct value *outval = NULL;
int inval1len, inval2len;
int count, idx;
char *ptr;
Does not support addition and subtraction on pointers;
use value_add or value_sub if you want to handle those possibilities. */
-value_ptr
-value_binop (arg1, arg2, op)
- value_ptr arg1, arg2;
- enum exp_opcode op;
+struct value *
+value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
{
- register value_ptr val;
+ struct value *val;
struct type *type1, *type2;
COERCE_REF (arg1);
COERCE_REF (arg2);
- COERCE_ENUM (arg1);
- COERCE_ENUM (arg2);
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)
+ if ((TYPE_CODE (type1) != TYPE_CODE_FLT && !is_integral_type (type1))
||
- (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))
+ (TYPE_CODE (type2) != TYPE_CODE_FLT && !is_integral_type (type2)))
error ("Argument to arithmetic operation not a number or boolean.");
if (TYPE_CODE (type1) == 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. */
- DOUBLEST v1, v2, v;
+ DOUBLEST v1, v2, v = 0;
v1 = value_as_double (arg1);
v2 = value_as_double (arg2);
switch (op)
v = v1 / v2;
break;
+ case BINOP_EXP:
+ v = pow (v1, v2);
+ if (errno)
+ error ("Cannot perform exponentiation: %s", safe_strerror (errno));
+ break;
+
default:
error ("Integer-only operation on floating point number.");
}
else
val = allocate_value (builtin_type_double);
- store_floating (VALUE_CONTENTS_RAW (val), TYPE_LENGTH (VALUE_TYPE (val)),
- v);
+ store_typed_floating (VALUE_CONTENTS_RAW (val), VALUE_TYPE (val), v);
}
else if (TYPE_CODE (type1) == TYPE_CODE_BOOL
&&
TYPE_CODE (type2) == TYPE_CODE_BOOL)
{
- LONGEST v1, v2, v;
+ LONGEST v1, v2, v = 0;
v1 = value_as_long (arg1);
v2 = value_as_long (arg2);
case BINOP_BITWISE_XOR:
v = v1 ^ v2;
+ break;
+
+ case BINOP_EQUAL:
+ v = v1 == v2;
+ break;
+
+ case BINOP_NOTEQUAL:
+ v = v1 != v2;
break;
default:
/* Integral operations here. */
/* FIXME: Also mixed integral/booleans, with result an integer. */
/* FIXME: This implements ANSI C rules (also correct for C++).
- What about FORTRAN and chill? */
+ What about FORTRAN and (the deleted) chill ? */
{
unsigned int promoted_len1 = TYPE_LENGTH (type1);
unsigned int promoted_len2 = TYPE_LENGTH (type2);
if (unsigned_operation)
{
- ULONGEST v1, v2, v;
+ ULONGEST v1, v2, v = 0;
v1 = (ULONGEST) value_as_long (arg1);
v2 = (ULONGEST) value_as_long (arg2);
v = v1 / v2;
break;
+ case BINOP_EXP:
+ v = pow (v1, v2);
+ if (errno)
+ error ("Cannot perform exponentiation: %s", safe_strerror (errno));
+ break;
+
case BINOP_REM:
v = v1 % v2;
break;
case BINOP_MOD:
/* Knuth 1.2.4, integer only. Note that unlike the C '%' op,
v1 mod 0 has a defined value, v1. */
- /* Chill specifies that v2 must be > 0, so check for that. */
- if (current_language->la_language == language_chill
- && value_as_long (arg2) <= 0)
- {
- error ("Second operand of MOD must be greater than zero.");
- }
if (v2 == 0)
{
v = v1;
v = v1 == v2;
break;
+ case BINOP_NOTEQUAL:
+ v = v1 != v2;
+ break;
+
case BINOP_LESS:
v = v1 < v2;
break;
}
else
{
- LONGEST v1, v2, v;
+ LONGEST v1, v2, v = 0;
v1 = value_as_long (arg1);
v2 = value_as_long (arg2);
case BINOP_DIV:
v = v1 / v2;
+ break;
+
+ case BINOP_EXP:
+ v = pow (v1, v2);
+ if (errno)
+ error ("Cannot perform exponentiation: %s", safe_strerror (errno));
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. */
- /* Chill specifies that v2 must be > 0, so check for that. */
- if (current_language->la_language == language_chill
- && v2 <= 0)
- {
- error ("Second operand of MOD must be greater than zero.");
- }
if (v2 == 0)
{
v = v1;
/* Simulate the C operator ! -- return 1 if ARG1 contains zero. */
int
-value_logical_not (arg1)
- value_ptr arg1;
+value_logical_not (struct value *arg1)
{
- register int len;
- register char *p;
+ int len;
+ char *p;
struct type *type1;
COERCE_NUMBER (arg1);
return len < 0;
}
+/* Perform a comparison on two string values (whose content are not
+ necessarily null terminated) based on their length */
+
+static int
+value_strcmp (struct value *arg1, struct value *arg2)
+{
+ int len1 = TYPE_LENGTH (VALUE_TYPE (arg1));
+ int len2 = TYPE_LENGTH (VALUE_TYPE (arg2));
+ char *s1 = VALUE_CONTENTS (arg1);
+ char *s2 = VALUE_CONTENTS (arg2);
+ int i, len = len1 < len2 ? len1 : len2;
+
+ for (i = 0; i < len; i++)
+ {
+ if (s1[i] < s2[i])
+ return -1;
+ else if (s1[i] > s2[i])
+ return 1;
+ else
+ continue;
+ }
+
+ if (len1 < len2)
+ return -1;
+ else if (len1 > len2)
+ return 1;
+ else
+ return 0;
+}
+
/* Simulate the C operator == by returning a 1
iff ARG1 and ARG2 have equal contents. */
int
-value_equal (arg1, arg2)
- register value_ptr arg1, arg2;
-
+value_equal (struct value *arg1, struct value *arg2)
{
- register int len;
- register char *p1, *p2;
+ int len;
+ char *p1, *p2;
struct type *type1, *type2;
enum type_code code1;
enum type_code code2;
+ int is_int1, is_int2;
- COERCE_NUMBER (arg1);
- COERCE_NUMBER (arg2);
+ COERCE_ARRAY (arg1);
+ COERCE_ARRAY (arg2);
type1 = check_typedef (VALUE_TYPE (arg1));
type2 = check_typedef (VALUE_TYPE (arg2));
code1 = TYPE_CODE (type1);
code2 = TYPE_CODE (type2);
+ is_int1 = is_integral_type (type1);
+ is_int2 = is_integral_type (type2);
- if ((code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL) &&
- (code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
+ if (is_int1 && is_int2)
return longest_to_int (value_as_long (value_binop (arg1, arg2,
BINOP_EQUAL)));
- else if ((code1 == TYPE_CODE_FLT || code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL)
- && (code2 == TYPE_CODE_FLT || code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
+ else if ((code1 == TYPE_CODE_FLT || is_int1)
+ && (code2 == TYPE_CODE_FLT || is_int2))
return value_as_double (arg1) == value_as_double (arg2);
/* FIXME: Need to promote to either CORE_ADDR or LONGEST, whichever
is bigger. */
- else if (code1 == TYPE_CODE_PTR && (code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
- return value_as_pointer (arg1) == (CORE_ADDR) value_as_long (arg2);
- else if (code2 == TYPE_CODE_PTR && (code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL))
- return (CORE_ADDR) value_as_long (arg1) == value_as_pointer (arg2);
+ else if (code1 == TYPE_CODE_PTR && is_int2)
+ return value_as_address (arg1) == (CORE_ADDR) value_as_long (arg2);
+ else if (code2 == TYPE_CODE_PTR && is_int1)
+ return (CORE_ADDR) value_as_long (arg1) == value_as_address (arg2);
else if (code1 == code2
&& ((len = (int) TYPE_LENGTH (type1))
}
return len < 0;
}
+ else if (code1 == TYPE_CODE_STRING && code2 == TYPE_CODE_STRING)
+ {
+ return value_strcmp (arg1, arg2) == 0;
+ }
else
{
error ("Invalid type combination in equality test.");
iff ARG1's contents are less than ARG2's. */
int
-value_less (arg1, arg2)
- register value_ptr arg1, arg2;
+value_less (struct value *arg1, struct value *arg2)
{
- register enum type_code code1;
- register enum type_code code2;
+ enum type_code code1;
+ enum type_code code2;
struct type *type1, *type2;
+ int is_int1, is_int2;
- COERCE_NUMBER (arg1);
- COERCE_NUMBER (arg2);
+ COERCE_ARRAY (arg1);
+ COERCE_ARRAY (arg2);
type1 = check_typedef (VALUE_TYPE (arg1));
type2 = check_typedef (VALUE_TYPE (arg2));
code1 = TYPE_CODE (type1);
code2 = TYPE_CODE (type2);
+ is_int1 = is_integral_type (type1);
+ is_int2 = is_integral_type (type2);
- if ((code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL) &&
- (code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
+ if (is_int1 && is_int2)
return longest_to_int (value_as_long (value_binop (arg1, arg2,
BINOP_LESS)));
- else if ((code1 == TYPE_CODE_FLT || code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL)
- && (code2 == TYPE_CODE_FLT || code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
+ else if ((code1 == TYPE_CODE_FLT || is_int1)
+ && (code2 == TYPE_CODE_FLT || is_int2))
return value_as_double (arg1) < value_as_double (arg2);
else if (code1 == TYPE_CODE_PTR && code2 == TYPE_CODE_PTR)
- return value_as_pointer (arg1) < value_as_pointer (arg2);
+ return value_as_address (arg1) < value_as_address (arg2);
/* FIXME: Need to promote to either CORE_ADDR or LONGEST, whichever
is bigger. */
- else if (code1 == TYPE_CODE_PTR && (code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL))
- return value_as_pointer (arg1) < (CORE_ADDR) value_as_long (arg2);
- else if (code2 == TYPE_CODE_PTR && (code1 == TYPE_CODE_INT || code1 == TYPE_CODE_BOOL))
- return (CORE_ADDR) value_as_long (arg1) < value_as_pointer (arg2);
-
+ else if (code1 == TYPE_CODE_PTR && is_int2)
+ return value_as_address (arg1) < (CORE_ADDR) value_as_long (arg2);
+ else if (code2 == TYPE_CODE_PTR && is_int1)
+ return (CORE_ADDR) value_as_long (arg1) < value_as_address (arg2);
+ else if (code1 == TYPE_CODE_STRING && code2 == TYPE_CODE_STRING)
+ return value_strcmp (arg1, arg2) < 0;
else
{
error ("Invalid type combination in ordering comparison.");
\f
/* The unary operators - and ~. Both free the argument ARG1. */
-value_ptr
-value_neg (arg1)
- register value_ptr arg1;
+struct value *
+value_neg (struct value *arg1)
{
- register struct type *type;
- register struct type *result_type = VALUE_TYPE (arg1);
+ struct type *type;
+ struct type *result_type = VALUE_TYPE (arg1);
COERCE_REF (arg1);
- COERCE_ENUM (arg1);
type = check_typedef (VALUE_TYPE (arg1));
if (TYPE_CODE (type) == TYPE_CODE_FLT)
return value_from_double (result_type, -value_as_double (arg1));
- else if (TYPE_CODE (type) == TYPE_CODE_INT || TYPE_CODE (type) == TYPE_CODE_BOOL)
+ else if (is_integral_type (type))
{
- /* Perform integral promotion for ANSI C/C++.
- FIXME: What about FORTRAN and chill ? */
+ /* Perform integral promotion for ANSI C/C++. FIXME: What about
+ FORTRAN and (the deleted) chill ? */
if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin_type_int))
result_type = builtin_type_int;
}
}
-value_ptr
-value_complement (arg1)
- register value_ptr arg1;
+struct value *
+value_complement (struct value *arg1)
{
- register struct type *type;
- register struct type *result_type = VALUE_TYPE (arg1);
- int typecode;
+ struct type *type;
+ struct type *result_type = VALUE_TYPE (arg1);
COERCE_REF (arg1);
- COERCE_ENUM (arg1);
type = check_typedef (VALUE_TYPE (arg1));
- typecode = TYPE_CODE (type);
- if ((typecode != TYPE_CODE_INT) && (typecode != TYPE_CODE_BOOL))
+ if (!is_integral_type (type))
error ("Argument to complement operation not an integer or boolean.");
/* Perform integral promotion for ANSI C/C++.
Return -1 if out of range, -2 other error. */
int
-value_bit_index (type, valaddr, index)
- struct type *type;
- char *valaddr;
- int index;
+value_bit_index (struct type *type, char *valaddr, int index)
{
LONGEST low_bound, high_bound;
LONGEST word;
return (word >> rel_index) & 1;
}
-value_ptr
-value_in (element, set)
- value_ptr element, set;
+struct value *
+value_in (struct value *element, struct value *set)
{
int member;
struct type *settype = check_typedef (VALUE_TYPE (set));
}
void
-_initialize_valarith ()
+_initialize_valarith (void)
{
}
projects / deliverable / binutils-gdb.git / blobdiff