From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22335 invoked by alias); 13 Feb 2012 15:14:44 -0000 Received: (qmail 22326 invoked by uid 22791); 13 Feb 2012 15:14:43 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 13 Feb 2012 15:14:29 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 1501C290057; Mon, 13 Feb 2012 16:14:28 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f9VrFCIfI4yH; Mon, 13 Feb 2012 16:14:28 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 01C3C290051; Mon, 13 Feb 2012 16:14:28 +0100 (CET) From: Tristan Gingold Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: RFA: [Ada] extract known tasks array parameters from symbol table Date: Mon, 13 Feb 2012 15:14:00 -0000 Message-Id: <7A06C670-A574-4AE4-A89C-2532671E5F64@adacore.com> Cc: Joel Brobecker To: "gdb-patches@sourceware.org ml" Mime-Version: 1.0 (Apple Message framework v1257) X-IsSubscribed: yes 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: 2012-02/txt/msg00237.txt.bz2 Hi, while trying to use 'info tasks' on VMS, I hit an issue with the known_task= s array business, because the elements are only 32 bit pointers on VMS. I = took the occasion to make the code more generic and getting rid of the fixe= d parameters. So this patch now tries to extract array size and element ty= pe from the symbol table first, and fall back to the minsymtab in case of e= rror. Maybe we should get rid of the fallback, as without debug symbol for Ada.Ta= sking, the whole ada-tasks.c code is pretty useless. Manually tested on ia64-hp-openvms. Tristan. gdb/ 2012-02-13 Tristan Gingold * ada-tasks.c (struct ada_tasks_inferior_data): Add known_tasks_element and known_tasks_length fields. (read_known_tasks_array): Change argument type. Use pointer type and number of elements from DATA. Adjust. (read_known_tasks_list): Likewise. (get_known_tasks_addr): Change profile. Try symtab first, and extract type and size from it. (ada_set_current_inferior_known_tasks_addr): Adjust for above change. diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c index 274d83a..45b597f 100644 --- a/gdb/ada-tasks.c +++ b/gdb/ada-tasks.c @@ -215,6 +215,12 @@ struct ada_tasks_inferior_data above. */ CORE_ADDR known_tasks_addr; =20 + /* Type of elements of the known task. Usually a pointer. */ + struct type *known_tasks_element; + + /* Number of elements in the known tasks array. */ + unsigned int known_tasks_length; + /* When nonzero, this flag indicates that the task_list field below is up to date. When set to zero, the list has either not been initialized, or has potentially become stale. */ @@ -774,24 +780,21 @@ add_ada_task (CORE_ADDR task_id, struct inferior *inf) it in the current inferior's TASK_LIST. Return non-zero upon success. = */ =20 static int -read_known_tasks_array (CORE_ADDR known_tasks_addr) +read_known_tasks_array (struct ada_tasks_inferior_data *data) { - const int target_ptr_byte =3D - gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT; - const int known_tasks_size =3D target_ptr_byte * MAX_NUMBER_OF_KNOWN_TAS= KS; + const int target_ptr_byte =3D TYPE_LENGTH (data->known_tasks_element); + const int known_tasks_size =3D target_ptr_byte * data->known_tasks_lengt= h; gdb_byte *known_tasks =3D alloca (known_tasks_size); int i; =20 /* Build a new list by reading the ATCBs from the Known_Tasks array in the Ada runtime. */ - read_memory (known_tasks_addr, known_tasks, known_tasks_size); - for (i =3D 0; i < MAX_NUMBER_OF_KNOWN_TASKS; i++) + read_memory (data->known_tasks_addr, known_tasks, known_tasks_size); + for (i =3D 0; i < data->known_tasks_length; i++) { - struct type *data_ptr_type =3D - builtin_type (target_gdbarch)->builtin_data_ptr; CORE_ADDR task_id =3D extract_typed_address (known_tasks + i * target_ptr_byte, - data_ptr_type); + data->known_tasks_element); =20 if (task_id !=3D 0) add_ada_task (task_id, current_inferior ()); @@ -804,13 +807,10 @@ read_known_tasks_array (CORE_ADDR known_tasks_addr) the current inferior's TASK_LIST. Return non-zero upon success. */ =20 static int -read_known_tasks_list (CORE_ADDR known_tasks_addr) +read_known_tasks_list (struct ada_tasks_inferior_data *data) { - const int target_ptr_byte =3D - gdbarch_ptr_bit (target_gdbarch) / TARGET_CHAR_BIT; + const int target_ptr_byte =3D TYPE_LENGTH (data->known_tasks_element); gdb_byte *known_tasks =3D alloca (target_ptr_byte); - struct type *data_ptr_type =3D - builtin_type (target_gdbarch)->builtin_data_ptr; CORE_ADDR task_id; const struct ada_tasks_pspace_data *pspace_data =3D get_ada_tasks_pspace_data (current_program_space); @@ -820,8 +820,8 @@ read_known_tasks_list (CORE_ADDR known_tasks_addr) return 0; =20 /* Build a new list by reading the ATCBs. Read head of the list. */ - read_memory (known_tasks_addr, known_tasks, target_ptr_byte); - task_id =3D extract_typed_address (known_tasks, data_ptr_type); + read_memory (data->known_tasks_addr, known_tasks, target_ptr_byte); + task_id =3D extract_typed_address (known_tasks, data->known_tasks_elemen= t); while (task_id !=3D 0) { struct value *tcb_value; @@ -841,21 +841,85 @@ read_known_tasks_list (CORE_ADDR known_tasks_addr) return 1; } =20 -/* Return the address of the variable NAME that contains all the known - tasks maintained in the Ada Runtime. Return NULL if the variable - could not be found, meaning that the inferior program probably does - not use tasking. */ +/* Try method KIND to extract known tasks info for DATA. + Return non-zero in case of success, and set the known tasks field of DA= TA. +*/ =20 -static CORE_ADDR -get_known_tasks_addr (const char *name) +static int +get_known_tasks_addr (struct ada_tasks_inferior_data *data, + enum ada_known_tasks_kind kind) { + const char *name; struct minimal_symbol *msym; + struct symbol *sym; + + switch (kind) + { + case ADA_TASKS_ARRAY: + name =3D KNOWN_TASKS_NAME; + break; + case ADA_TASKS_LIST: + name =3D KNOWN_TASKS_LIST; + break; + default: + /* Should never happen, but be safe. */ + return 0; + } + + /* First try psymtab/symtab. */ + sym =3D lookup_symbol_in_language (name, NULL, VAR_DOMAIN, language_c, N= ULL); =20 + if (sym !=3D NULL) + { + /* Validate. */ + struct type *type =3D check_typedef (SYMBOL_TYPE (sym)); + struct type *eltype; + struct type *idxtype; + + switch (kind) + { + case ADA_TASKS_ARRAY: + if (TYPE_CODE (type) =3D=3D TYPE_CODE_ARRAY + && (eltype =3D check_typedef (TYPE_TARGET_TYPE (type))) + && TYPE_CODE (eltype) =3D=3D TYPE_CODE_PTR + && (idxtype =3D check_typedef (TYPE_INDEX_TYPE (type))) + && !TYPE_LOW_BOUND_UNDEFINED (idxtype) + && !TYPE_HIGH_BOUND_UNDEFINED (idxtype)) + { + data->known_tasks_kind =3D ADA_TASKS_ARRAY; + data->known_tasks_addr =3D SYMBOL_VALUE_ADDRESS (sym); + data->known_tasks_element =3D eltype; + data->known_tasks_length =3D + TYPE_HIGH_BOUND (idxtype) - TYPE_LOW_BOUND (idxtype) + 1; + return 1; + } + break; + case ADA_TASKS_LIST: + if (TYPE_CODE (type) =3D=3D TYPE_CODE_PTR) + { + data->known_tasks_kind =3D ADA_TASKS_LIST; + data->known_tasks_addr =3D SYMBOL_VALUE_ADDRESS (sym); + data->known_tasks_element =3D type; + data->known_tasks_length =3D 1; + return 1; + } + break; + default: + break; + } + } + + /* Fallback using minsymtab. */ msym =3D lookup_minimal_symbol (name, NULL, NULL); if (msym =3D=3D NULL) return 0; =20 - return SYMBOL_VALUE_ADDRESS (msym); + data->known_tasks_kind =3D kind; + data->known_tasks_addr =3D SYMBOL_VALUE_ADDRESS (msym); + data->known_tasks_element =3D builtin_type (target_gdbarch)->builtin_dat= a_ptr; + data->known_tasks_length =3D + (kind =3D=3D ADA_TASKS_ARRAY) ? MAX_NUMBER_OF_KNOWN_TASKS : 1; + return 1; } =20 /* Assuming DATA is the ada-tasks' data for the current inferior, @@ -865,26 +929,14 @@ get_known_tasks_addr (const char *name) static void ada_set_current_inferior_known_tasks_addr (struct ada_tasks_inferior_data = *data) { - CORE_ADDR known_tasks_addr; - if (data->known_tasks_kind !=3D ADA_TASKS_UNKNOWN) return; =20 - known_tasks_addr =3D get_known_tasks_addr (KNOWN_TASKS_NAME); - if (known_tasks_addr !=3D 0) - { - data->known_tasks_kind =3D ADA_TASKS_ARRAY; - data->known_tasks_addr =3D known_tasks_addr; - return; - } + if (get_known_tasks_addr (data, ADA_TASKS_ARRAY)) + return; =20 - known_tasks_addr =3D get_known_tasks_addr (KNOWN_TASKS_LIST); - if (known_tasks_addr !=3D 0) - { - data->known_tasks_kind =3D ADA_TASKS_LIST; - data->known_tasks_addr =3D known_tasks_addr; - return; - } + if (get_known_tasks_addr (data, ADA_TASKS_LIST)) + return; =20 data->known_tasks_kind =3D ADA_TASKS_NOT_FOUND; data->known_tasks_addr =3D 0; @@ -917,9 +969,9 @@ read_known_tasks (void) case ADA_TASKS_NOT_FOUND: /* Tasking not in use in inferior. */ return 0; case ADA_TASKS_ARRAY: - return read_known_tasks_array (data->known_tasks_addr); + return read_known_tasks_array (data); case ADA_TASKS_LIST: - return read_known_tasks_list (data->known_tasks_addr); + return read_known_tasks_list (data); } =20 /* Step 3: Set task_list_valid_p, to avoid re-reading the Known_Tasks