diff options
| author | David Lecomber <david@lecomber.net> | 2003-09-09 16:51:54 +0000 |
|---|---|---|
| committer | David Lecomber <david@lecomber.net> | 2003-09-09 16:51:54 +0000 |
| commit | 8ae8779f9e5ec82f24e2c89549ff024c2337467f (patch) | |
| tree | 4a8f3bdd5f93bf04b810a8c0c5b19d91ad48762b /gdb/eval.c | |
| parent | f7b61d6f9373d6bdffaabae71f13168c0d1233f4 (diff) | |
| download | gdb-8ae8779f9e5ec82f24e2c89549ff024c2337467f.tar.gz | |
Change array element access to something similar to way C works.
The old method would drag in the entire array, then look for the
single element. This method just gets the right element out instead.
Saves memory, and saves a crash for array with (*) as one of the
dimensions when it would previously have allocated (unsigned int) -1 bytes.
Diffstat (limited to 'gdb/eval.c')
| -rw-r--r-- | gdb/eval.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gdb/eval.c b/gdb/eval.c index 914a5520704..7b18723774b 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1666,10 +1666,6 @@ evaluate_subexp_standard (struct type *expect_type, offset_item = array_size_array[i] * offset_item + subscript_array[i]; - /* Construct a value node with the value of the offset */ - - arg2 = value_from_longest (builtin_type_f_integer, offset_item); - /* Let us now play a dirty trick: we will take arg1 which is a value node pointing to the topmost level of the multidimensional array-set and pretend @@ -1678,7 +1674,15 @@ evaluate_subexp_standard (struct type *expect_type, returns the correct type value */ VALUE_TYPE (arg1) = tmp_type; - return value_ind (value_add (value_coerce_array (arg1), arg2)); + + f77_get_dynamic_lowerbound (tmp_type, &lower); + + /* Construct a value node with the value of the offset */ + /* lower will get subtracted off in value_subscript, hence add it here */ + + arg2 = value_from_longest (builtin_type_f_integer, offset_item + lower); + + return value_subscript(arg1, arg2); } case BINOP_LOGICAL_AND: |