X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fvalarith.c;h=2fa435d446de847a388a09517dc76c58d09ee730;hb=c3940723cfe1cddb8d348e98e1a47f99d20389e8;hp=5b219575198f25c72082480d0b35206f853beb40;hpb=d69fe07ead0b14603cb37fd9659bffc11afa37b1;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 5b21957519..2fa435d446 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -1,14 +1,14 @@
/* Perform arithmetic and other operations on values, for GDB.
- Copyright 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
- Software Foundation, Inc.
+ Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+ 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008
+ Free Software Foundation, Inc.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -17,9 +17,7 @@
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. */
+ along with this program. If not, see . */
#include "defs.h"
#include "value.h"
@@ -30,6 +28,7 @@
#include "language.h"
#include "gdb_string.h"
#include "doublest.h"
+#include "dfp.h"
#include
#include "infcall.h"
@@ -73,11 +72,11 @@ find_size_for_pointer_math (struct type *ptr_type)
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 *.");
+ 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);
+ error (_("Cannot perform pointer math on incomplete type \"%s\", "
+ "try casting to a known type, or void *."), name);
}
}
return sz;
@@ -160,9 +159,9 @@ value_sub (struct value *arg1, struct value *arg2)
}
else
{
- error ("\
+ error (_("\
First argument of `-' is a pointer and second argument is neither\n\
-an integer nor a pointer of the same type.");
+an integer nor a pointer of the same type."));
}
}
@@ -203,7 +202,7 @@ value_subscript (struct value *array, struct value *idx)
/* Emit warning unless we have an array of unknown size.
An array of unknown size has lowerbound 0 and upperbound -1. */
if (upperbound > -1)
- warning ("array or string index out of range");
+ warning (_("array or string index out of range"));
/* fall doing C stuff */
c_style = 1;
}
@@ -226,28 +225,29 @@ value_subscript (struct value *array, struct value *idx)
LONGEST lowerbound, upperbound;
get_discrete_bounds (range_type, &lowerbound, &upperbound);
if (index < lowerbound || index > upperbound)
- error ("bitstring index out of range");
+ 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);
+ byte >>= (gdbarch_bits_big_endian (current_gdbarch) ?
+ TARGET_CHAR_BIT - 1 - bit_index : bit_index);
v = value_from_longest (LA_BOOL_TYPE, byte & 1);
- v->bitpos = bit_index;
- v->bitsize = 1;
+ set_value_bitpos (v, bit_index);
+ set_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_FRAME_ID (v) = VALUE_FRAME_ID (array);
- v->offset = offset + value_offset (array);
+ set_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");
+ error (_("not an array or string"));
}
/* Return the value of EXPR[IDX], expr an aggregate rvalue
@@ -265,13 +265,14 @@ value_subscripted_rvalue (struct value *array, struct value *idx, int lowerbound
struct value *v;
if (index < lowerbound || elt_offs >= TYPE_LENGTH (array_type))
- error ("no such vector element");
+ error (_("no such vector element"));
v = allocate_value (elt_type);
if (value_lazy (array))
- VALUE_LAZY (v) = 1;
+ set_value_lazy (v, 1);
else
- memcpy (VALUE_CONTENTS (v), VALUE_CONTENTS (array) + elt_offs, elt_size);
+ memcpy (value_contents_writeable (v),
+ value_contents (array) + elt_offs, elt_size);
if (VALUE_LVAL (array) == lval_internalvar)
VALUE_LVAL (v) = lval_internalvar_component;
@@ -280,13 +281,13 @@ value_subscripted_rvalue (struct value *array, struct value *idx, int lowerbound
VALUE_ADDRESS (v) = VALUE_ADDRESS (array);
VALUE_REGNUM (v) = VALUE_REGNUM (array);
VALUE_FRAME_ID (v) = VALUE_FRAME_ID (array);
- v->offset = value_offset (array) + elt_offs;
+ set_value_offset (v, value_offset (array) + elt_offs);
return v;
}
-/* Check to see if either argument is a structure. This is called so
- we know whether to go ahead with the normal binop or look for a
- user defined function instead.
+/* Check to see if either argument is a structure, or a reference to
+ one. This is called so we know whether to go ahead with the normal
+ binop or look for a user defined function instead.
For now, we do not overload the `=' operator. */
@@ -296,14 +297,17 @@ 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)
return 0;
+
type1 = check_typedef (value_type (arg1));
+ if (TYPE_CODE (type1) == TYPE_CODE_REF)
+ type1 = check_typedef (TYPE_TARGET_TYPE (type1));
+
type2 = check_typedef (value_type (arg2));
+ if (TYPE_CODE (type2) == TYPE_CODE_REF)
+ type2 = check_typedef (TYPE_TARGET_TYPE (type2));
+
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));
+ || TYPE_CODE (type2) == TYPE_CODE_STRUCT);
}
/* Check to see if argument is a structure. This is called so
@@ -357,7 +361,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
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 = (struct value **) alloca (sizeof (struct value *) * 4);
argvec[1] = value_addr (arg1);
@@ -443,7 +447,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
break;
case BINOP_MOD: /* invalid */
default:
- error ("Invalid binary operation specified.");
+ error (_("Invalid binary operation specified."));
}
break;
case BINOP_SUBSCRIPT:
@@ -469,7 +473,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
break;
case BINOP_MOD: /* invalid */
default:
- error ("Invalid binary operation specified.");
+ error (_("Invalid binary operation specified."));
}
argvec[0] = value_struct_elt (&arg1, argvec + 1, tstr, &static_memfuncp, "structure");
@@ -490,7 +494,7 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
}
return call_function_by_hand (argvec[0], 2 - static_memfuncp, argvec + 1);
}
- error ("member function %s not found", tstr);
+ error (_("member function %s not found"), tstr);
#ifdef lint
return call_function_by_hand (argvec[0], 2 - static_memfuncp, argvec + 1);
#endif
@@ -517,7 +521,7 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside 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 = (struct value **) alloca (sizeof (struct value *) * 4);
argvec[1] = value_addr (arg1);
@@ -559,11 +563,14 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
case UNOP_NEG:
strcpy (ptr, "-");
break;
+ case UNOP_PLUS:
+ strcpy (ptr, "+");
+ break;
case UNOP_IND:
strcpy (ptr, "*");
break;
default:
- error ("Invalid unary operation specified.");
+ error (_("Invalid unary operation specified."));
}
argvec[0] = value_struct_elt (&arg1, argvec + 1, tstr, &static_memfuncp, "structure");
@@ -585,7 +592,7 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
}
return call_function_by_hand (argvec[0], nargs, argvec + 1);
}
- error ("member function %s not found", tstr);
+ error (_("member function %s not found"), tstr);
return 0; /* For lint -- never reached */
}
@@ -659,7 +666,7 @@ value_concat (struct value *arg1, struct value *arg2)
if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
{
inchar = (char) unpack_long (type2,
- VALUE_CONTENTS (inval2));
+ value_contents (inval2));
for (idx = 0; idx < count; idx++)
{
*(ptr + idx) = inchar;
@@ -669,7 +676,7 @@ value_concat (struct value *arg1, struct value *arg2)
{
for (idx = 0; idx < count; idx++)
{
- memcpy (ptr + (idx * inval2len), VALUE_CONTENTS (inval2),
+ memcpy (ptr + (idx * inval2len), value_contents (inval2),
inval2len);
}
}
@@ -678,11 +685,11 @@ value_concat (struct value *arg1, struct value *arg2)
else if (TYPE_CODE (type2) == TYPE_CODE_BITSTRING
|| TYPE_CODE (type2) == TYPE_CODE_BOOL)
{
- error ("unimplemented support for bitstring/boolean repeats");
+ error (_("unimplemented support for bitstring/boolean repeats"));
}
else
{
- error ("can't repeat values of that type");
+ error (_("can't repeat values of that type"));
}
}
else if (TYPE_CODE (type1) == TYPE_CODE_STRING
@@ -692,27 +699,27 @@ value_concat (struct value *arg1, struct value *arg2)
if (TYPE_CODE (type2) != TYPE_CODE_STRING
&& TYPE_CODE (type2) != TYPE_CODE_CHAR)
{
- error ("Strings can only be concatenated with other strings.");
+ error (_("Strings can only be concatenated with other strings."));
}
inval1len = TYPE_LENGTH (type1);
inval2len = TYPE_LENGTH (type2);
ptr = (char *) alloca (inval1len + inval2len);
if (TYPE_CODE (type1) == TYPE_CODE_CHAR)
{
- *ptr = (char) unpack_long (type1, VALUE_CONTENTS (inval1));
+ *ptr = (char) unpack_long (type1, value_contents (inval1));
}
else
{
- memcpy (ptr, VALUE_CONTENTS (inval1), inval1len);
+ memcpy (ptr, value_contents (inval1), inval1len);
}
if (TYPE_CODE (type2) == TYPE_CODE_CHAR)
{
*(ptr + inval1len) =
- (char) unpack_long (type2, VALUE_CONTENTS (inval2));
+ (char) unpack_long (type2, value_contents (inval2));
}
else
{
- memcpy (ptr + inval1len, VALUE_CONTENTS (inval2), inval2len);
+ memcpy (ptr + inval1len, value_contents (inval2), inval2len);
}
outval = value_string (ptr, inval1len + inval2len);
}
@@ -723,19 +730,75 @@ value_concat (struct value *arg1, struct value *arg2)
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.");
+ error (_("Bitstrings or booleans can only be concatenated with other bitstrings or booleans."));
}
- error ("unimplemented support for bitstring/boolean concatenation.");
+ error (_("unimplemented support for bitstring/boolean concatenation."));
}
else
{
/* We don't know how to concatenate these operands. */
- error ("illegal operands for concatenation.");
+ error (_("illegal operands for concatenation."));
}
return (outval);
}
+/* Obtain decimal value of arguments for binary operation, converting from
+ other types if one of them is not decimal floating point. */
+static void
+value_args_as_decimal (struct value *arg1, struct value *arg2,
+ gdb_byte *x, int *len_x, gdb_byte *y, int *len_y)
+{
+ struct type *type1, *type2;
+
+ type1 = check_typedef (value_type (arg1));
+ type2 = check_typedef (value_type (arg2));
+
+ /* At least one of the arguments must be of decimal float type. */
+ gdb_assert (TYPE_CODE (type1) == TYPE_CODE_DECFLOAT
+ || TYPE_CODE (type2) == TYPE_CODE_DECFLOAT);
+
+ if (TYPE_CODE (type1) == TYPE_CODE_FLT
+ || TYPE_CODE (type2) == TYPE_CODE_FLT)
+ /* 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). */
+ error (_("Mixing decimal floating types with other floating types is not allowed."));
+
+ /* Obtain decimal value of arg1, converting from other types
+ if necessary. */
+
+ if (TYPE_CODE (type1) == TYPE_CODE_DECFLOAT)
+ {
+ *len_x = TYPE_LENGTH (type1);
+ memcpy (x, value_contents (arg1), *len_x);
+ }
+ else if (is_integral_type (type1))
+ {
+ *len_x = TYPE_LENGTH (type2);
+ decimal_from_integral (arg1, x, *len_x);
+ }
+ else
+ error (_("Don't know how to convert from %s to %s."), TYPE_NAME (type1),
+ TYPE_NAME (type2));
+
+ /* Obtain decimal value of arg2, converting from other types
+ if necessary. */
+
+ if (TYPE_CODE (type2) == TYPE_CODE_DECFLOAT)
+ {
+ *len_y = TYPE_LENGTH (type2);
+ memcpy (y, value_contents (arg2), *len_y);
+ }
+ else if (is_integral_type (type2))
+ {
+ *len_y = TYPE_LENGTH (type1);
+ decimal_from_integral (arg2, y, *len_y);
+ }
+ else
+ error (_("Don't know how to convert from %s to %s."), TYPE_NAME (type1),
+ TYPE_NAME (type2));
+}
/* Perform a binary operation on two operands which have reasonable
representations as integers or floats. This includes booleans,
@@ -754,14 +817,55 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
type1 = check_typedef (value_type (arg1));
type2 = check_typedef (value_type (arg2));
- if ((TYPE_CODE (type1) != TYPE_CODE_FLT && !is_integral_type (type1))
+ if ((TYPE_CODE (type1) != TYPE_CODE_FLT
+ && TYPE_CODE (type1) != TYPE_CODE_DECFLOAT && !is_integral_type (type1))
||
- (TYPE_CODE (type2) != TYPE_CODE_FLT && !is_integral_type (type2)))
- error ("Argument to arithmetic operation not a number or boolean.");
+ (TYPE_CODE (type2) != TYPE_CODE_FLT
+ && TYPE_CODE (type2) != TYPE_CODE_DECFLOAT && !is_integral_type (type2)))
+ error (_("Argument to arithmetic operation not a number or boolean."));
- if (TYPE_CODE (type1) == TYPE_CODE_FLT
+ if (TYPE_CODE (type1) == TYPE_CODE_DECFLOAT
||
- TYPE_CODE (type2) == TYPE_CODE_FLT)
+ TYPE_CODE (type2) == TYPE_CODE_DECFLOAT)
+ {
+ struct type *v_type;
+ int len_v1, len_v2, len_v;
+ gdb_byte v1[16], v2[16];
+ gdb_byte v[16];
+
+ value_args_as_decimal (arg1, arg2, v1, &len_v1, v2, &len_v2);
+
+ switch (op)
+ {
+ case BINOP_ADD:
+ case BINOP_SUB:
+ case BINOP_MUL:
+ case BINOP_DIV:
+ case BINOP_EXP:
+ decimal_binop (op, v1, len_v1, v2, len_v2, v, &len_v);
+ break;
+
+ default:
+ error (_("Operation not valid for decimal floating point number."));
+ }
+
+ if (TYPE_CODE (type1) != TYPE_CODE_DECFLOAT)
+ /* If arg1 is not a decimal float, the type of the result is the type
+ of the decimal float argument, arg2. */
+ v_type = type2;
+ else if (TYPE_CODE (type2) != TYPE_CODE_DECFLOAT)
+ /* Same logic, for the case where arg2 is not a decimal float. */
+ v_type = type1;
+ else
+ /* len_v is equal either to len_v1 or to len_v2. the type of the
+ result is the type of the argument with the same length as v. */
+ v_type = (len_v == len_v1)? type1 : type2;
+
+ val = value_from_decfloat (v_type, v);
+ }
+ else if (TYPE_CODE (type1) == 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
@@ -787,21 +891,22 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
v = v1 / v2;
break;
- case BINOP_EXP:
- v = pow (v1, v2);
- if (errno)
- error ("Cannot perform exponentiation: %s", safe_strerror (errno));
- break;
+ case BINOP_EXP:
+ errno = 0;
+ v = pow (v1, v2);
+ if (errno)
+ error (_("Cannot perform exponentiation: %s"), safe_strerror (errno));
+ break;
default:
- error ("Integer-only operation on floating point number.");
+ error (_("Integer-only operation on floating point number."));
}
/* 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)
+ if (TYPE_LENGTH (type1) * 8 > gdbarch_double_bit (current_gdbarch)
+ || TYPE_LENGTH (type2) * 8 > gdbarch_double_bit (current_gdbarch))
val = allocate_value (builtin_type_long_double);
else
val = allocate_value (builtin_type_double);
@@ -839,7 +944,7 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
break;
default:
- error ("Invalid operation on booleans.");
+ error (_("Invalid operation on booleans."));
}
val = allocate_value (type1);
@@ -878,7 +983,14 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
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)
+ if (op == BINOP_RSH || op == BINOP_LSH)
+ {
+ /* In case of the shift operators the type of the result only
+ depends on the type of the left operand. */
+ unsigned_operation = is_unsigned1;
+ result_len = promoted_len1;
+ }
+ else if (promoted_len1 > promoted_len2)
{
unsigned_operation = is_unsigned1;
result_len = promoted_len1;
@@ -922,14 +1034,19 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
break;
case BINOP_DIV:
- v = v1 / v2;
+ case BINOP_INTDIV:
+ if (v2 != 0)
+ v = v1 / v2;
+ else
+ error (_("Division by zero"));
break;
- case BINOP_EXP:
- v = pow (v1, v2);
- if (errno)
- error ("Cannot perform exponentiation: %s", safe_strerror (errno));
- break;
+ case BINOP_EXP:
+ errno = 0;
+ v = pow (v1, v2);
+ if (errno)
+ error (_("Cannot perform exponentiation: %s"), safe_strerror (errno));
+ break;
case BINOP_REM:
v = v1 % v2;
@@ -999,7 +1116,7 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
break;
default:
- error ("Invalid binary operation on numbers.");
+ error (_("Invalid binary operation on numbers."));
}
/* This is a kludge to get around the fact that we don't
@@ -1012,7 +1129,7 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
/* Can't just call init_type because we wouldn't know what
name to give the type. */
val = allocate_value
- (result_len > TARGET_LONG_BIT / HOST_CHAR_BIT
+ (result_len > gdbarch_long_bit (current_gdbarch) / HOST_CHAR_BIT
? builtin_type_unsigned_long_long
: builtin_type_unsigned_long);
store_unsigned_integer (value_contents_raw (val),
@@ -1040,23 +1157,25 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
break;
case BINOP_DIV:
+ case BINOP_INTDIV:
if (v2 != 0)
v = v1 / v2;
else
- error ("Division by zero");
+ error (_("Division by zero"));
break;
- case BINOP_EXP:
- v = pow (v1, v2);
- if (errno)
- error ("Cannot perform exponentiation: %s", safe_strerror (errno));
+ case BINOP_EXP:
+ errno = 0;
+ v = pow (v1, v2);
+ if (errno)
+ error (_("Cannot perform exponentiation: %s"), safe_strerror (errno));
break;
case BINOP_REM:
if (v2 != 0)
v = v1 % v2;
else
- error ("Division by zero");
+ error (_("Division by zero"));
break;
case BINOP_MOD:
@@ -1123,7 +1242,7 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
break;
default:
- error ("Invalid binary operation on numbers.");
+ error (_("Invalid binary operation on numbers."));
}
/* This is a kludge to get around the fact that we don't
@@ -1136,7 +1255,7 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
/* Can't just call init_type because we wouldn't know what
name to give the type. */
val = allocate_value
- (result_len > TARGET_LONG_BIT / HOST_CHAR_BIT
+ (result_len > gdbarch_long_bit (current_gdbarch) / HOST_CHAR_BIT
? builtin_type_long_long
: builtin_type_long);
store_signed_integer (value_contents_raw (val),
@@ -1154,7 +1273,7 @@ int
value_logical_not (struct value *arg1)
{
int len;
- char *p;
+ const gdb_byte *p;
struct type *type1;
arg1 = coerce_number (arg1);
@@ -1162,9 +1281,11 @@ value_logical_not (struct value *arg1)
if (TYPE_CODE (type1) == TYPE_CODE_FLT)
return 0 == value_as_double (arg1);
+ else if (TYPE_CODE (type1) == TYPE_CODE_DECFLOAT)
+ return decimal_is_zero (value_contents (arg1), TYPE_LENGTH (type1));
len = TYPE_LENGTH (type1);
- p = VALUE_CONTENTS (arg1);
+ p = value_contents (arg1);
while (--len >= 0)
{
@@ -1183,8 +1304,8 @@ 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);
+ const gdb_byte *s1 = value_contents (arg1);
+ const gdb_byte *s2 = value_contents (arg2);
int i, len = len1 < len2 ? len1 : len2;
for (i = 0; i < len; i++)
@@ -1212,7 +1333,8 @@ int
value_equal (struct value *arg1, struct value *arg2)
{
int len;
- char *p1, *p2;
+ const gdb_byte *p1;
+ const gdb_byte *p2;
struct type *type1, *type2;
enum type_code code1;
enum type_code code2;
@@ -1233,7 +1355,22 @@ value_equal (struct value *arg1, struct value *arg2)
BINOP_EQUAL)));
else if ((code1 == TYPE_CODE_FLT || is_int1)
&& (code2 == TYPE_CODE_FLT || is_int2))
- return value_as_double (arg1) == value_as_double (arg2);
+ {
+ /* NOTE: kettenis/20050816: Avoid compiler bug on systems where
+ `long double' values are returned in static storage (m68k). */
+ DOUBLEST d = value_as_double (arg1);
+ return d == value_as_double (arg2);
+ }
+ else if ((code1 == TYPE_CODE_DECFLOAT || is_int1)
+ && (code2 == TYPE_CODE_DECFLOAT || is_int2))
+ {
+ gdb_byte v1[16], v2[16];
+ int len_v1, len_v2;
+
+ value_args_as_decimal (arg1, arg2, v1, &len_v1, v2, &len_v2);
+
+ return decimal_compare (v1, len_v1, v2, len_v2) == 0;
+ }
/* FIXME: Need to promote to either CORE_ADDR or LONGEST, whichever
is bigger. */
@@ -1246,8 +1383,8 @@ value_equal (struct value *arg1, struct value *arg2)
&& ((len = (int) TYPE_LENGTH (type1))
== (int) TYPE_LENGTH (type2)))
{
- p1 = VALUE_CONTENTS (arg1);
- p2 = VALUE_CONTENTS (arg2);
+ p1 = value_contents (arg1);
+ p2 = value_contents (arg2);
while (--len >= 0)
{
if (*p1++ != *p2++)
@@ -1261,7 +1398,7 @@ value_equal (struct value *arg1, struct value *arg2)
}
else
{
- error ("Invalid type combination in equality test.");
+ error (_("Invalid type combination in equality test."));
return 0; /* For lint -- never reached */
}
}
@@ -1292,7 +1429,22 @@ value_less (struct value *arg1, struct value *arg2)
BINOP_LESS)));
else if ((code1 == TYPE_CODE_FLT || is_int1)
&& (code2 == TYPE_CODE_FLT || is_int2))
- return value_as_double (arg1) < value_as_double (arg2);
+ {
+ /* NOTE: kettenis/20050816: Avoid compiler bug on systems where
+ `long double' values are returned in static storage (m68k). */
+ DOUBLEST d = value_as_double (arg1);
+ return d < value_as_double (arg2);
+ }
+ else if ((code1 == TYPE_CODE_DECFLOAT || is_int1)
+ && (code2 == TYPE_CODE_DECFLOAT || is_int2))
+ {
+ gdb_byte v1[16], v2[16];
+ int len_v1, len_v2;
+
+ value_args_as_decimal (arg1, arg2, v1, &len_v1, v2, &len_v2);
+
+ return decimal_compare (v1, len_v1, v2, len_v2) == -1;
+ }
else if (code1 == TYPE_CODE_PTR && code2 == TYPE_CODE_PTR)
return value_as_address (arg1) < value_as_address (arg2);
@@ -1306,12 +1458,41 @@ value_less (struct value *arg1, struct value *arg2)
return value_strcmp (arg1, arg2) < 0;
else
{
- error ("Invalid type combination in ordering comparison.");
+ error (_("Invalid type combination in ordering comparison."));
return 0;
}
}
-/* The unary operators - and ~. Both free the argument ARG1. */
+/* The unary operators +, - and ~. They free the argument ARG1. */
+
+struct value *
+value_pos (struct value *arg1)
+{
+ struct type *type;
+
+ arg1 = coerce_ref (arg1);
+
+ type = check_typedef (value_type (arg1));
+
+ if (TYPE_CODE (type) == TYPE_CODE_FLT)
+ return value_from_double (type, value_as_double (arg1));
+ else if (TYPE_CODE (type) == TYPE_CODE_DECFLOAT)
+ return value_from_decfloat (type, value_contents (arg1));
+ else if (is_integral_type (type))
+ {
+ /* Perform integral promotion for ANSI C/C++. FIXME: What about
+ FORTRAN and (the deleted) chill ? */
+ if (TYPE_LENGTH (type) < TYPE_LENGTH (builtin_type_int))
+ type = builtin_type_int;
+
+ return value_from_longest (type, value_as_long (arg1));
+ }
+ else
+ {
+ error ("Argument to positive operation not a number.");
+ return 0; /* For lint -- never reached */
+ }
+}
struct value *
value_neg (struct value *arg1)
@@ -1323,6 +1504,23 @@ value_neg (struct value *arg1)
type = check_typedef (value_type (arg1));
+ if (TYPE_CODE (type) == TYPE_CODE_DECFLOAT)
+ {
+ struct value *val = allocate_value (result_type);
+ int len = TYPE_LENGTH (type);
+ gdb_byte decbytes[16]; /* a decfloat is at most 128 bits long */
+
+ memcpy (decbytes, value_contents (arg1), len);
+
+ if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
+ decbytes[len-1] = decbytes[len - 1] | 0x80;
+ else
+ decbytes[0] = decbytes[0] | 0x80;
+
+ memcpy (value_contents_raw (val), decbytes, len);
+ return val;
+ }
+
if (TYPE_CODE (type) == TYPE_CODE_FLT)
return value_from_double (result_type, -value_as_double (arg1));
else if (is_integral_type (type))
@@ -1336,7 +1534,7 @@ value_neg (struct value *arg1)
}
else
{
- error ("Argument to negate operation not a number.");
+ error (_("Argument to negate operation not a number."));
return 0; /* For lint -- never reached */
}
}
@@ -1352,7 +1550,7 @@ value_complement (struct value *arg1)
type = check_typedef (value_type (arg1));
if (!is_integral_type (type))
- error ("Argument to complement operation not an integer or boolean.");
+ error (_("Argument to complement operation not an integer or boolean."));
/* Perform integral promotion for ANSI C/C++.
FIXME: What about FORTRAN ? */
@@ -1363,11 +1561,11 @@ value_complement (struct value *arg1)
}
/* The INDEX'th bit of SET value whose value_type is TYPE,
- and whose VALUE_CONTENTS is valaddr.
+ and whose value_contents is valaddr.
Return -1 if out of range, -2 other error. */
int
-value_bit_index (struct type *type, const bfd_byte *valaddr, int index)
+value_bit_index (struct type *type, const gdb_byte *valaddr, int index)
{
LONGEST low_bound, high_bound;
LONGEST word;
@@ -1381,7 +1579,7 @@ value_bit_index (struct type *type, const bfd_byte *valaddr, int index)
word = unpack_long (builtin_type_unsigned_char,
valaddr + (rel_index / TARGET_CHAR_BIT));
rel_index %= TARGET_CHAR_BIT;
- if (BITS_BIG_ENDIAN)
+ if (gdbarch_bits_big_endian (current_gdbarch))
rel_index = TARGET_CHAR_BIT - 1 - rel_index;
return (word >> rel_index) & 1;
}
@@ -1395,16 +1593,16 @@ value_in (struct value *element, struct value *set)
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");
+ 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)
- error ("First argument of 'IN' has wrong type");
- member = value_bit_index (settype, VALUE_CONTENTS (set),
+ error (_("First argument of 'IN' has wrong type"));
+ member = value_bit_index (settype, value_contents (set),
value_as_long (element));
if (member < 0)
- error ("First argument of 'IN' not in range");
+ error (_("First argument of 'IN' not in range"));
return value_from_longest (LA_BOOL_TYPE, member);
}