gdb/

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

diff --git a/gdb/eval.c b/gdb/eval.c
index de25b398d1284b4b0086399dbf08c2200bbd2104..af225c4670ae6339c34fab85315540eda39e3b6e 100644 (file)
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -93,22 +93,6 @@ parse_and_eval_address (char *exp)
   return addr;
 }
 
-/* Like parse_and_eval_address but takes a pointer to a char * variable
-   and advanced that variable across the characters parsed.  */
-
-CORE_ADDR
-parse_and_eval_address_1 (char **expptr)
-{
-  struct expression *expr = parse_exp_1 (expptr, (struct block *) 0, 0);
-  CORE_ADDR addr;
-  struct cleanup *old_chain =
-    make_cleanup (free_current_contents, &expr);
-
-  addr = value_as_address (evaluate_expression (expr));
-  do_cleanups (old_chain);
-  return addr;
-}
-
 /* Like parse_and_eval_address, but treats the value of the expression
    as an integer, not an address, returns a LONGEST, not a CORE_ADDR.  */
 LONGEST
@@ -1326,13 +1310,12 @@ evaluate_subexp_standard (struct type *expect_type,
 
        if (method)
          {
-           struct block *b;
            CORE_ADDR funaddr;
            struct type *val_type;
 
            funaddr = find_function_addr (method, &val_type);
 
-           b = block_for_pc (funaddr);
+           block_for_pc (funaddr);
 
            CHECK_TYPEDEF (val_type);
          
@@ -1849,6 +1832,8 @@ evaluate_subexp_standard (struct type *expect_type,
              return value_zero (builtin_type (exp->gdbarch)->builtin_int,
                                 not_lval);
            }
+         else if (TYPE_GNU_IFUNC (ftype))
+           return allocate_value (TYPE_TARGET_TYPE (TYPE_TARGET_TYPE (ftype)));
          else if (TYPE_TARGET_TYPE (ftype))
            return allocate_value (TYPE_TARGET_TYPE (ftype));
          else
@@ -2213,7 +2198,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *v_one, *retval;
 
-             v_one = value_one (value_type (arg2), not_lval);
+             v_one = value_one (value_type (arg2));
              binop_promote (exp->language_defn, exp->gdbarch, &arg1, &v_one);
              retval = value_binop (arg1, v_one, op);
              return retval;
@@ -2233,8 +2218,8 @@ evaluate_subexp_standard (struct type *expect_type,
        }
 
     case BINOP_RANGE:
-      arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
-      arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+      evaluate_subexp (NULL_TYPE, exp, pos, noside);
+      evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
        goto nosideret;
       error (_("':' operator used in invalid context"));
@@ -2399,7 +2384,7 @@ evaluate_subexp_standard (struct type *expect_type,
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
        {
-         arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+         evaluate_subexp (NULL_TYPE, exp, pos, noside);
          goto nosideret;
        }
 
@@ -2426,7 +2411,7 @@ evaluate_subexp_standard (struct type *expect_type,
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       if (noside == EVAL_SKIP)
        {
-         arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+         evaluate_subexp (NULL_TYPE, exp, pos, noside);
          goto nosideret;
        }
 
@@ -2757,7 +2742,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_ADD);
            }
@@ -2781,7 +2766,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_SUB);
            }
@@ -2807,7 +2792,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_ADD);
            }
@@ -2834,7 +2819,7 @@ evaluate_subexp_standard (struct type *expect_type,
            {
              struct value *tmp = arg1;
 
-             arg2 = value_one (value_type (arg1), not_lval);
+             arg2 = value_one (value_type (arg1));
              binop_promote (exp->language_defn, exp->gdbarch, &tmp, &arg2);
              arg2 = value_binop (tmp, arg2, BINOP_SUB);
            }
@@ -2845,11 +2830,7 @@ evaluate_subexp_standard (struct type *expect_type,
 
     case OP_THIS:
       (*pos) += 1;
-      return value_of_this (1);
-
-    case OP_OBJC_SELF:
-      (*pos) += 1;
-      return value_of_local ("self", 1);
+      return value_of_this (exp->language_defn);
 
     case OP_TYPE:
       /* The value is not supposed to be used.  This is here to make it