X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fvalarith.c;h=854a1517ae603c87555e7fc253c28bafe2b636f2;hb=e4f79046293deef6d3ce06dde44c488309efab4a;hp=a9ba5c76e02e5371e7f3a85acf12ff3481bc608f;hpb=dbbd9c57ff004955375f214b66a29cd0abf101fd;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/valarith.c b/gdb/valarith.c index a9ba5c76e0..854a1517ae 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -1,7 +1,8 @@ /* Perform arithmetic and other operations on values, for GDB. - Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000 - Free Software Foundation, Inc. + + Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software + Foundation, Inc. This file is part of GDB. @@ -30,6 +31,7 @@ #include "gdb_string.h" #include "doublest.h" #include +#include "infcall.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). */ @@ -38,16 +40,55 @@ #define TRUNCATION_TOWARDS_ZERO ((-5 / 2) == -2) #endif -static value_ptr value_subscripted_rvalue (value_ptr, value_ptr, int); +static struct value *value_subscripted_rvalue (struct value *, struct value *, int); void _initialize_valarith (void); -value_ptr -value_add (value_ptr arg1, value_ptr 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) { - register value_ptr valint, valptr; - register int len; + 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) +{ + struct value *valint; + struct value *valptr; + LONGEST sz; struct type *type1, *type2, *valptrtype; COERCE_NUMBER (arg1); @@ -62,7 +103,7 @@ value_add (value_ptr arg1, value_ptr arg2) || TYPE_CODE (type2) == TYPE_CODE_INT)) /* Exactly one argument is a pointer, and one is an integer. */ { - value_ptr retval; + struct value *retval; if (TYPE_CODE (type1) == TYPE_CODE_PTR) { @@ -76,12 +117,12 @@ value_add (value_ptr arg1, value_ptr arg2) valint = arg1; valptrtype = type2; } - len = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (valptrtype))); - if (len == 0) - len = 1; /* For (void *) */ + + sz = find_size_for_pointer_math (valptrtype); + retval = value_from_pointer (valptrtype, - value_as_pointer (valptr) - + (len * value_as_long (valint))); + value_as_address (valptr) + + (sz * value_as_long (valint))); VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (valptr); return retval; } @@ -89,8 +130,8 @@ value_add (value_ptr arg1, value_ptr arg2) return value_binop (arg1, arg2, BINOP_ADD); } -value_ptr -value_sub (value_ptr arg1, value_ptr arg2) +struct value * +value_sub (struct value *arg1, struct value *arg2) { struct type *type1, *type2; COERCE_NUMBER (arg1); @@ -103,9 +144,10 @@ value_sub (value_ptr arg1, value_ptr arg2) if (TYPE_CODE (type2) == TYPE_CODE_INT) { /* pointer - integer. */ - LONGEST sz = TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type1))); + LONGEST sz = find_size_for_pointer_math (type1); + return value_from_pointer (type1, - (value_as_pointer (arg1) + (value_as_address (arg1) - (sz * value_as_long (arg2)))); } else if (TYPE_CODE (type2) == TYPE_CODE_PTR @@ -135,10 +177,10 @@ an integer nor a pointer of the same type."); 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 (value_ptr array, value_ptr 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; @@ -179,7 +221,7 @@ value_subscript (value_ptr array, value_ptr idx) { 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); @@ -211,15 +253,15 @@ value_subscript (value_ptr array, value_ptr idx) (eg, a vector register). This routine used to promote floats to doubles, but no longer does. */ -static value_ptr -value_subscripted_rvalue (value_ptr array, value_ptr 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"); @@ -235,6 +277,7 @@ value_subscripted_rvalue (value_ptr array, value_ptr idx, int lowerbound) 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; } @@ -246,7 +289,7 @@ value_subscripted_rvalue (value_ptr array, value_ptr idx, int lowerbound) For now, we do not overload the `=' operator. */ int -binop_user_defined_p (enum exp_opcode op, value_ptr arg1, value_ptr 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) @@ -268,7 +311,7 @@ binop_user_defined_p (enum exp_opcode op, value_ptr arg1, value_ptr arg2) For now, we do not overload the `&' operator. */ int -unop_user_defined_p (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) @@ -294,11 +337,11 @@ unop_user_defined_p (enum exp_opcode op, value_ptr arg1) is the opcode saying how to modify it. Otherwise, OTHEROP is unused. */ -value_ptr -value_x_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op, +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; @@ -314,7 +357,7 @@ value_x_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op, 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; @@ -457,13 +500,13 @@ value_x_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op, and return that value (where '@' is (almost) any unary operator which is legal for GNU C++). */ -value_ptr -value_x_unop (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); @@ -474,10 +517,12 @@ value_x_unop (value_ptr arg1, enum exp_opcode op, enum noside noside) 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; @@ -489,13 +534,19 @@ value_x_unop (value_ptr arg1, enum exp_opcode op, enum noside noside) 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, "!"); @@ -520,6 +571,7 @@ value_x_unop (value_ptr arg1, enum exp_opcode op, enum noside noside) if (static_memfuncp) { argvec[1] = argvec[0]; + nargs --; argvec++; } if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -529,7 +581,7 @@ value_x_unop (value_ptr arg1, enum exp_opcode op, enum noside noside) = 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 */ @@ -557,10 +609,12 @@ value_x_unop (value_ptr arg1, enum exp_opcode op, enum noside noside) string values of length 1. */ -value_ptr -value_concat (value_ptr arg1, value_ptr arg2) +struct value * +value_concat (struct value *arg1, struct value *arg2) { - register value_ptr inval1, inval2, outval = NULL; + struct value *inval1; + struct value *inval2; + struct value *outval = NULL; int inval1len, inval2len; int count, idx; char *ptr; @@ -690,10 +744,10 @@ value_concat (value_ptr arg1, value_ptr arg2) 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 (value_ptr arg1, value_ptr 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); @@ -747,7 +801,7 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) case BINOP_EXP: v = pow (v1, v2); if (errno) - error ("Cannot perform exponentiation: %s", strerror (errno)); + error ("Cannot perform exponentiation: %s", safe_strerror (errno)); break; default: @@ -808,7 +862,7 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) /* 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); @@ -885,7 +939,7 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) case BINOP_EXP: v = pow (v1, v2); if (errno) - error ("Cannot perform exponentiation: %s", strerror (errno)); + error ("Cannot perform exponentiation: %s", safe_strerror (errno)); break; case BINOP_REM: @@ -895,12 +949,6 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) 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; @@ -1009,7 +1057,7 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) case BINOP_EXP: v = pow (v1, v2); if (errno) - error ("Cannot perform exponentiation: %s", strerror (errno)); + error ("Cannot perform exponentiation: %s", safe_strerror (errno)); break; case BINOP_REM: @@ -1019,12 +1067,6 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) 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; @@ -1114,7 +1156,7 @@ value_binop (value_ptr arg1, value_ptr arg2, enum exp_opcode op) /* Simulate the C operator ! -- return 1 if ARG1 contains zero. */ int -value_logical_not (value_ptr arg1) +value_logical_not (struct value *arg1) { register int len; register char *p; @@ -1142,7 +1184,7 @@ value_logical_not (value_ptr arg1) necessarily null terminated) based on their length */ static int -value_strcmp (register value_ptr arg1, register value_ptr arg2) +value_strcmp (struct value *arg1, struct value *arg2) { int len1 = TYPE_LENGTH (VALUE_TYPE (arg1)); int len2 = TYPE_LENGTH (VALUE_TYPE (arg2)); @@ -1172,7 +1214,7 @@ value_strcmp (register value_ptr arg1, register value_ptr arg2) iff ARG1 and ARG2 have equal contents. */ int -value_equal (register value_ptr arg1, register value_ptr arg2) +value_equal (struct value *arg1, struct value *arg2) { register int len; register char *p1, *p2; @@ -1199,9 +1241,9 @@ value_equal (register value_ptr arg1, register value_ptr 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); + return value_as_address (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); + return (CORE_ADDR) value_as_long (arg1) == value_as_address (arg2); else if (code1 == code2 && ((len = (int) TYPE_LENGTH (type1)) @@ -1231,7 +1273,7 @@ value_equal (register value_ptr arg1, register value_ptr arg2) iff ARG1's contents are less than ARG2's. */ int -value_less (register value_ptr arg1, register value_ptr arg2) +value_less (struct value *arg1, struct value *arg2) { register enum type_code code1; register enum type_code code2; @@ -1253,14 +1295,14 @@ value_less (register value_ptr arg1, register value_ptr arg2) && (code2 == TYPE_CODE_FLT || code2 == TYPE_CODE_INT || code2 == TYPE_CODE_BOOL)) 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); + return value_as_address (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); + 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 @@ -1272,8 +1314,8 @@ value_less (register value_ptr arg1, register value_ptr arg2) /* The unary operators - and ~. Both free the argument ARG1. */ -value_ptr -value_neg (register value_ptr arg1) +struct value * +value_neg (struct value *arg1) { register struct type *type; register struct type *result_type = VALUE_TYPE (arg1); @@ -1287,8 +1329,8 @@ value_neg (register value_ptr arg1) return value_from_double (result_type, -value_as_double (arg1)); else if (TYPE_CODE (type) == TYPE_CODE_INT || TYPE_CODE (type) == TYPE_CODE_BOOL) { - /* 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; @@ -1301,8 +1343,8 @@ value_neg (register value_ptr arg1) } } -value_ptr -value_complement (register value_ptr arg1) +struct value * +value_complement (struct value *arg1) { register struct type *type; register struct type *result_type = VALUE_TYPE (arg1); @@ -1349,8 +1391,8 @@ value_bit_index (struct type *type, char *valaddr, int index) return (word >> rel_index) & 1; } -value_ptr -value_in (value_ptr element, value_ptr set) +struct value * +value_in (struct value *element, struct value *set) { int member; struct type *settype = check_typedef (VALUE_TYPE (set));