* eval.c (evaluate_subexp_for_sizeof): Use builtin_int type of

[deliverable/binutils-gdb.git] / gdb / eval.c

diff --git a/gdb/eval.c b/gdb/eval.c
index 9400ef4b368e6cb679c2afb477eded1e9bd70893..3c082c27196bd5bd1939dd598c0e4f695de0035b 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -562,8 +562,8 @@ evaluate_subexp_standard (struct type *expect_type,
       }
     case OP_BOOL:
       (*pos) += 2;
-      return value_from_longest (LA_BOOL_TYPE,
-                                exp->elts[pc + 1].longconst);
+      type = language_bool_type (exp->language_defn, exp->gdbarch);
+      return value_from_longest (type, exp->elts[pc + 1].longconst);
 
     case OP_INTERNALVAR:
       (*pos) += 2;
@@ -1369,10 +1369,11 @@ evaluate_subexp_standard (struct type *expect_type,
     case OP_COMPLEX:
       /* We have a complex number, There should be 2 floating 
          point numbers that compose it */
+      (*pos) += 2;
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
 
-      return value_literal_complex (arg1, arg2, builtin_type_f_complex_s16);
+      return value_literal_complex (arg1, arg2, exp->elts[pc + 1].type);
 
     case STRUCTOP_STRUCT:
       tem = longest_to_int (exp->elts[pc + 1].longconst);
@@ -1618,7 +1619,8 @@ evaluate_subexp_standard (struct type *expect_type,
       arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
       if (noside == EVAL_SKIP)
        goto nosideret;
-      return value_in (arg1, arg2);
+      type = language_bool_type (exp->language_defn, exp->gdbarch);
+      return value_from_longest (type, (LONGEST) value_in (arg1, arg2));
 
     case MULTI_SUBSCRIPT:
       (*pos) += 2;
@@ -1678,7 +1680,8 @@ evaluate_subexp_standard (struct type *expect_type,
                  break;
 
                case TYPE_CODE_BITSTRING:
-                 arg1 = value_bitstring_subscript (LA_BOOL_TYPE, arg1, arg2);
+                 type = language_bool_type (exp->language_defn, exp->gdbarch);
+                 arg1 = value_bitstring_subscript (type, arg1, arg2);
                  break;
 
                default:
@@ -1798,7 +1801,8 @@ evaluate_subexp_standard (struct type *expect_type,
          tem = value_logical_not (arg1);
          arg2 = evaluate_subexp (NULL_TYPE, exp, pos,
                                  (tem ? EVAL_SKIP : noside));
-         return value_from_longest (LA_BOOL_TYPE,
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type,
                             (LONGEST) (!tem && !value_logical_not (arg2)));
        }
 
@@ -1824,7 +1828,8 @@ evaluate_subexp_standard (struct type *expect_type,
          tem = value_logical_not (arg1);
          arg2 = evaluate_subexp (NULL_TYPE, exp, pos,
                                  (!tem ? EVAL_SKIP : noside));
-         return value_from_longest (LA_BOOL_TYPE,
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type,
                             (LONGEST) (!tem || !value_logical_not (arg2)));
        }
 
@@ -1840,7 +1845,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_equal (arg1, arg2);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) tem);
        }
 
     case BINOP_NOTEQUAL:
@@ -1855,7 +1861,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_equal (arg1, arg2);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) ! tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) ! tem);
        }
 
     case BINOP_LESS:
@@ -1870,7 +1877,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_less (arg1, arg2);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) tem);
        }
 
     case BINOP_GTR:
@@ -1885,7 +1893,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_less (arg2, arg1);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) tem);
        }
 
     case BINOP_GEQ:
@@ -1900,7 +1909,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_less (arg2, arg1) || value_equal (arg1, arg2);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) tem);
        }
 
     case BINOP_LEQ:
@@ -1915,7 +1925,8 @@ evaluate_subexp_standard (struct type *expect_type,
       else
        {
          tem = value_less (arg1, arg2) || value_equal (arg1, arg2);
-         return value_from_longest (LA_BOOL_TYPE, (LONGEST) tem);
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) tem);
        }
 
     case BINOP_REPEAT:
@@ -1975,8 +1986,10 @@ evaluate_subexp_standard (struct type *expect_type,
       if (unop_user_defined_p (op, arg1))
        return value_x_unop (arg1, op, noside);
       else
-       return value_from_longest (LA_BOOL_TYPE,
-                                  (LONGEST) value_logical_not (arg1));
+       {
+         type = language_bool_type (exp->language_defn, exp->gdbarch);
+         return value_from_longest (type, (LONGEST) value_logical_not (arg1));
+       }
 
     case UNOP_IND:
       if (expect_type && TYPE_CODE (expect_type) == TYPE_CODE_PTR)
@@ -2322,6 +2335,8 @@ evaluate_subexp_with_coercion (struct expression *exp,
 static struct value *
 evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
 {
+  /* FIXME: This should be size_t.  */
+  struct type *size_type = builtin_type (exp->gdbarch)->builtin_int;
   enum exp_opcode op;
   int pc;
   struct type *type;
@@ -2345,24 +2360,22 @@ evaluate_subexp_for_sizeof (struct expression *exp, int *pos)
          && TYPE_CODE (type) != TYPE_CODE_ARRAY)
        error (_("Attempt to take contents of a non-pointer value."));
       type = check_typedef (TYPE_TARGET_TYPE (type));
-      return value_from_longest (builtin_type_int, (LONGEST)
-                                TYPE_LENGTH (type));
+      return value_from_longest (size_type, (LONGEST) TYPE_LENGTH (type));
 
     case UNOP_MEMVAL:
       (*pos) += 3;
       type = check_typedef (exp->elts[pc + 1].type);
-      return value_from_longest (builtin_type_int,
-                                (LONGEST) TYPE_LENGTH (type));
+      return value_from_longest (size_type, (LONGEST) TYPE_LENGTH (type));
 
     case OP_VAR_VALUE:
       (*pos) += 4;
       type = check_typedef (SYMBOL_TYPE (exp->elts[pc + 2].symbol));
       return
-       value_from_longest (builtin_type_int, (LONGEST) TYPE_LENGTH (type));
+       value_from_longest (size_type, (LONGEST) TYPE_LENGTH (type));
 
     default:
       val = evaluate_subexp (NULL_TYPE, exp, pos, EVAL_AVOID_SIDE_EFFECTS);
-      return value_from_longest (builtin_type_int,
+      return value_from_longest (size_type,
                                 (LONGEST) TYPE_LENGTH (value_type (val)));
     }
 }