diff options
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/ada-operator.def | 99 | ||||
| -rw-r--r-- | gdb/ada-operator.inc | 102 | ||||
| -rw-r--r-- | gdb/expprint.c | 175 | ||||
| -rw-r--r-- | gdb/expression.h | 341 | ||||
| -rw-r--r-- | gdb/std-operator.def | 327 |
6 files changed, 457 insertions, 600 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3473063cb04..f68051c81ba 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2011-02-01 Jan Kratochvil <jan.kratochvil@redhat.com> + + Fix debug printing of BINOP_IN, OP_OBJC_MSGCALL, + OP_F77_UNDETERMINED_ARGLIST, OP_COMPLEX, OP_OBJC_SELECTOR, OP_NAME, + OP_OBJC_NSSTRING, OP_F90_RANGE and OP_DECFLOAT. + * ada-operator.inc: Rename the file to ... + * ada-operator.def: ... here, wrap all the entries by macro OP. + * expprint.c (op_name_standard): Remove all the entries. Include + "std-operator.def" instead. + * expression.h (enum exp_opcode): Include "std-operator.def" and + "ada-operator.def". Move all the entries ... + * std-operator.def: ... here, wrap all the entries by macro OP. + 2011-01-31 Paul Pluzhnikov <ppluzhnikov@google.com> * breakpoint.h (remove_jit_event_breakpoints): New prototype. diff --git a/gdb/ada-operator.def b/gdb/ada-operator.def new file mode 100644 index 00000000000..c3dc8e17160 --- /dev/null +++ b/gdb/ada-operator.def @@ -0,0 +1,99 @@ +/* Ada language operator definitions for GDB, the GNU debugger. + + Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + + 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 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* 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 ...) */ +OP (BINOP_IN_BOUNDS) + +/* X IN L .. U. True iff L <= X <= U. */ +OP (TERNOP_IN_RANGE) + +/* Ada attributes ('Foo). */ +OP (OP_ATR_FIRST) +OP (OP_ATR_LAST) +OP (OP_ATR_LENGTH) +OP (OP_ATR_IMAGE) +OP (OP_ATR_MAX) +OP (OP_ATR_MIN) +OP (OP_ATR_MODULUS) +OP (OP_ATR_POS) +OP (OP_ATR_SIZE) +OP (OP_ATR_TAG) +OP (OP_ATR_VAL) + +/* Ada type qualification. It is encoded as for UNOP_CAST, above, + and denotes the TYPE'(EXPR) construct. */ +OP (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). */ +OP (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 (OP_AGGREGATE) + +/* An others clause. Followed by a single expression. */ +OP (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 (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 (OP_POSITIONAL) + +/* A range of values. Followed by two expressions giving the + upper and lower bounds of the range. */ +OP (OP_DISCRETE_RANGE) diff --git a/gdb/ada-operator.inc b/gdb/ada-operator.inc deleted file mode 100644 index 1478b48360b..00000000000 --- a/gdb/ada-operator.inc +++ /dev/null @@ -1,102 +0,0 @@ -/* Ada language operator definitions for GDB, the GNU debugger. - - Copyright (C) 1992, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - - 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 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. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - /* 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, diff --git a/gdb/expprint.c b/gdb/expprint.c index 815294399e2..1d2ce8534ee 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -646,176 +646,11 @@ op_name_standard (enum exp_opcode opcode) sprintf (buf, "<unknown %d>", opcode); return buf; } - case OP_NULL: - return "OP_NULL"; - case BINOP_ADD: - return "BINOP_ADD"; - case BINOP_SUB: - return "BINOP_SUB"; - case BINOP_MUL: - return "BINOP_MUL"; - case BINOP_DIV: - return "BINOP_DIV"; - case BINOP_REM: - return "BINOP_REM"; - case BINOP_MOD: - return "BINOP_MOD"; - case BINOP_LSH: - return "BINOP_LSH"; - case BINOP_RSH: - return "BINOP_RSH"; - case BINOP_LOGICAL_AND: - return "BINOP_LOGICAL_AND"; - case BINOP_LOGICAL_OR: - return "BINOP_LOGICAL_OR"; - case BINOP_BITWISE_AND: - return "BINOP_BITWISE_AND"; - case BINOP_BITWISE_IOR: - return "BINOP_BITWISE_IOR"; - case BINOP_BITWISE_XOR: - return "BINOP_BITWISE_XOR"; - case BINOP_EQUAL: - return "BINOP_EQUAL"; - case BINOP_NOTEQUAL: - return "BINOP_NOTEQUAL"; - case BINOP_LESS: - return "BINOP_LESS"; - case BINOP_GTR: - return "BINOP_GTR"; - case BINOP_LEQ: - return "BINOP_LEQ"; - case BINOP_GEQ: - return "BINOP_GEQ"; - case BINOP_REPEAT: - return "BINOP_REPEAT"; - case BINOP_ASSIGN: - return "BINOP_ASSIGN"; - case BINOP_COMMA: - return "BINOP_COMMA"; - case BINOP_SUBSCRIPT: - return "BINOP_SUBSCRIPT"; - case MULTI_SUBSCRIPT: - return "MULTI_SUBSCRIPT"; - case BINOP_EXP: - return "BINOP_EXP"; - case BINOP_MIN: - return "BINOP_MIN"; - case BINOP_MAX: - return "BINOP_MAX"; - case STRUCTOP_MEMBER: - return "STRUCTOP_MEMBER"; - case STRUCTOP_MPTR: - return "STRUCTOP_MPTR"; - case BINOP_INTDIV: - return "BINOP_INTDIV"; - case BINOP_ASSIGN_MODIFY: - return "BINOP_ASSIGN_MODIFY"; - case BINOP_VAL: - return "BINOP_VAL"; - case BINOP_CONCAT: - return "BINOP_CONCAT"; - case BINOP_RANGE: - return "BINOP_RANGE"; - case BINOP_END: - return "BINOP_END"; - case TERNOP_COND: - return "TERNOP_COND"; - case TERNOP_SLICE: - return "TERNOP_SLICE"; - case TERNOP_SLICE_COUNT: - return "TERNOP_SLICE_COUNT"; - case OP_LONG: - return "OP_LONG"; - case OP_DOUBLE: - return "OP_DOUBLE"; - case OP_VAR_VALUE: - return "OP_VAR_VALUE"; - case OP_LAST: - return "OP_LAST"; - case OP_REGISTER: - return "OP_REGISTER"; - case OP_INTERNALVAR: - return "OP_INTERNALVAR"; - case OP_FUNCALL: - return "OP_FUNCALL"; - case OP_STRING: - return "OP_STRING"; - case OP_BITSTRING: - return "OP_BITSTRING"; - case OP_ARRAY: - return "OP_ARRAY"; - case UNOP_CAST: - return "UNOP_CAST"; - case UNOP_DYNAMIC_CAST: - return "UNOP_DYNAMIC_CAST"; - case UNOP_REINTERPRET_CAST: - return "UNOP_REINTERPRET_CAST"; - case UNOP_MEMVAL: - return "UNOP_MEMVAL"; - case UNOP_MEMVAL_TLS: - return "UNOP_MEMVAL_TLS"; - case UNOP_NEG: - return "UNOP_NEG"; - case UNOP_LOGICAL_NOT: - return "UNOP_LOGICAL_NOT"; - case UNOP_COMPLEMENT: - return "UNOP_COMPLEMENT"; - case UNOP_IND: - return "UNOP_IND"; - case UNOP_ADDR: - return "UNOP_ADDR"; - case UNOP_PREINCREMENT: - return "UNOP_PREINCREMENT"; - case UNOP_POSTINCREMENT: - return "UNOP_POSTINCREMENT"; - case UNOP_PREDECREMENT: - return "UNOP_PREDECREMENT"; - case UNOP_POSTDECREMENT: - return "UNOP_POSTDECREMENT"; - case UNOP_SIZEOF: - return "UNOP_SIZEOF"; - case UNOP_PLUS: - return "UNOP_PLUS"; - case UNOP_CAP: - return "UNOP_CAP"; - case UNOP_CHR: - return "UNOP_CHR"; - case UNOP_ORD: - return "UNOP_ORD"; - case UNOP_ABS: - return "UNOP_ABS"; - case UNOP_FLOAT: - return "UNOP_FLOAT"; - case UNOP_HIGH: - return "UNOP_HIGH"; - case UNOP_MAX: - return "UNOP_MAX"; - case UNOP_MIN: - return "UNOP_MIN"; - case UNOP_ODD: - return "UNOP_ODD"; - case UNOP_TRUNC: - return "UNOP_TRUNC"; - case OP_BOOL: - return "OP_BOOL"; - case OP_M2_STRING: - return "OP_M2_STRING"; - case STRUCTOP_STRUCT: - return "STRUCTOP_STRUCT"; - case STRUCTOP_PTR: - return "STRUCTOP_PTR"; - case OP_THIS: - return "OP_THIS"; - case OP_OBJC_SELF: - return "OP_OBJC_SELF"; - case OP_SCOPE: - return "OP_SCOPE"; - case OP_TYPE: - return "OP_TYPE"; - case OP_LABELED: - return "OP_LABELED"; - case OP_ADL_FUNC: - return "OP_ADL_FUNC"; +#define OP(name) \ + case name: \ + return #name ; +#include "std-operator.def" +#undef OP } } diff --git a/gdb/expression.h b/gdb/expression.h index dc26d3b95f7..45f336e2b28 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -43,334 +43,19 @@ enum exp_opcode { - /* Used when it's necessary to pass an opcode which will be ignored, - or to catch uninitialized values. */ - OP_NULL, - -/* BINOP_... operate on two values computed by following subexpressions, - replacing them by one result value. They take no immediate arguments. */ - - BINOP_ADD, /* + */ - BINOP_SUB, /* - */ - BINOP_MUL, /* * */ - BINOP_DIV, /* / */ - BINOP_REM, /* % */ - BINOP_MOD, /* mod (Knuth 1.2.4) */ - BINOP_LSH, /* << */ - BINOP_RSH, /* >> */ - BINOP_LOGICAL_AND, /* && */ - BINOP_LOGICAL_OR, /* || */ - BINOP_BITWISE_AND, /* & */ - BINOP_BITWISE_IOR, /* | */ - BINOP_BITWISE_XOR, /* ^ */ - BINOP_EQUAL, /* == */ - BINOP_NOTEQUAL, /* != */ - BINOP_LESS, /* < */ - BINOP_GTR, /* > */ - BINOP_LEQ, /* <= */ - BINOP_GEQ, /* >= */ - BINOP_REPEAT, /* @ */ - BINOP_ASSIGN, /* = */ - BINOP_COMMA, /* , */ - BINOP_SUBSCRIPT, /* x[y] */ - BINOP_EXP, /* Exponentiation */ - - /* C++. */ - - BINOP_MIN, /* <? */ - BINOP_MAX, /* >? */ - - /* STRUCTOP_MEMBER is used for pointer-to-member constructs. - X . * Y translates into X STRUCTOP_MEMBER Y. */ - STRUCTOP_MEMBER, - - /* STRUCTOP_MPTR is used for pointer-to-member constructs - when X is a pointer instead of an aggregate. */ - STRUCTOP_MPTR, - - /* TYPE_INSTANCE is used when the user specifies a specific - type instantiation for overloaded methods/functions. - - The format is: - TYPE_INSTANCE num_types type0 ... typeN num_types TYPE_INSTANCE. */ - TYPE_INSTANCE, - - /* end of C++. */ - - /* For Modula-2 integer division DIV. */ - BINOP_INTDIV, - - BINOP_ASSIGN_MODIFY, /* +=, -=, *=, and so on. - The following exp_element is another opcode, - a BINOP_, saying how to modify. - Then comes another BINOP_ASSIGN_MODIFY, - making three exp_elements in total. */ - - /* Modula-2 standard (binary) procedures. */ - BINOP_VAL, - - /* Concatenate two operands, such as character strings or bitstrings. - If the first operand is a integer expression, then it means concatenate - the second operand with itself that many times. */ - BINOP_CONCAT, - - /* For (the deleted) Chill and Pascal. */ - BINOP_IN, /* Returns 1 iff ARG1 IN ARG2. */ - - /* This is the "colon operator" used various places in (the - deleted) Chill. */ - BINOP_RANGE, - - /* This must be the highest BINOP_ value, for expprint.c. */ - BINOP_END, - - /* Operates on three values computed by following subexpressions. */ - TERNOP_COND, /* ?: */ - - /* A sub-string/sub-array. (the deleted) Chill syntax: - OP1(OP2:OP3). Return elements OP2 through OP3 of OP1. */ - TERNOP_SLICE, - - /* A sub-string/sub-array. (The deleted) Chill syntax: OP1(OP2 UP - OP3). Return OP3 elements of OP1, starting with element - OP2. */ - TERNOP_SLICE_COUNT, - - /* Multidimensional subscript operator, such as Modula-2 x[a,b,...]. - The dimensionality is encoded in the operator, like the number of - function arguments in OP_FUNCALL, I.E. <OP><dimension><OP>. - The value of the first following subexpression is subscripted - by each of the next following subexpressions, one per dimension. */ - MULTI_SUBSCRIPT, - - /* The OP_... series take immediate following arguments. - After the arguments come another OP_... (the same one) - so that the grouping can be recognized from the end. */ - - /* OP_LONG is followed by a type pointer in the next exp_element - and the long constant value in the following exp_element. - Then comes another OP_LONG. - Thus, the operation occupies four exp_elements. */ - OP_LONG, - - /* OP_DOUBLE is similar but takes a DOUBLEST constant instead of a - long. */ - OP_DOUBLE, - - /* OP_VAR_VALUE takes one struct block * in the following element, - and one struct symbol * in the following exp_element, followed - by another OP_VAR_VALUE, making four exp_elements. If the - block is non-NULL, evaluate the symbol relative to the - innermost frame executing in that block; if the block is NULL - use the selected frame. */ - OP_VAR_VALUE, - - /* OP_LAST is followed by an integer in the next exp_element. - The integer is zero for the last value printed, - or it is the absolute number of a history element. - With another OP_LAST at the end, this makes three exp_elements. */ - OP_LAST, - - /* OP_REGISTER is followed by a string in the next exp_element. - This is the name of a register to fetch. */ - OP_REGISTER, - - /* OP_INTERNALVAR is followed by an internalvar ptr in the next - exp_element. With another OP_INTERNALVAR at the end, this - makes three exp_elements. */ - OP_INTERNALVAR, - - /* OP_FUNCALL is followed by an integer in the next exp_element. - The integer is the number of args to the function call. - That many plus one values from following subexpressions - are used, the first one being the function. - The integer is followed by a repeat of OP_FUNCALL, - making three exp_elements. */ - OP_FUNCALL, - - /* OP_OBJC_MSGCALL is followed by a string in the next exp_element - and then an integer. The string is the selector string. The - integer is the number of arguments to the message call. That - many plus one values are used, the first one being the object - pointer. This is an Objective C message. */ - OP_OBJC_MSGCALL, - - /* This is EXACTLY like OP_FUNCALL but is semantically different. - In F77, array subscript expressions, substring expressions and - function calls are all exactly the same syntactically. They - may only be disambiguated at runtime. Thus this operator, - which indicates that we have found something of the form - <name> ( <stuff> ). */ - OP_F77_UNDETERMINED_ARGLIST, - - /* OP_COMPLEX takes a type in the following element, followed by another - OP_COMPLEX, making three exp_elements. It is followed by two double - args, and converts them into a complex number of the given type. */ - OP_COMPLEX, - - /* OP_STRING represents a string constant. - Its format is the same as that of a STRUCTOP, but the string - data is just made into a string constant when the operation - is executed. */ - OP_STRING, - - /* OP_BITSTRING represents a packed bitstring constant. - Its format is the same as that of a STRUCTOP, but the bitstring - data is just made into a bitstring constant when the operation - is executed. */ - OP_BITSTRING, - - /* OP_ARRAY creates an array constant out of the following subexpressions. - It is followed by two exp_elements, the first containing an integer - that is the lower bound of the array and the second containing another - integer that is the upper bound of the array. The second integer is - followed by a repeat of OP_ARRAY, making four exp_elements total. - The bounds are used to compute the number of following subexpressions - to consume, as well as setting the bounds in the created array constant. - The type of the elements is taken from the type of the first subexp, - and they must all match. */ - OP_ARRAY, - - /* UNOP_CAST is followed by a type pointer in the next exp_element. - With another UNOP_CAST at the end, this makes three exp_elements. - It casts the value of the following subexpression. */ - UNOP_CAST, - - /* The C++ dynamic_cast operator. */ - UNOP_DYNAMIC_CAST, - - /* The C++ reinterpret_cast operator. */ - UNOP_REINTERPRET_CAST, - - /* UNOP_MEMVAL is followed by a type pointer in the next exp_element - With another UNOP_MEMVAL at the end, this makes three exp_elements. - It casts the contents of the word addressed by the value of the - following subexpression. */ - UNOP_MEMVAL, - - /* UNOP_MEMVAL_TLS is followed by a `struct objfile' pointer in the next - exp_element and a type pointer in the following exp_element. - With another UNOP_MEMVAL_TLS at the end, this makes four exp_elements. - It casts the contents of the word offsetted by the value of the - following subexpression from the TLS specified by `struct objfile'. */ - UNOP_MEMVAL_TLS, - - /* UNOP_... operate on one value from a following subexpression - and replace it with a result. They take no immediate arguments. */ - - UNOP_NEG, /* Unary - */ - UNOP_LOGICAL_NOT, /* Unary ! */ - UNOP_COMPLEMENT, /* Unary ~ */ - UNOP_IND, /* Unary * */ - UNOP_ADDR, /* Unary & */ - UNOP_PREINCREMENT, /* ++ before an expression */ - UNOP_POSTINCREMENT, /* ++ after an expression */ - UNOP_PREDECREMENT, /* -- before an expression */ - UNOP_POSTDECREMENT, /* -- after an expression */ - UNOP_SIZEOF, /* Unary sizeof (followed by expression) */ - - UNOP_PLUS, /* Unary plus */ - - UNOP_CAP, /* Modula-2 standard (unary) procedures */ - UNOP_CHR, - UNOP_ORD, - UNOP_ABS, - UNOP_FLOAT, - UNOP_HIGH, - UNOP_MAX, - UNOP_MIN, - UNOP_ODD, - UNOP_TRUNC, - - OP_BOOL, /* Modula-2 builtin BOOLEAN type */ - OP_M2_STRING, /* Modula-2 string constants */ - - /* STRUCTOP_... operate on a value from a following subexpression - by extracting a structure component specified by a string - that appears in the following exp_elements (as many as needed). - STRUCTOP_STRUCT is used for "." and STRUCTOP_PTR for "->". - They differ only in the error message given in case the value is - not suitable or the structure component specified is not found. - - The length of the string follows the opcode, followed by - BYTES_TO_EXP_ELEM(length) elements containing the data of the - string, followed by the length again and the opcode again. */ - - STRUCTOP_STRUCT, - STRUCTOP_PTR, - - /* C++: OP_THIS is just a placeholder for the class instance variable. - It just comes in a tight (OP_THIS, OP_THIS) pair. */ - OP_THIS, - - /* Objective-C: OP_OBJC_SELF is just a placeholder for the class - instance variable. It just comes in a tight (OP_OBJC_SELF, - OP_OBJC_SELF) pair. */ - OP_OBJC_SELF, - - /* Objective C: "@selector" pseudo-operator. */ - OP_OBJC_SELECTOR, - - /* OP_SCOPE surrounds a type name and a field name. The type - name is encoded as one element, but the field name stays as - a string, which, of course, is variable length. */ - OP_SCOPE, - - /* Used to represent named structure field values in brace - initializers (or tuples as they are called in (the deleted) - Chill). - - The gcc C syntax is NAME:VALUE or .NAME=VALUE, the (the - deleted) Chill syntax is .NAME:VALUE. Multiple labels (as in - the (the deleted) Chill syntax .NAME1,.NAME2:VALUE) is - represented as if it were .NAME1:(.NAME2:VALUE) (though that is - not valid (the deleted) Chill syntax). - - The NAME is represented as for STRUCTOP_STRUCT; VALUE follows. */ - OP_LABELED, - - /* OP_TYPE is for parsing types, and used with the "ptype" command - so we can look up types that are qualified by scope, either with - the GDB "::" operator, or the Modula-2 '.' operator. */ - OP_TYPE, - - /* An un-looked-up identifier. */ - OP_NAME, - - /* An Objective C Foundation Class NSString constant. */ - OP_OBJC_NSSTRING, - - /* A F90 array range operator (for "exp:exp", "exp:", ":exp" and ":"). */ - OP_F90_RANGE, - - /* OP_DECFLOAT is followed by a type pointer in the next exp_element - and a dec long constant value in the following exp_element. - Then comes another OP_DECFLOAT. */ - OP_DECFLOAT, - - /* OP_ADL_FUNC specifies that the function is to be looked up in an - Argument Dependent manner (Koenig lookup). */ - OP_ADL_FUNC, - - /* First extension operator. Individual language modules define - extra operators in *.inc include files below always starting with - numbering at OP_EXTENDED0: - BINOP_MOGRIFY = OP_EXTENDED0, - BINOP_FROB, - ... */ - OP_EXTENDED0, - - /* Last possible extension operator. Defined to provide an - explicit and finite number of extended operators. */ - OP_EXTENDED_LAST = 0xff, - /* NOTE: Eventually, we expect to convert to an object-oriented - formulation for expression operators that does away with the - need for these extension operators, and indeed for this - entire enumeration type. Therefore, consider the OP_EXTENDED - definitions to be a temporary measure. */ - - /* Each language specific set of operators starts at OP_EXTENDED0. */ -#include "ada-operator.inc" +#define OP(name) name , + +#include "std-operator.def" + + /* First extension operator. Individual language modules define extra + operators in *.def include files below with numbers higher than + OP_EXTENDED0. */ + OP (OP_EXTENDED0) + +/* Language specific operators. */ +#include "ada-operator.def" + +#undef OP /* Existing only to swallow the last comma (',') from last .inc file. */ OP_UNUSED_LAST diff --git a/gdb/std-operator.def b/gdb/std-operator.def new file mode 100644 index 00000000000..267215c8e8b --- /dev/null +++ b/gdb/std-operator.def @@ -0,0 +1,327 @@ +/* Standard language operator definitions for GDB, the GNU debugger. + + Copyright (C) 1986, 1989, 1992, 1994, 2000, 2003, 2005, 2007, 2008, 2009, + 2010, 2011 Free Software Foundation, Inc. + + 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 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Used when it's necessary to pass an opcode which will be ignored, + or to catch uninitialized values. */ +OP (OP_NULL) + +/* BINOP_... operate on two values computed by following subexpressions, +replacing them by one result value. They take no immediate arguments. */ + +OP (BINOP_ADD) /* + */ +OP (BINOP_SUB) /* - */ +OP (BINOP_MUL) /* * */ +OP (BINOP_DIV) /* / */ +OP (BINOP_REM) /* % */ +OP (BINOP_MOD) /* mod (Knuth 1.2.4) */ +OP (BINOP_LSH) /* << */ +OP (BINOP_RSH) /* >> */ +OP (BINOP_LOGICAL_AND) /* && */ +OP (BINOP_LOGICAL_OR) /* || */ +OP (BINOP_BITWISE_AND) /* & */ +OP (BINOP_BITWISE_IOR) /* | */ +OP (BINOP_BITWISE_XOR) /* ^ */ +OP (BINOP_EQUAL) /* == */ +OP (BINOP_NOTEQUAL) /* != */ +OP (BINOP_LESS) /* < */ +OP (BINOP_GTR) /* > */ +OP (BINOP_LEQ) /* <= */ +OP (BINOP_GEQ) /* >= */ +OP (BINOP_REPEAT) /* @ */ +OP (BINOP_ASSIGN) /* = */ +OP (BINOP_COMMA) /* , */ +OP (BINOP_SUBSCRIPT) /* x[y] */ +OP (BINOP_EXP) /* Exponentiation */ + +/* C++. */ + +OP (BINOP_MIN) /* <? */ +OP (BINOP_MAX) /* >? */ + +/* STRUCTOP_MEMBER is used for pointer-to-member constructs. + X . * Y translates into X STRUCTOP_MEMBER Y. */ +OP (STRUCTOP_MEMBER) + +/* STRUCTOP_MPTR is used for pointer-to-member constructs + when X is a pointer instead of an aggregate. */ +OP (STRUCTOP_MPTR) + +/* TYPE_INSTANCE is used when the user specifies a specific + type instantiation for overloaded methods/functions. + + The format is: + TYPE_INSTANCE num_types type0 ... typeN num_types TYPE_INSTANCE. */ +OP (TYPE_INSTANCE) + +/* end of C++. */ + +/* For Modula-2 integer division DIV. */ +OP (BINOP_INTDIV) + +/* +=, -=, *=, and so on. The following exp_element is another opcode, + a BINOP_, saying how to modify. Then comes another BINOP_ASSIGN_MODIFY, + making three exp_elements in total. */ +OP (BINOP_ASSIGN_MODIFY) + +/* Modula-2 standard (binary) procedures. */ +OP (BINOP_VAL) + +/* Concatenate two operands, such as character strings or bitstrings. + If the first operand is a integer expression, then it means concatenate + the second operand with itself that many times. */ +OP (BINOP_CONCAT) + +/* For (the deleted) Chill and Pascal. */ +OP (BINOP_IN) /* Returns 1 iff ARG1 IN ARG2. */ + +/* This is the "colon operator" used various places in (the + deleted) Chill. */ +OP (BINOP_RANGE) + +/* This must be the highest BINOP_ value, for expprint.c. */ +OP (BINOP_END) + +/* Operates on three values computed by following subexpressions. */ +OP (TERNOP_COND) /* ?: */ + +/* A sub-string/sub-array. (the deleted) Chill syntax: + OP1(OP2:OP3). Return elements OP2 through OP3 of OP1. */ +OP (TERNOP_SLICE) + +/* A sub-string/sub-array. (The deleted) Chill syntax: OP1(OP2 UP + OP3). Return OP3 elements of OP1, starting with element + OP2. */ +OP (TERNOP_SLICE_COUNT) + +/* Multidimensional subscript operator, such as Modula-2 x[a,b,...]. + The dimensionality is encoded in the operator, like the number of + function arguments in OP_FUNCALL, I.E. <OP><dimension><OP>. + The value of the first following subexpression is subscripted + by each of the next following subexpressions, one per dimension. */ +OP (MULTI_SUBSCRIPT) + +/* The OP_... series take immediate following arguments. + After the arguments come another OP_... (the same one) + so that the grouping can be recognized from the end. */ + +/* OP_LONG is followed by a type pointer in the next exp_element + and the long constant value in the following exp_element. + Then comes another OP_LONG. + Thus, the operation occupies four exp_elements. */ +OP (OP_LONG) + +/* OP_DOUBLE is similar but takes a DOUBLEST constant instead of a + long. */ +OP (OP_DOUBLE) + +/* OP_VAR_VALUE takes one struct block * in the following element, + and one struct symbol * in the following exp_element, followed + by another OP_VAR_VALUE, making four exp_elements. If the + block is non-NULL, evaluate the symbol relative to the + innermost frame executing in that block; if the block is NULL + use the selected frame. */ +OP (OP_VAR_VALUE) + +/* OP_LAST is followed by an integer in the next exp_element. + The integer is zero for the last value printed, + or it is the absolute number of a history element. + With another OP_LAST at the end, this makes three exp_elements. */ +OP (OP_LAST) + +/* OP_REGISTER is followed by a string in the next exp_element. + This is the name of a register to fetch. */ +OP (OP_REGISTER) + +/* OP_INTERNALVAR is followed by an internalvar ptr in the next + exp_element. With another OP_INTERNALVAR at the end, this + makes three exp_elements. */ +OP (OP_INTERNALVAR) + +/* OP_FUNCALL is followed by an integer in the next exp_element. + The integer is the number of args to the function call. + That many plus one values from following subexpressions + are used, the first one being the function. + The integer is followed by a repeat of OP_FUNCALL, + making three exp_elements. */ +OP (OP_FUNCALL) + +/* OP_OBJC_MSGCALL is followed by a string in the next exp_element + and then an integer. The string is the selector string. The + integer is the number of arguments to the message call. That + many plus one values are used, the first one being the object + pointer. This is an Objective C message. */ +OP (OP_OBJC_MSGCALL) + +/* This is EXACTLY like OP_FUNCALL but is semantically different. + In F77, array subscript expressions, substring expressions and + function calls are all exactly the same syntactically. They + may only be disambiguated at runtime. Thus this operator, + which indicates that we have found something of the form + <name> ( <stuff> ). */ +OP (OP_F77_UNDETERMINED_ARGLIST) + +/* OP_COMPLEX takes a type in the following element, followed by another + OP_COMPLEX, making three exp_elements. It is followed by two double + args, and converts them into a complex number of the given type. */ +OP (OP_COMPLEX) + +/* OP_STRING represents a string constant. + Its format is the same as that of a STRUCTOP, but the string + data is just made into a string constant when the operation + is executed. */ +OP (OP_STRING) + +/* OP_BITSTRING represents a packed bitstring constant. + Its format is the same as that of a STRUCTOP, but the bitstring + data is just made into a bitstring constant when the operation + is executed. */ +OP (OP_BITSTRING) + +/* OP_ARRAY creates an array constant out of the following subexpressions. + It is followed by two exp_elements, the first containing an integer + that is the lower bound of the array and the second containing another + integer that is the upper bound of the array. The second integer is + followed by a repeat of OP_ARRAY, making four exp_elements total. + The bounds are used to compute the number of following subexpressions + to consume, as well as setting the bounds in the created array constant. + The type of the elements is taken from the type of the first subexp, + and they must all match. */ +OP (OP_ARRAY) + +/* UNOP_CAST is followed by a type pointer in the next exp_element. + With another UNOP_CAST at the end, this makes three exp_elements. + It casts the value of the following subexpression. */ +OP (UNOP_CAST) + +/* The C++ dynamic_cast operator. */ +OP (UNOP_DYNAMIC_CAST) + +/* The C++ reinterpret_cast operator. */ +OP (UNOP_REINTERPRET_CAST) + +/* UNOP_MEMVAL is followed by a type pointer in the next exp_element + With another UNOP_MEMVAL at the end, this makes three exp_elements. + It casts the contents of the word addressed by the value of the + following subexpression. */ +OP (UNOP_MEMVAL) + +/* UNOP_MEMVAL_TLS is followed by a `struct objfile' pointer in the next + exp_element and a type pointer in the following exp_element. + With another UNOP_MEMVAL_TLS at the end, this makes four exp_elements. + It casts the contents of the word offsetted by the value of the + following subexpression from the TLS specified by `struct objfile'. */ +OP (UNOP_MEMVAL_TLS) + +/* UNOP_... operate on one value from a following subexpression + and replace it with a result. They take no immediate arguments. */ + +OP (UNOP_NEG) /* Unary - */ +OP (UNOP_LOGICAL_NOT) /* Unary ! */ +OP (UNOP_COMPLEMENT) /* Unary ~ */ +OP (UNOP_IND) /* Unary * */ +OP (UNOP_ADDR) /* Unary & */ +OP (UNOP_PREINCREMENT) /* ++ before an expression */ +OP (UNOP_POSTINCREMENT) /* ++ after an expression */ +OP (UNOP_PREDECREMENT) /* -- before an expression */ +OP (UNOP_POSTDECREMENT) /* -- after an expression */ +OP (UNOP_SIZEOF) /* Unary sizeof (followed by expression) */ + +OP (UNOP_PLUS) /* Unary plus */ + +OP (UNOP_CAP) /* Modula-2 standard (unary) procedures */ +OP (UNOP_CHR) +OP (UNOP_ORD) +OP (UNOP_ABS) +OP (UNOP_FLOAT) +OP (UNOP_HIGH) +OP (UNOP_MAX) +OP (UNOP_MIN) +OP (UNOP_ODD) +OP (UNOP_TRUNC) + +OP (OP_BOOL) /* Modula-2 builtin BOOLEAN type */ +OP (OP_M2_STRING) /* Modula-2 string constants */ + +/* STRUCTOP_... operate on a value from a following subexpression + by extracting a structure component specified by a string + that appears in the following exp_elements (as many as needed). + STRUCTOP_STRUCT is used for "." and STRUCTOP_PTR for "->". + They differ only in the error message given in case the value is + not suitable or the structure component specified is not found. + + The length of the string follows the opcode, followed by + BYTES_TO_EXP_ELEM(length) elements containing the data of the + string, followed by the length again and the opcode again. */ + +OP (STRUCTOP_STRUCT) +OP (STRUCTOP_PTR) + +/* C++: OP_THIS is just a placeholder for the class instance variable. + It just comes in a tight (OP_THIS, OP_THIS) pair. */ +OP (OP_THIS) + +/* Objective-C: OP_OBJC_SELF is just a placeholder for the class + instance variable. It just comes in a tight (OP_OBJC_SELF, + OP_OBJC_SELF) pair. */ +OP (OP_OBJC_SELF) + +/* Objective C: "@selector" pseudo-operator. */ +OP (OP_OBJC_SELECTOR) + +/* OP_SCOPE surrounds a type name and a field name. The type + name is encoded as one element, but the field name stays as + a string, which, of course, is variable length. */ +OP (OP_SCOPE) + +/* Used to represent named structure field values in brace + initializers (or tuples as they are called in (the deleted) + Chill). + + The gcc C syntax is NAME:VALUE or .NAME=VALUE, the (the + deleted) Chill syntax is .NAME:VALUE. Multiple labels (as in + the (the deleted) Chill syntax .NAME1,.NAME2:VALUE) is + represented as if it were .NAME1:(.NAME2:VALUE) (though that is + not valid (the deleted) Chill syntax). + + The NAME is represented as for STRUCTOP_STRUCT; VALUE follows. */ +OP (OP_LABELED) + +/* OP_TYPE is for parsing types, and used with the "ptype" command + so we can look up types that are qualified by scope, either with + the GDB "::" operator, or the Modula-2 '.' operator. */ +OP (OP_TYPE) + +/* An un-looked-up identifier. */ +OP (OP_NAME) + +/* An Objective C Foundation Class NSString constant. */ +OP (OP_OBJC_NSSTRING) + +/* A F90 array range operator (for "exp:exp", "exp:", ":exp" and ":"). */ +OP (OP_F90_RANGE) + +/* OP_DECFLOAT is followed by a type pointer in the next exp_element + and a dec long constant value in the following exp_element. + Then comes another OP_DECFLOAT. */ +OP (OP_DECFLOAT) + +/* OP_ADL_FUNC specifies that the function is to be looked up in an + Argument Dependent manner (Koenig lookup). */ +OP (OP_ADL_FUNC) |