diff options
Diffstat (limited to 'contrib/gdb/gdb/valarith.c')
-rw-r--r-- | contrib/gdb/gdb/valarith.c | 660 |
1 files changed, 395 insertions, 265 deletions
diff --git a/contrib/gdb/gdb/valarith.c b/contrib/gdb/gdb/valarith.c index 0a3aa4d..5852ac6 100644 --- a/contrib/gdb/gdb/valarith.c +++ b/contrib/gdb/gdb/valarith.c @@ -1,22 +1,24 @@ /* Perform arithmetic and other operations on values, for GDB. - Copyright 1986, 89, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "value.h" @@ -25,8 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "expression.h" #include "target.h" #include "language.h" -#include "demangle.h" #include "gdb_string.h" +#include "doublest.h" +#include <math.h> /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). */ @@ -35,16 +38,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define TRUNCATION_TOWARDS_ZERO ((-5 / 2) == -2) #endif -static value_ptr value_subscripted_rvalue PARAMS ((value_ptr, value_ptr, int)); - -void _initialize_valarith PARAMS ((void)); +static struct value *value_subscripted_rvalue (struct value *, struct value *, int); +void _initialize_valarith (void); -value_ptr -value_add (arg1, arg2) - value_ptr arg1, arg2; + +struct value * +value_add (struct value *arg1, struct value *arg2) { - register value_ptr valint, valptr; + struct value *valint; + struct value *valptr; register int len; struct type *type1, *type2, *valptrtype; @@ -60,7 +63,7 @@ value_add (arg1, 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) { @@ -77,8 +80,8 @@ value_add (arg1, arg2) 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) + retval = value_from_pointer (valptrtype, + value_as_address (valptr) + (len * value_as_long (valint))); VALUE_BFD_SECTION (retval) = VALUE_BFD_SECTION (valptr); return retval; @@ -87,9 +90,8 @@ value_add (arg1, arg2) 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); @@ -103,18 +105,18 @@ value_sub (arg1, arg2) { /* 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))); + 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))); return value_from_longest - (builtin_type_long, /* FIXME -- should be ptrdiff_t */ + (builtin_type_long, /* FIXME -- should be ptrdiff_t */ (value_as_long (arg1) - value_as_long (arg2)) / sz); } else @@ -134,11 +136,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 (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; @@ -179,7 +180,7 @@ value_subscript (array, 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); @@ -187,7 +188,7 @@ value_subscript (array, idx) error ("bitstring index out of range"); index -= lowerbound; offset = index / TARGET_CHAR_BIT; - byte = *((char*)VALUE_CONTENTS (array) + offset); + 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); @@ -211,17 +212,15 @@ value_subscript (array, idx) (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"); @@ -248,9 +247,7 @@ value_subscripted_rvalue (array, idx, lowerbound) 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) @@ -271,9 +268,8 @@ binop_user_defined_p (op, arg1, arg2) For now, we do not overload the `&' operator. */ -int unop_user_defined_p (op, arg1) - enum exp_opcode op; - value_ptr arg1; +int +unop_user_defined_p (enum exp_opcode op, struct value *arg1) { struct type *type1; if (op == UNOP_ADDR) @@ -299,13 +295,11 @@ int unop_user_defined_p (op, arg1) 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; @@ -319,63 +313,123 @@ value_x_binop (arg1, arg2, op, otherop, noside) arg vector and find the right function to call it with. */ if (TYPE_CODE (check_typedef (VALUE_TYPE (arg1))) != TYPE_CODE_STRUCT) - error ("Can't do that binary op on that type"); /* FIXME be explicit */ + 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; - /* make the right function name up */ - strcpy(tstr, "operator__"); - ptr = tstr+8; + /* make the right function name up */ + strcpy (tstr, "operator__"); + ptr = tstr + 8; switch (op) { - case BINOP_ADD: strcpy(ptr,"+"); break; - case BINOP_SUB: strcpy(ptr,"-"); break; - case BINOP_MUL: strcpy(ptr,"*"); break; - case BINOP_DIV: strcpy(ptr,"/"); break; - case BINOP_REM: strcpy(ptr,"%"); break; - case BINOP_LSH: strcpy(ptr,"<<"); break; - case BINOP_RSH: strcpy(ptr,">>"); break; - case BINOP_BITWISE_AND: strcpy(ptr,"&"); break; - case BINOP_BITWISE_IOR: strcpy(ptr,"|"); break; - case BINOP_BITWISE_XOR: strcpy(ptr,"^"); break; - case BINOP_LOGICAL_AND: strcpy(ptr,"&&"); break; - case BINOP_LOGICAL_OR: strcpy(ptr,"||"); break; - case BINOP_MIN: strcpy(ptr,"<?"); break; - case BINOP_MAX: strcpy(ptr,">?"); break; - case BINOP_ASSIGN: strcpy(ptr,"="); break; - case BINOP_ASSIGN_MODIFY: + case BINOP_ADD: + strcpy (ptr, "+"); + break; + case BINOP_SUB: + strcpy (ptr, "-"); + break; + case BINOP_MUL: + strcpy (ptr, "*"); + break; + case BINOP_DIV: + strcpy (ptr, "/"); + break; + case BINOP_REM: + strcpy (ptr, "%"); + break; + case BINOP_LSH: + strcpy (ptr, "<<"); + break; + case BINOP_RSH: + strcpy (ptr, ">>"); + break; + case BINOP_BITWISE_AND: + strcpy (ptr, "&"); + break; + case BINOP_BITWISE_IOR: + strcpy (ptr, "|"); + break; + case BINOP_BITWISE_XOR: + strcpy (ptr, "^"); + break; + case BINOP_LOGICAL_AND: + strcpy (ptr, "&&"); + break; + case BINOP_LOGICAL_OR: + strcpy (ptr, "||"); + break; + case BINOP_MIN: + strcpy (ptr, "<?"); + break; + case BINOP_MAX: + strcpy (ptr, ">?"); + break; + case BINOP_ASSIGN: + strcpy (ptr, "="); + break; + case BINOP_ASSIGN_MODIFY: switch (otherop) { - case BINOP_ADD: strcpy(ptr,"+="); break; - case BINOP_SUB: strcpy(ptr,"-="); break; - case BINOP_MUL: strcpy(ptr,"*="); break; - case BINOP_DIV: strcpy(ptr,"/="); break; - case BINOP_REM: strcpy(ptr,"%="); break; - case BINOP_BITWISE_AND: strcpy(ptr,"&="); break; - case BINOP_BITWISE_IOR: strcpy(ptr,"|="); break; - case BINOP_BITWISE_XOR: strcpy(ptr,"^="); break; - case BINOP_MOD: /* invalid */ + case BINOP_ADD: + strcpy (ptr, "+="); + break; + case BINOP_SUB: + strcpy (ptr, "-="); + break; + case BINOP_MUL: + strcpy (ptr, "*="); + break; + case BINOP_DIV: + strcpy (ptr, "/="); + break; + case BINOP_REM: + strcpy (ptr, "%="); + break; + case BINOP_BITWISE_AND: + strcpy (ptr, "&="); + break; + case BINOP_BITWISE_IOR: + strcpy (ptr, "|="); + break; + case BINOP_BITWISE_XOR: + strcpy (ptr, "^="); + break; + case BINOP_MOD: /* invalid */ default: error ("Invalid binary operation specified."); } break; - case BINOP_SUBSCRIPT: strcpy(ptr,"[]"); break; - case BINOP_EQUAL: strcpy(ptr,"=="); break; - case BINOP_NOTEQUAL: strcpy(ptr,"!="); break; - case BINOP_LESS: strcpy(ptr,"<"); break; - case BINOP_GTR: strcpy(ptr,">"); break; - case BINOP_GEQ: strcpy(ptr,">="); break; - case BINOP_LEQ: strcpy(ptr,"<="); break; - case BINOP_MOD: /* invalid */ + case BINOP_SUBSCRIPT: + strcpy (ptr, "[]"); + break; + case BINOP_EQUAL: + strcpy (ptr, "=="); + break; + case BINOP_NOTEQUAL: + strcpy (ptr, "!="); + break; + case BINOP_LESS: + strcpy (ptr, "<"); + break; + case BINOP_GTR: + strcpy (ptr, ">"); + break; + case BINOP_GEQ: + strcpy (ptr, ">="); + break; + case BINOP_LEQ: + strcpy (ptr, "<="); + break; + case BINOP_MOD: /* invalid */ default: error ("Invalid binary operation specified."); } - argvec[0] = value_struct_elt (&arg1, argvec+1, tstr, &static_memfuncp, "structure"); - + argvec[0] = value_struct_elt (&arg1, argvec + 1, tstr, &static_memfuncp, "structure"); + if (argvec[0]) { if (static_memfuncp) @@ -404,16 +458,13 @@ value_x_binop (arg1, arg2, op, otherop, noside) 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); @@ -422,38 +473,63 @@ value_x_unop (arg1, op, noside) arg vector and find the right function to call it with. */ if (TYPE_CODE (check_typedef (VALUE_TYPE (arg1))) != TYPE_CODE_STRUCT) - error ("Can't do that unary op on that type"); /* FIXME be explicit */ + 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; - /* make the right function name up */ - strcpy(tstr,"operator__"); - ptr = tstr+8; - strcpy(mangle_tstr, "__"); - mangle_ptr = mangle_tstr+2; + nargs = 1; + + /* make the right function name up */ + strcpy (tstr, "operator__"); + ptr = tstr + 8; + strcpy (mangle_tstr, "__"); + mangle_ptr = mangle_tstr + 2; switch (op) { - case UNOP_PREINCREMENT: strcpy(ptr,"++"); break; - case UNOP_PREDECREMENT: strcpy(ptr,"++"); break; - case UNOP_POSTINCREMENT: strcpy(ptr,"++"); break; - case UNOP_POSTDECREMENT: strcpy(ptr,"++"); break; - case UNOP_LOGICAL_NOT: strcpy(ptr,"!"); break; - case UNOP_COMPLEMENT: strcpy(ptr,"~"); break; - case UNOP_NEG: strcpy(ptr,"-"); break; - case UNOP_IND: strcpy(ptr,"*"); break; + case UNOP_PREINCREMENT: + strcpy (ptr, "++"); + break; + case UNOP_PREDECREMENT: + 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, "--"); + argvec[2] = value_from_longest (builtin_type_int, 0); + argvec[3] = 0; + nargs ++; + break; + case UNOP_LOGICAL_NOT: + strcpy (ptr, "!"); + break; + case UNOP_COMPLEMENT: + strcpy (ptr, "~"); + break; + case UNOP_NEG: + strcpy (ptr, "-"); + break; + case UNOP_IND: + strcpy (ptr, "*"); + break; default: error ("Invalid unary operation specified."); } - argvec[0] = value_struct_elt (&arg1, argvec+1, tstr, &static_memfuncp, "structure"); + argvec[0] = value_struct_elt (&arg1, argvec + 1, tstr, &static_memfuncp, "structure"); if (argvec[0]) { if (static_memfuncp) { argvec[1] = argvec[0]; + nargs --; argvec++; } if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -463,39 +539,40 @@ value_x_unop (arg1, op, 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 */ + return 0; /* For lint -- never reached */ } - + /* Concatenate two values with the following conditions: - (1) Both values must be either bitstring values or character string - values and the resulting value consists of the concatenation of - ARG1 followed by ARG2. + (1) Both values must be either bitstring values or character string + values and the resulting value consists of the concatenation of + ARG1 followed by ARG2. - or + or - One value must be an integer value and the other value must be - either a bitstring value or character string value, which is - to be repeated by the number of times specified by the integer - value. + One value must be an integer value and the other value must be + either a bitstring value or character string value, which is + to be repeated by the number of times specified by the integer + value. - (2) Boolean values are also allowed and are treated as bit string - values of length 1. + (2) Boolean values are also allowed and are treated as bit string + values of length 1. - (3) Character values are also allowed and are treated as character - string values of length 1. -*/ + (3) Character values are also allowed and are treated as character + 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; @@ -531,7 +608,7 @@ value_concat (arg1, arg2) 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. */ + construct a value repeated that many times. */ if (TYPE_CODE (type2) == TYPE_CODE_STRING || TYPE_CODE (type2) == TYPE_CODE_CHAR) { @@ -568,7 +645,7 @@ value_concat (arg1, arg2) } } else if (TYPE_CODE (type1) == TYPE_CODE_STRING - || TYPE_CODE (type1) == TYPE_CODE_CHAR) + || TYPE_CODE (type1) == TYPE_CODE_CHAR) { /* We have two character strings to concatenate. */ if (TYPE_CODE (type2) != TYPE_CODE_STRING @@ -589,7 +666,7 @@ value_concat (arg1, arg2) } if (TYPE_CODE (type2) == TYPE_CODE_CHAR) { - *(ptr + inval1len) = + *(ptr + inval1len) = (char) unpack_long (type2, VALUE_CONTENTS (inval2)); } else @@ -608,7 +685,7 @@ value_concat (arg1, arg2) error ("Bitstrings or booleans can only be concatenated with other bitstrings or booleans."); } error ("unimplemented support for bitstring/boolean concatenation."); - } + } else { /* We don't know how to concatenate these operands. */ @@ -616,21 +693,19 @@ value_concat (arg1, arg2) } return (outval); } - + /* Perform a binary operation on two operands which have reasonable representations as integers or floats. This includes booleans, characters, integers, or floats. 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); @@ -658,9 +733,9 @@ value_binop (arg1, arg2, op) 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. */ - DOUBLEST v1, v2, v; + in target format. real.c in GCC probably has the necessary + code. */ + DOUBLEST v1, v2, v = 0; v1 = value_as_double (arg1); v2 = value_as_double (arg2); switch (op) @@ -681,53 +756,66 @@ value_binop (arg1, arg2, op) v = v1 / v2; break; + case BINOP_EXP: + v = pow (v1, v2); + if (errno) + error ("Cannot perform exponentiation: %s", strerror (errno)); + break; + default: error ("Integer-only operation on floating point number."); } /* If either arg was long double, make sure that value is also long - double. */ + double. */ - if (TYPE_LENGTH(type1) * 8 > TARGET_DOUBLE_BIT - || TYPE_LENGTH(type2) * 8 > TARGET_DOUBLE_BIT) + 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); + 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; - v1 = value_as_long (arg1); - v2 = value_as_long (arg2); - - switch (op) - { - case BINOP_BITWISE_AND: - v = v1 & v2; - break; - - case BINOP_BITWISE_IOR: - v = v1 | v2; - break; - - case BINOP_BITWISE_XOR: - v = v1 ^ v2; - break; - - default: - error ("Invalid operation on booleans."); - } - - val = allocate_value (type1); - store_signed_integer (VALUE_CONTENTS_RAW (val), - TYPE_LENGTH (type1), - v); - } + { + LONGEST v1, v2, v = 0; + v1 = value_as_long (arg1); + v2 = value_as_long (arg2); + + switch (op) + { + case BINOP_BITWISE_AND: + v = v1 & v2; + break; + + case BINOP_BITWISE_IOR: + v = v1 | v2; + break; + + case BINOP_BITWISE_XOR: + v = v1 ^ v2; + break; + + case BINOP_EQUAL: + v = v1 == v2; + break; + + case BINOP_NOTEQUAL: + v = v1 != v2; + break; + + default: + error ("Invalid operation on booleans."); + } + + val = allocate_value (type1); + store_signed_integer (VALUE_CONTENTS_RAW (val), + TYPE_LENGTH (type1), + v); + } else /* Integral operations here. */ /* FIXME: Also mixed integral/booleans, with result an integer. */ @@ -742,7 +830,7 @@ value_binop (arg1, arg2, op) int unsigned_operation; /* Determine type length and signedness after promotion for - both operands. */ + both operands. */ if (promoted_len1 < TYPE_LENGTH (builtin_type_int)) { is_unsigned1 = 0; @@ -755,10 +843,10 @@ value_binop (arg1, arg2, op) } /* Determine type length of the result, and if the operation should - be done unsigned. - Use the signedness of the operand with the greater length. - If both operands are of equal length, use unsigned operation - if one of the operands is unsigned. */ + be done unsigned. + Use the signedness of the operand with the greater length. + If both operands are of equal length, use unsigned operation + if one of the operands is unsigned. */ if (promoted_len1 > promoted_len2) { unsigned_operation = is_unsigned1; @@ -777,7 +865,7 @@ value_binop (arg1, arg2, op) if (unsigned_operation) { - ULONGEST v1, v2, v; + ULONGEST v1, v2, v = 0; v1 = (ULONGEST) value_as_long (arg1); v2 = (ULONGEST) value_as_long (arg2); @@ -787,34 +875,40 @@ value_binop (arg1, arg2, op) v1 &= ((LONGEST) 1 << HOST_CHAR_BIT * result_len) - 1; v2 &= ((LONGEST) 1 << HOST_CHAR_BIT * result_len) - 1; } - + switch (op) { case BINOP_ADD: v = v1 + v2; break; - + case BINOP_SUB: v = v1 - v2; break; - + case BINOP_MUL: v = v1 * v2; break; - + case BINOP_DIV: v = v1 / v2; break; - + + case BINOP_EXP: + v = pow (v1, v2); + if (errno) + error ("Cannot perform exponentiation: %s", 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 + if (current_language->la_language == language_chill && value_as_long (arg2) <= 0) { error ("Second operand of MOD must be greater than zero."); @@ -825,44 +919,44 @@ value_binop (arg1, arg2, op) } else { - v = v1/v2; + v = v1 / v2; /* Note floor(v1/v2) == v1/v2 for unsigned. */ v = v1 - (v2 * v); } break; - + case BINOP_LSH: v = v1 << v2; break; - + case BINOP_RSH: v = v1 >> v2; break; - + case BINOP_BITWISE_AND: v = v1 & v2; break; - + case BINOP_BITWISE_IOR: v = v1 | v2; break; - + case BINOP_BITWISE_XOR: v = v1 ^ v2; break; - + case BINOP_LOGICAL_AND: v = v1 && v2; break; - + case BINOP_LOGICAL_OR: v = v1 || v2; break; - + case BINOP_MIN: v = v1 < v2 ? v1 : v2; break; - + case BINOP_MAX: v = v1 > v2 ? v1 : v2; break; @@ -871,10 +965,14 @@ value_binop (arg1, arg2, op) v = v1 == v2; break; + case BINOP_NOTEQUAL: + v = v1 != v2; + break; + case BINOP_LESS: v = v1 < v2; break; - + default: error ("Invalid binary operation on numbers."); } @@ -898,37 +996,43 @@ value_binop (arg1, arg2, op) } else { - LONGEST v1, v2, v; + LONGEST v1, v2, v = 0; v1 = value_as_long (arg1); v2 = value_as_long (arg2); - + switch (op) { case BINOP_ADD: v = v1 + v2; break; - + case BINOP_SUB: v = v1 - v2; break; - + case BINOP_MUL: v = v1 * v2; break; - + case BINOP_DIV: v = v1 / v2; + break; + + case BINOP_EXP: + v = pow (v1, v2); + if (errno) + error ("Cannot perform exponentiation: %s", 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, 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 + if (current_language->la_language == language_chill && v2 <= 0) { error ("Second operand of MOD must be greater than zero."); @@ -939,7 +1043,7 @@ value_binop (arg1, arg2, op) } else { - v = v1/v2; + v = v1 / v2; /* Compute floor. */ if (TRUNCATION_TOWARDS_ZERO && (v < 0) && ((v1 % v2) != 0)) { @@ -948,39 +1052,39 @@ value_binop (arg1, arg2, op) v = v1 - (v2 * v); } break; - + case BINOP_LSH: v = v1 << v2; break; - + case BINOP_RSH: v = v1 >> v2; break; - + case BINOP_BITWISE_AND: v = v1 & v2; break; - + case BINOP_BITWISE_IOR: v = v1 | v2; break; - + case BINOP_BITWISE_XOR: v = v1 ^ v2; break; - + case BINOP_LOGICAL_AND: v = v1 && v2; break; - + case BINOP_LOGICAL_OR: v = v1 || v2; break; - + case BINOP_MIN: v = v1 < v2 ? v1 : v2; break; - + case BINOP_MAX: v = v1 > v2 ? v1 : v2; break; @@ -992,7 +1096,7 @@ value_binop (arg1, arg2, op) case BINOP_LESS: v = v1 < v2; break; - + default: error ("Invalid binary operation on numbers."); } @@ -1022,8 +1126,7 @@ value_binop (arg1, arg2, op) /* 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; @@ -1047,13 +1150,41 @@ value_logical_not (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; @@ -1080,9 +1211,9 @@ value_equal (arg1, 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)) @@ -1097,10 +1228,14 @@ value_equal (arg1, arg2) } 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."); - return 0; /* For lint -- never reached */ + return 0; /* For lint -- never reached */ } } @@ -1108,8 +1243,7 @@ value_equal (arg1, arg2) 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; @@ -1131,15 +1265,16 @@ value_less (arg1, 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 { error ("Invalid type combination in ordering comparison."); @@ -1149,9 +1284,8 @@ value_less (arg1, arg2) /* 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); @@ -1162,29 +1296,29 @@ value_neg (arg1) type = check_typedef (VALUE_TYPE (arg1)); if (TYPE_CODE (type) == TYPE_CODE_FLT) - return value_from_double (result_type, - value_as_double (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 ? */ + FIXME: What about FORTRAN and chill ? */ if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin_type_int)) result_type = builtin_type_int; - return value_from_longest (result_type, - value_as_long (arg1)); + return value_from_longest (result_type, -value_as_long (arg1)); + } + else + { + error ("Argument to negate operation not a number."); + return 0; /* For lint -- never reached */ } - else { - error ("Argument to negate operation not a number."); - return 0; /* For lint -- never reached */ - } } -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; + int typecode; COERCE_REF (arg1); COERCE_ENUM (arg1); @@ -1200,7 +1334,7 @@ value_complement (arg1) if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin_type_int)) result_type = builtin_type_int; - return value_from_longest (result_type, ~ value_as_long (arg1)); + return value_from_longest (result_type, ~value_as_long (arg1)); } /* The INDEX'th bit of SET value whose VALUE_TYPE is TYPE, @@ -1208,10 +1342,7 @@ value_complement (arg1) 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; @@ -1230,9 +1361,8 @@ value_bit_index (type, valaddr, index) 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)); @@ -1254,6 +1384,6 @@ value_in (element, set) } void -_initialize_valarith () +_initialize_valarith (void) { } |