From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4788 invoked by alias); 26 Jun 2009 15:51:41 -0000 Received: (qmail 4764 invoked by uid 22791); 26 Jun 2009 15:51:40 -0000 X-SWARE-Spam-Status: No, hits=1.4 required=5.0 tests=AWL,BAYES_00,KAM_STOCKTIP,MSGID_FROM_MTA_HEADER,SPF_SOFTFAIL X-Spam-Check-By: sourceware.org Received: from mtagate4.de.ibm.com (HELO mtagate4.de.ibm.com) (195.212.29.153) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 26 Jun 2009 15:51:32 +0000 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate4.de.ibm.com (8.14.3/8.13.8) with ESMTP id n5QFpTlJ154058 for ; Fri, 26 Jun 2009 15:51:29 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n5QFpTp82724090 for ; Fri, 26 Jun 2009 17:51:29 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n5QFpTo6028273 for ; Fri, 26 Jun 2009 17:51:29 +0200 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with SMTP id n5QFpSgt028255; Fri, 26 Jun 2009 17:51:28 +0200 Message-Id: <200906261551.n5QFpSgt028255@d12av02.megacenter.de.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Fri, 26 Jun 2009 17:51:28 +0200 Subject: [rfa/Ada] Restructure array bounds routines to remove builtin types To: brobecker@adacore.com, gdb-patches@sourceware.org Date: Fri, 26 Jun 2009 15:51:00 -0000 From: "Ulrich Weigand" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-06/txt/msg00716.txt.bz2 Hello Joel, when attempting to remove references to the remaining global builtin types, I ran across a couple of instances in Ada language support code. This patch removes some references to global builtin types from Ada code. In particular, routines used to determine array bounds and length in order to implement the 'range, 'first, 'last, and 'length attribute would use builtin_type_int32 as fallback when unable to determine the actual type. The patch attempts to simplify that set of routines: - There is now a clean separation between routines that compute index *types* and those that compute index bound *values*. - The ada_array_bound, ada_array_bound_from_type, and ada_array_length now solely return numerical values (as LONGEST); they do not attempt to do anything with types. - The ada_index_type is now the only routine that determines index types; it is consistently used in all cases by ada_evaluate_subexp to determine the result types of the attribute expressions. - ada_index_type will return NULL if unable to determine a type. The caller, ada_evaluate_subexp, is in the best position to determine an appropriate fall-back type to use. - As the NULL return value now indicates the use of a fall-back type, it can no longer be used to indicate errors. As ada_index_type is only used from within ada_evaluate_subexp, I've changed it to throw errors itself when detecting invalid arguments (and removed now redundant checked from ada_evaluate_subexp). Tested on amd64-linux. OK for mainline? Bye, Ulrich ChangeLog: * ada-lang.c (ada_index_type): Make static. Add NAME argument. Throw error on invalid input arguments. Return NULL if unable to determine index type. (ada_array_bound_from_type): Remove TYPEP argument. (ada_array_bound): Make static. Return LONGEST instead of value. Update for ada_array_bound_from_type change. (ada_array_length): Return LONGEST instead of value. Update for ada_array_bound_from_type change. (make_array_descriptor): Update for ada_array_bound change. (ada_evaluate_subexp) [OP_ATR_RANGE, OP_ATR_FIRST, OP_ATR_LAST, OP_ATR_LENGTH]: Update for ada_array_bound_from_type, ada_array_bound, ada_array_length, ada_index_type changes. Always use ada_index_type to compute result type; fall back to architecture-specific integer type if ada_index_type fails. * ada-lang.h (ada_index_type): Remove prototype. (ada_array_bound): Likewise. Index: gdb-head/gdb/ada-lang.c =================================================================== --- gdb-head.orig/gdb/ada-lang.c +++ gdb-head/gdb/ada-lang.c @@ -2410,15 +2410,15 @@ ada_array_element_type (struct type *typ /* The type of nth index in arrays of given type (n numbering from 1). Does not examine memory. */ -struct type * -ada_index_type (struct type *type, int n) +static struct type * +ada_index_type (struct type *type, int n, const char *name) { struct type *result_type; type = desc_base_type (type); - if (n > ada_array_arity (type)) - return NULL; + if (n < 0 || n > ada_array_arity (type)) + error (_("invalid dimension number to '%s"), name); if (ada_is_simple_array_type (type)) { @@ -2430,25 +2430,27 @@ ada_index_type (struct type *type, int n /* FIXME: The stabs type r(0,0);bound;bound in an array type has a target type of TYPE_CODE_UNDEF. We compensate here, but perhaps stabsread.c would make more sense. */ - if (result_type == NULL || TYPE_CODE (result_type) == TYPE_CODE_UNDEF) - result_type = builtin_type_int32; - - return result_type; + if (result_type && TYPE_CODE (result_type) == TYPE_CODE_UNDEF) + result_type = NULL; } else - return desc_index_type (desc_bounds_type (type), n); + { + result_type = desc_index_type (desc_bounds_type (type), n); + if (result_type == NULL) + error (_("attempt to take bound of something that is not an array")); + } + + return result_type; } /* Given that arr is an array type, returns the lower bound of the Nth index (numbering from 1) if WHICH is 0, and the upper bound if WHICH is 1. This returns bounds 0 .. -1 if ARR_TYPE is an - array-descriptor type. If TYPEP is non-null, *TYPEP is set to the - bounds type. It works for other arrays with bounds supplied by - run-time quantities other than discriminants. */ + array-descriptor type. It works for other arrays with bounds supplied + by run-time quantities other than discriminants. */ static LONGEST -ada_array_bound_from_type (struct type * arr_type, int n, int which, - struct type ** typep) +ada_array_bound_from_type (struct type * arr_type, int n, int which) { struct type *type, *index_type_desc, *index_type; LONGEST retval; @@ -2459,11 +2461,7 @@ ada_array_bound_from_type (struct type * arr_type = decode_packed_array_type (arr_type); if (arr_type == NULL || !ada_is_simple_array_type (arr_type)) - { - if (typep != NULL) - *typep = builtin_type_int32; - return (LONGEST) - which; - } + return (LONGEST) - which; if (TYPE_CODE (arr_type) == TYPE_CODE_PTR) type = TYPE_TARGET_TYPE (arr_type); @@ -2500,9 +2498,6 @@ ada_array_bound_from_type (struct type * internal_error (__FILE__, __LINE__, _("invalid type code of index type")); } - if (typep != NULL) - *typep = index_type; - return retval; } @@ -2511,7 +2506,7 @@ ada_array_bound_from_type (struct type * WHICH is 1. This routine will also work for arrays with bounds supplied by run-time quantities other than discriminants. */ -struct value * +static LONGEST ada_array_bound (struct value *arr, int n, int which) { struct type *arr_type = value_type (arr); @@ -2519,13 +2514,9 @@ ada_array_bound (struct value *arr, int if (ada_is_packed_array_type (arr_type)) return ada_array_bound (decode_packed_array (arr), n, which); else if (ada_is_simple_array_type (arr_type)) - { - struct type *type; - LONGEST v = ada_array_bound_from_type (arr_type, n, which, &type); - return value_from_longest (type, v); - } + return ada_array_bound_from_type (arr_type, n, which); else - return desc_one_bound (desc_bounds (arr), n, which); + return value_as_long (desc_one_bound (desc_bounds (arr), n, which)); } /* Given that arr is an array value, returns the length of the @@ -2534,7 +2525,7 @@ ada_array_bound (struct value *arr, int Does not work for arrays indexed by enumeration types with representation clauses at the moment. */ -static struct value * +static LONGEST ada_array_length (struct value *arr, int n) { struct type *arr_type = ada_check_typedef (value_type (arr)); @@ -2543,20 +2534,11 @@ ada_array_length (struct value *arr, int return ada_array_length (decode_packed_array (arr), n); if (ada_is_simple_array_type (arr_type)) - { - struct type *type; - LONGEST v = - ada_array_bound_from_type (arr_type, n, 1, &type) - - ada_array_bound_from_type (arr_type, n, 0, NULL) + 1; - return value_from_longest (type, v); - } + return (ada_array_bound_from_type (arr_type, n, 1) + - ada_array_bound_from_type (arr_type, n, 0) + 1); else - return - value_from_longest (builtin_type_int32, - value_as_long (desc_one_bound (desc_bounds (arr), - n, 1)) - - value_as_long (desc_one_bound (desc_bounds (arr), - n, 0)) + 1); + return (value_as_long (desc_one_bound (desc_bounds (arr), n, 1)) + - value_as_long (desc_one_bound (desc_bounds (arr), n, 0)) + 1); } /* An empty array whose type is that of ARR_TYPE (an array type), @@ -3859,11 +3841,11 @@ make_array_descriptor (struct type *type for (i = ada_array_arity (ada_check_typedef (value_type (arr))); i > 0; i -= 1) { modify_general_field (value_contents_writeable (bounds), - value_as_long (ada_array_bound (arr, i, 0)), + ada_array_bound (arr, i, 0), desc_bound_bitpos (bounds_type, i, 0), desc_bound_bitsize (bounds_type, i, 0)); modify_general_field (value_contents_writeable (bounds), - value_as_long (ada_array_bound (arr, i, 1)), + ada_array_bound (arr, i, 1), desc_bound_bitpos (bounds_type, i, 1), desc_bound_bitsize (bounds_type, i, 1)); } @@ -9046,11 +9028,12 @@ ada_evaluate_subexp (struct type *expect tem = longest_to_int (exp->elts[pc + 1].longconst); - if (tem < 1 || tem > ada_array_arity (value_type (arg2))) - error (_("invalid dimension number to 'range")); + type = ada_index_type (value_type (arg2), tem, "range"); + if (!type) + type = value_type (arg1); - arg3 = ada_array_bound (arg2, tem, 1); - arg2 = ada_array_bound (arg2, tem, 0); + arg3 = value_from_longest (type, ada_array_bound (arg2, tem, 1)); + arg2 = value_from_longest (type, ada_array_bound (arg2, tem, 0)); binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg3); @@ -9112,29 +9095,27 @@ ada_evaluate_subexp (struct type *expect if (ada_is_packed_array_type (value_type (arg1))) arg1 = ada_coerce_to_simple_array (arg1); - if (tem < 1 || tem > ada_array_arity (value_type (arg1))) - error (_("invalid dimension number to '%s"), - ada_attribute_name (op)); + type = ada_index_type (value_type (arg1), tem, + ada_attribute_name (op)); + if (type == NULL) + type = builtin_type (exp->gdbarch)->builtin_int; if (noside == EVAL_AVOID_SIDE_EFFECTS) - { - type = ada_index_type (value_type (arg1), tem); - if (type == NULL) - error - (_("attempt to take bound of something that is not an array")); - return allocate_value (type); - } + return allocate_value (type); switch (op) { default: /* Should never happen. */ error (_("unexpected attribute encountered")); case OP_ATR_FIRST: - return ada_array_bound (arg1, tem, 0); + return value_from_longest + (type, ada_array_bound (arg1, tem, 0)); case OP_ATR_LAST: - return ada_array_bound (arg1, tem, 1); + return value_from_longest + (type, ada_array_bound (arg1, tem, 1)); case OP_ATR_LENGTH: - return ada_array_length (arg1, tem); + return value_from_longest + (type, ada_array_length (arg1, tem)); } } else if (discrete_type_p (type_arg)) @@ -9170,14 +9151,10 @@ ada_evaluate_subexp (struct type *expect if (ada_is_packed_array_type (type_arg)) type_arg = decode_packed_array_type (type_arg); - if (tem < 1 || tem > ada_array_arity (type_arg)) - error (_("invalid dimension number to '%s"), - ada_attribute_name (op)); - - type = ada_index_type (type_arg, tem); + type = ada_index_type (type_arg, tem, ada_attribute_name (op)); if (type == NULL) - error - (_("attempt to take bound of something that is not an array")); + type = builtin_type (exp->gdbarch)->builtin_int; + if (noside == EVAL_AVOID_SIDE_EFFECTS) return allocate_value (type); @@ -9186,14 +9163,14 @@ ada_evaluate_subexp (struct type *expect default: error (_("unexpected attribute encountered")); case OP_ATR_FIRST: - low = ada_array_bound_from_type (type_arg, tem, 0, &type); + low = ada_array_bound_from_type (type_arg, tem, 0); return value_from_longest (type, low); case OP_ATR_LAST: - high = ada_array_bound_from_type (type_arg, tem, 1, &type); + high = ada_array_bound_from_type (type_arg, tem, 1); return value_from_longest (type, high); case OP_ATR_LENGTH: - low = ada_array_bound_from_type (type_arg, tem, 0, &type); - high = ada_array_bound_from_type (type_arg, tem, 1, NULL); + low = ada_array_bound_from_type (type_arg, tem, 0); + high = ada_array_bound_from_type (type_arg, tem, 1); return value_from_longest (type, high - low + 1); } } Index: gdb-head/gdb/ada-lang.h =================================================================== --- gdb-head.orig/gdb/ada-lang.h +++ gdb-head/gdb/ada-lang.h @@ -284,10 +284,6 @@ extern int ada_is_array_descriptor_type extern int ada_is_bogus_array_descriptor (struct type *); -extern struct type *ada_index_type (struct type *, int); - -extern struct value *ada_array_bound (struct value *, int, int); - extern char *ada_decode_symbol (const struct general_symbol_info*); extern const char *ada_decode (const char*); -- Dr. Ulrich Weigand GNU Toolchain for Linux on System z and Cell BE Ulrich.Weigand@de.ibm.com