X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fada-lang.h;h=024550f1297f098cb9ed49d03dee22cdd4ed2538;hb=659948a49877c238eecbd5117a8651a897496810;hp=99059090237b5adc437890bea9ee29fb4af72377;hpb=01f0fe5e0450edf168c1f612feb93cf588e4e7ea;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index 9905909023..024550f129 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -1,24 +1,22 @@ /* Ada language support definitions for GDB, the GNU debugger. - Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #if !defined (ADA_LANG_H) #define ADA_LANG_H 1 @@ -81,142 +79,66 @@ struct ada_opname_map /* Defined in ada-lang.c */ extern const struct ada_opname_map ada_opname_table[]; -enum ada_operator - { - /* X IN A'RANGE(N). N is an immediate operand, surrounded by - BINOP_IN_BOUNDS before and after. A is an array, X an index - value. Evaluates to true iff X is within range of the Nth - dimension (1-based) of A. (A multi-dimensional array - type is represented as array of array of ...) */ - BINOP_IN_BOUNDS = OP_EXTENDED0, - - /* X IN L .. U. True iff L <= X <= U. */ - TERNOP_IN_RANGE, - - /* Ada attributes ('Foo). */ - OP_ATR_FIRST, - OP_ATR_LAST, - OP_ATR_LENGTH, - OP_ATR_IMAGE, - OP_ATR_MAX, - OP_ATR_MIN, - OP_ATR_MODULUS, - OP_ATR_POS, - OP_ATR_SIZE, - OP_ATR_TAG, - OP_ATR_VAL, - - /* Ada type qualification. It is encoded as for UNOP_CAST, above, - and denotes the TYPE'(EXPR) construct. */ - UNOP_QUAL, - - /* X IN TYPE. The `TYPE' argument is immediate, with - UNOP_IN_RANGE before and after it. True iff X is a member of - type TYPE (typically a subrange). */ - UNOP_IN_RANGE, - - /* An aggregate. A single immediate operand, N>0, gives - the number of component specifications that follow. The - immediate operand is followed by a second OP_AGGREGATE. - Next come N component specifications. A component - specification is either an OP_OTHERS (others=>...), an - OP_CHOICES (for named associations), or other expression (for - positional aggregates only). Aggregates currently - occur only as the right sides of assignments. */ - OP_AGGREGATE, - - /* An others clause. Followed by a single expression. */ - OP_OTHERS, - - /* An aggregate component association. A single immediate operand, N, - gives the number of choices that follow. This is followed by a second - OP_CHOICES operator. Next come N operands, each of which is an - expression, an OP_DISCRETE_RANGE, or an OP_NAME---the latter - for a simple name that must be a record component name and does - not correspond to a single existing symbol. After the N choice - indicators comes an expression giving the value. - - In an aggregate such as (X => E1, ...), where X is a simple - name, X could syntactically be either a component_selector_name - or an expression used as a discrete_choice, depending on the - aggregate's type context. Since this is not known at parsing - time, we don't attempt to disambiguate X if it has multiple - definitions, but instead supply an OP_NAME. If X has a single - definition, we represent it with an OP_VAR_VALUE, even though - it may turn out to be within a record aggregate. Aggregate - evaluation can use either OP_NAMEs or OP_VAR_VALUEs to get a - record field name, and can evaluate OP_VAR_VALUE normally to - get its value as an expression. Unfortunately, we lose out in - cases where X has multiple meanings and is part of an array - aggregate. I hope these are not common enough to annoy users, - who can work around the problem in any case by putting - parentheses around X. */ - OP_CHOICES, - - /* A positional aggregate component association. The operator is - followed by a single integer indicating the position in the - aggregate (0-based), followed by a second OP_POSITIONAL. Next - follows a single expression giving the component value. */ - OP_POSITIONAL, - - /* A range of values. Followed by two expressions giving the - upper and lower bounds of the range. */ - OP_DISCRETE_RANGE, - - /* End marker */ - OP_ADA_LAST - }; - -/* A triple, (symbol, block, symtab), representing one instance of a +/* A tuple, (symbol, block), representing one instance of a * symbol-lookup operation. */ struct ada_symbol_info { struct symbol* sym; struct block* block; - struct symtab* symtab; }; -/* Ada task structures. */ - -/* Ada task control block, as defined in the GNAT runt-time library. */ +/* Denotes a type of renaming symbol (see ada_parse_renaming). */ +enum ada_renaming_category + { + /* Indicates a symbol that does not encode a renaming. */ + ADA_NOT_RENAMING, + + /* For symbols declared + Foo : TYPE renamed OBJECT; */ + ADA_OBJECT_RENAMING, + + /* For symbols declared + Foo : exception renames EXCEPTION; */ + ADA_EXCEPTION_RENAMING, + /* For packages declared + package Foo renames PACKAGE; */ + ADA_PACKAGE_RENAMING, + /* For subprograms declared + SUBPROGRAM_SPEC renames SUBPROGRAM; + (Currently not used). */ + ADA_SUBPROGRAM_RENAMING + }; -struct task_control_block -{ - char state; - CORE_ADDR parent; - int priority; - char image [32]; - int image_len; /* This field is not always present in the ATCB. */ - CORE_ADDR call; - CORE_ADDR thread; - CORE_ADDR lwp; /* This field is not always present in the ATCB. */ - - /* If the task is waiting on a task entry, this field contains the - task_id of the other task. */ - CORE_ADDR called_task; -}; +/* Ada task structures. */ -struct task_ptid +struct ada_task_info { - int pid; /* The Process id */ - long lwp; /* The Light Weight Process id */ - long tid; /* The Thread id */ -}; -typedef struct task_ptid task_ptid_t; + /* The PTID of the thread that this task runs on. This ptid is computed + in a target-dependent way from the associated Task Control Block. */ + ptid_t ptid; -struct task_entry -{ + /* The ID of the task. */ CORE_ADDR task_id; - struct task_control_block atcb; - int task_num; - int known_tasks_index; - struct task_entry *next_task; - task_ptid_t task_ptid; - int stack_per; -}; -/* task entry list. */ -extern struct task_entry *task_list; + /* The name of the task. */ + char name[257]; + + /* The current state of the task. */ + int state; + /* The priority associated to the task. */ + int priority; + + /* If non-zero, the task ID of the parent task. */ + CORE_ADDR parent; + + /* If the task is waiting on a task entry, this field contains + the ID of the other task. Zero otherwise. */ + CORE_ADDR called_task; + + /* If the task is accepting a rendezvous with another task, this field + contains the ID of the calling task. Zero otherwise. */ + CORE_ADDR caller_task; +}; /* Assuming V points to an array of S objects, make sure that it contains at least M objects, updating V and S as necessary. */ @@ -239,27 +161,26 @@ extern void ada_print_type (struct type *, char *, struct ui_file *, int, int); extern int ada_val_print (struct type *, const gdb_byte *, int, CORE_ADDR, - struct ui_file *, int, int, int, - enum val_prettyprint); + struct ui_file *, int, + const struct value_print_options *); -extern int ada_value_print (struct value *, struct ui_file *, int, - enum val_prettyprint); +extern int ada_value_print (struct value *, struct ui_file *, + const struct value_print_options *); /* Defined in ada-lang.c */ -extern struct value *value_from_contents_and_address (struct type *, - const gdb_byte *, - CORE_ADDR); +extern void ada_emit_char (int, struct type *, struct ui_file *, int, int); -extern void ada_emit_char (int, struct ui_file *, int, int); +extern void ada_printchar (int, struct type *, struct ui_file *); -extern void ada_printchar (int, struct ui_file *); +extern void ada_printstr (struct ui_file *, struct type *, const gdb_byte *, + unsigned int, int, + const struct value_print_options *); -extern void ada_printstr (struct ui_file *, const gdb_byte *, - unsigned int, int, int); - -extern void ada_convert_actuals (struct value *, int, struct value **, - CORE_ADDR *); +struct value *ada_convert_actual (struct value *actual, + struct type *formal_type0, + struct gdbarch *gdbarch, + CORE_ADDR *sp); extern struct value *ada_value_subscript (struct value *, int, struct value **); @@ -278,9 +199,9 @@ extern int ada_is_array_descriptor_type (struct type *); extern int ada_is_bogus_array_descriptor (struct type *); -extern struct type *ada_index_type (struct type *, int); +extern LONGEST ada_discrete_type_low_bound (struct type *); -extern struct value *ada_array_bound (struct value *, int, int); +extern LONGEST ada_discrete_type_high_bound (struct type *); extern char *ada_decode_symbol (const struct general_symbol_info*); @@ -291,17 +212,17 @@ extern enum language ada_update_initial_language (enum language, extern void clear_ada_sym_cache (void); -extern char **ada_make_symbol_completion_list (const char *text0, - const char *word); - extern int ada_lookup_symbol_list (const char *, const struct block *, domain_enum, struct ada_symbol_info**); extern char *ada_fold_name (const char *); extern struct symbol *ada_lookup_symbol (const char *, const struct block *, - domain_enum, int *, - struct symtab **); + domain_enum, int *); + +extern struct symbol * +ada_lookup_encoded_symbol (const char *, const struct block *, + domain_enum namespace, struct block **); extern struct minimal_symbol *ada_lookup_simple_minsym (const char *); @@ -326,7 +247,7 @@ extern struct type *ada_parent_type (struct type *); extern int ada_is_ignored_field (struct type *, int); -extern int ada_is_packed_array_type (struct type *); +extern int ada_is_constrained_packed_array_type (struct type *); extern struct value *ada_value_primitive_packed_val (struct value *, const gdb_byte *, @@ -396,7 +317,8 @@ extern int ada_which_variant_applies (struct type *, struct type *, const gdb_byte *); extern struct type *ada_to_fixed_type (struct type *, const gdb_byte *, - CORE_ADDR, struct value *); + CORE_ADDR, struct value *, + int check_tag); extern struct type *ada_template_to_fixed_record_type_1 (struct type *type, const gdb_byte *valaddr, @@ -440,11 +362,11 @@ extern void ada_print_scalar (struct type *, LONGEST, struct ui_file *); extern int ada_is_range_type_name (const char *); -extern const char *ada_renaming_type (struct type *); - -extern int ada_is_object_renaming (struct symbol *); +extern enum ada_renaming_category ada_parse_renaming (struct symbol *, + const char **, + int *, const char **); -extern char *ada_simple_renamed_entity (struct symbol *); +extern void ada_find_printable_frame (struct frame_info *fi); extern char *ada_breakpoint_rewrite (char *, int *); @@ -454,36 +376,21 @@ extern char *ada_main_name (void); extern int valid_task_id (int); -extern void init_task_list (void); - -extern int ada_is_exception_breakpoint (bpstat bs); - -extern void ada_adjust_exception_stop (bpstat bs); - -extern void ada_print_exception_stop (bpstat bs); - -extern int ada_get_current_task (ptid_t); +extern int ada_get_task_number (ptid_t); -extern int breakpoint_ada_task_match (CORE_ADDR, ptid_t); - -extern int ada_print_exception_breakpoint_nontask (struct breakpoint *); - -extern void ada_print_exception_breakpoint_task (struct breakpoint *); - -extern void ada_find_printable_frame (struct frame_info *fi); +extern int ada_build_task_list (int warn_if_null); -extern void ada_reset_thread_registers (void); +extern int ada_exception_catchpoint_p (struct breakpoint *b); + +extern struct symtab_and_line + ada_decode_exception_location (char *args, char **addr_string, + char **exp_string, char **cond_string, + struct expression **cond, + struct breakpoint_ops **ops); -extern int ada_build_task_list (void); +extern struct symtab_and_line + ada_decode_assert_location (char *args, char **addr_string, + struct breakpoint_ops **ops); -/* Look up a symbol by name using the search conventions of - a specific language (optional block, optional symtab). - FIXME: Should be symtab.h. */ -extern struct symbol *lookup_symbol_in_language (const char *, - const struct block *, - domain_enum, - enum language, - int *, - struct symtab **); #endif