diff options
| -rw-r--r-- | gdb/expprint.c | 41 | ||||
| -rw-r--r-- | gdb/expression.h | 4 |
2 files changed, 17 insertions, 28 deletions
diff --git a/gdb/expprint.c b/gdb/expprint.c index e0ec255..b996c9f 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -36,29 +36,6 @@ #include <ctype.h> -/* Default name for the standard operator OPCODE (i.e., one defined in - the definition of enum exp_opcode). */ - -const char * -op_name (enum exp_opcode opcode) -{ - switch (opcode) - { - default: - { - static char buf[30]; - - xsnprintf (buf, sizeof (buf), "<unknown %d>", opcode); - return buf; - } -#define OP(name) \ - case name: \ - return #name ; -#include "std-operator.def" -#undef OP - } -} - /* Meant to be used in debug sessions, so don't export it in a header file. */ extern void ATTRIBUTE_USED debug_exp (struct expression *exp); @@ -84,7 +61,23 @@ check_objfile (const struct block *block, struct objfile *objfile) void dump_for_expression (struct ui_file *stream, int depth, enum exp_opcode op) { - gdb_printf (stream, _("%*sOperation: %s\n"), depth, "", op_name (op)); + gdb_printf (stream, _("%*sOperation: "), depth, ""); + + switch (op) + { + default: + gdb_printf (stream, "<unknown %d>", op); + break; + +#define OP(name) \ + case name: \ + gdb_puts (#name, stream); \ + break; +#include "std-operator.def" +#undef OP + } + + gdb_puts ("\n", stream); } void diff --git a/gdb/expression.h b/gdb/expression.h index c314fc2..77949dd 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -284,10 +284,6 @@ extern struct value *evaluate_subexp_do_call (expression *exp, const char *function_name, type *default_return_type); -/* From expprint.c */ - -extern const char *op_name (enum exp_opcode opcode); - /* In an OP_RANGE expression, either bound could be empty, indicating that its value is by default that of the corresponding bound of the array or string. Also, the upper end of the range can be exclusive |