espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 06:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

* parser-defs.h (operator_length): Declare.

Browse Source 
* parse.c (length_of_subexp): Use operator_length to get operator
lengths and arities for operators.
Move most code to new operator_length function.
(operator_length): New function absorbing most code from
length_of_subexp.
(prefixify_subexp): Remove large case and use operator_length instead.
(parse_exp_1): Use renamings:
dump_prefix_expression => dump_raw_expression and
dump_postfix_expression => dump_prefix_expression.

* expression.h (dump_prefix_expression): Rename to ...
(dump_raw_expression): New name.
(dump_postfix_expression): Rename to ...
(dump_prefix_expression): New name.

* expprint.c (dump_subexp): Make global.  Add comment.
Move most existing code to dump_subexp_body.
(dump_subexp_body): New function.
(dump_prefix_expression): Rename to dump_raw_expression.
Remove attempt to print the expression via print_expression: it can't
work before the expression is prefixified.
(dump_raw_expression): Renamed from dump_prefix_expression.
(dump_postfix_expression): Rename to dump_prefix_expression, since
that's what it does.
Remove 'note' parameter, since this routine must be used on
prefixified expression.
(dump_prefix_expression): Renamed from dump_postfix_expression.
This commit is contained in:
Paul N. Hilfinger
2003-09-24 08:29:42 +00:00
parent d38eb334b6
commit 24daaebce8
5 changed files with 94 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gdb/expprint.c
View File

@ -548,6 +548,7 @@ op_string (enum exp_opcode op)
form. */
static char *op_name (int opcode);
static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
static char *
op_name (int opcode)
@ -737,8 +738,8 @@ op_name (int opcode)
}
void
dump_prefix_expression (struct expression *exp, struct ui_file *stream,
char *note)
dump_raw_expression (struct expression *exp, struct ui_file *stream,
char *note)
{
int elt;
char *opcode_name;
@ -747,11 +748,6 @@ dump_prefix_expression (struct expression *exp, struct ui_file *stream,
fprintf_filtered (stream, "Dump of expression @ ");
gdb_print_host_address (exp, stream);
fprintf_filtered (stream, ", %s:\nExpression: `", note);
if (exp->elts[0].opcode != OP_TYPE)
print_expression (exp, stream);
else
fprintf_filtered (stream, "Type printing not yet supported....");
fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",
exp->language_defn->la_name, exp->nelts,
(long) sizeof (union exp_element));
@ -778,10 +774,11 @@ dump_prefix_expression (struct expression *exp, struct ui_file *stream,
}
}
static int dump_subexp (struct expression *exp, struct ui_file *stream,
int elt);
/* Dump the subexpression of prefix expression EXP whose operator is at
position ELT onto STREAM. Returns the position of the next
subexpression in EXP. */
static int
int
dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
{
static int indent = 0;
@ -796,7 +793,23 @@ dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
fprintf_filtered (stream, "%-20s ", op_name (exp->elts[elt].opcode));
switch (exp->elts[elt++].opcode)
elt = dump_subexp_body (exp, stream, elt);
indent -= 2;
return elt;
}
/* Dump the operands of prefix expression EXP whose opcode is at
position ELT onto STREAM. Returns the position of the next
subexpression in EXP. */
static int
dump_subexp_body (struct expression *exp, struct ui_file *stream, int elt)
{
int opcode = exp->elts[elt++].opcode;
switch (opcode)
{
case TERNOP_COND:
case TERNOP_SLICE:
@ -914,7 +927,7 @@ dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
break;
case OP_FUNCALL:
{
int nargs;
int i, nargs;
nargs = longest_to_int (exp->elts[elt].longconst);
@ -1006,20 +1019,17 @@ dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
fprintf_filtered (stream, "Unknown format");
}
indent -= 2;
return elt;
}
void
dump_postfix_expression (struct expression *exp, struct ui_file *stream,
char *note)
dump_prefix_expression (struct expression *exp, struct ui_file *stream)
{
int elt;
fprintf_filtered (stream, "Dump of expression @ ");
gdb_print_host_address (exp, stream);
fprintf_filtered (stream, ", %s:\nExpression: `", note);
fputs_filtered (", after conversion to prefix form:\nExpression: `", stream);
if (exp->elts[0].opcode != OP_TYPE)
print_expression (exp, stream);
else