summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2008-09-10 16:12:35 +0000
committerJoel Brobecker <brobecker@gnat.com>2008-09-10 16:12:35 +0000
commit2ac8a782d97ff325b3873a02672c79b5a33a3a0c (patch)
tree3d8d3f6ae0eeb76c852559f56eefde0a9998f06d
parentb861ac8114b6e8351e6694c2a025dce137acb876 (diff)
downloadbinutils-gdb-2ac8a782d97ff325b3873a02672c79b5a33a3a0c.tar.gz
* ada-lang.c (ada_evaluate_subexp) [BINOP_ADD, BINOP_SUB]:
Add special handling for pointer types.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/ada-lang.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 05db26505b9..deec62d95e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-10 Joel Brobecker <brobecker@adacore.com>
+
+ * ada-lang.c (ada_evaluate_subexp) [BINOP_ADD, BINOP_SUB]:
+ Add special handling for pointer types.
+
2008-09-10 Pedro Alves <pedro@codesourcery.com>
* inf-ttrace.c (inf_ttrace_follow_fork): Declare locals at the
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 8845433061f..fa163c4b54c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8497,6 +8497,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
if (noside == EVAL_SKIP)
goto nosideret;
+ if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_PTR)
+ return (value_from_longest
+ (value_type (arg1),
+ value_as_long (arg1) + value_as_long (arg2)));
if ((ada_is_fixed_point_type (value_type (arg1))
|| ada_is_fixed_point_type (value_type (arg2)))
&& value_type (arg1) != value_type (arg2))
@@ -8514,6 +8518,10 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp,
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
if (noside == EVAL_SKIP)
goto nosideret;
+ if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_PTR)
+ return (value_from_longest
+ (value_type (arg1),
+ value_as_long (arg1) - value_as_long (arg2)));
if ((ada_is_fixed_point_type (value_type (arg1))
|| ada_is_fixed_point_type (value_type (arg2)))
&& value_type (arg1) != value_type (arg2))