1999-04-16 01:35:26 +00:00
|
|
|
/* Print in infix form a struct expression.
|
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* ax-gdb.c, c-valprint.c, charset.c, corefile.c: Update copyright.
* demangle.c, disasm.c, dwarf2cfi.c, dwarfread.c: Update copyright.
* elfread.c, eval.c, expprint.c, expression.h: Update copyright.
* f-typeprint.c, findvar.c, gcore.c, gdb_mbuild.sh: Update copyright.
* gdbtypes.h, gnu-v2-abi.c, inferior.h, inftarg.c: Update copyright.
* language.c, language.h, m32r-tdep.c: Update copyright.
* mn10200-tdep.c, scm-lang.c, scm-lang.h: Update copyright.
* somsolib.c, somsolib.h, symfile.c, symtab.h: Update copyright.
* thread-db.c, typeprint.c, utils.c, valarith.c: Update copyright.
* values.c, win32-nat.c, x86-64-linux-nat.c: Update copyright.
* x86-64-linux-tdep.c, z8k-tdep.c: Update copyright.
* cli/cli-decode.h, config/h8500/tm-h8500.h: Update copyright.
Index: mi/ChangeLog
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* mi-cmd-env.c: Update copyright.
2003-01-14 00:49:06 +00:00
|
|
|
|
2005-12-17 22:34:03 +00:00
|
|
|
Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
|
2008-01-01 22:53:26 +00:00
|
|
|
1998, 1999, 2000, 2003, 2007, 2008 Free Software Foundation, Inc.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
This file is part of GDB.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
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
|
2007-08-23 18:08:50 +00:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-07 20:19:36 +00:00
|
|
|
(at your option) any later version.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
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.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 18:08:50 +00:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "expression.h"
|
|
|
|
#include "value.h"
|
|
|
|
#include "language.h"
|
|
|
|
#include "parser-defs.h"
|
2003-07-07 14:36:58 +00:00
|
|
|
#include "user-regs.h" /* For user_reg_map_regnum_to_name. */
|
2002-11-19 03:36:44 +00:00
|
|
|
#include "target.h"
|
|
|
|
#include "gdb_string.h"
|
2003-02-19 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add block.c.
(block_h): New.
(COMMON_OBS): Add block.o.
(block.o): New.
(x86-64-tdep.o): Add $(block_h).
(values.o, valops.o, tracepoint.o, symtab.o, symmisc.o, symfile.o)
(stack.o, printcmd.o, p-exp.tab.o, parse.o, objfiles.o)
(objc-exp.tab.o, objc-lang.o, nlmread.o, mips-tdep.o, mdebugread.o)
(m2-exp.tab.o, linespec.o, jv-lang.o, jv-exp.tab.o, infcmd.o)
(f-valprint.o, findvar.o, f-exp.tab.o, expprint.o, coffread.o)
(c-exp.tab.o, buildsym.o, breakpoint.o, blockframe.o, ax-gdb.o)
(alpha-tdep.o, ada-lang.o, ada-exp.tab.o, mi-cmd-stack.o): Ditto.
* value.h: Add opaque declaration for struct block.
* parser-defs.h, objc-lang.h, buildsym.h, breakpoint.h: Ditto.
* ada-lang.h: Ditto.
* x86-64-tdep.c: #include "block.h"
* values.c, valops.c, tracepoint.c, symtab.c, symmisc.c: Ditto.
* symfile.c, stack.c, printcmd.c, p-exp.y, parse.c: Ditto.
* objfiles.c, objc-exp.y, objc-lang.c, nlmread.c: Ditto.
* mips-tdep.c, mdebugread.c, m2-exp.y, linespec.c: Ditto.
* jv-lang.c, jv-exp.y, infcmd.c, f-valprint.c: Ditto.
* findvar.c, f-exp.y, expprint.c, coffread.c, c-exp.y: Ditto.
* buildsym.c, breakpoint.c, blockframe.c, ax-gdb.c: Ditto.
* alpha-tdep.c, ada-lang.c, ada-exp.y: Ditto.
* blockframe.c (blockvector_for_pc_sect): Move to "block.c".
(blockvector_for_pc, block_for_pc_sect, block_for_pc): Ditto.
* symtab.c (block_function): Ditto.
(contained_in): Ditto.
* frame.h: Move block_for_pc and block_for_pc_sect declarations to
block.h. Add opaque declaration for struct block.
* symtab.h: Move block_function and contained_in declarations to
block.h. Add opaque declarations for struct block, struct
blockvector.
(struct block): Move to block.h.
(struct blockvector): Ditto.
(BLOCK_START, BLOCK_END, BLOCK_FUNCTION, BLOCK_SUPERBLOCK)
(BLOCK_GCC_COMPILED, BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM)
(BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE)
(ALL_BLOCK_SYMBOLS, BLOCK_SHOULD_SORT, BLOCKVECTOR_NBLOCKS)
(BLOCKVECTOR_BLOCK, GLOBAL_BLOCK, STATIC_BLOCK, FIRST_LOCAL_BLOCK):
Ditto.
* block.c: New file.
* block.h: New file.
2003-02-19 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: #include "block.h"
2003-02-20 00:01:07 +00:00
|
|
|
#include "block.h"
|
2006-10-10 03:17:53 +00:00
|
|
|
#include "objfiles.h"
|
2007-09-05 00:14:02 +00:00
|
|
|
#include "gdb_assert.h"
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
#include "valprint.h"
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_CTYPE_H
|
|
|
|
#include <ctype.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void
|
2000-07-30 01:48:28 +00:00
|
|
|
print_expression (struct expression *exp, struct ui_file *stream)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int pc = 0;
|
|
|
|
print_subexp (exp, &pc, stream, PREC_NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print the subexpression of EXP that starts in position POS, on STREAM.
|
|
|
|
PREC is the precedence of the surrounding operator;
|
|
|
|
if the precedence of the main operator of this subexpression is less,
|
|
|
|
parentheses are needed here. */
|
|
|
|
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
void
|
2003-09-09 08:05:43 +00:00
|
|
|
print_subexp (struct expression *exp, int *pos,
|
2000-07-30 01:48:28 +00:00
|
|
|
struct ui_file *stream, enum precedence prec)
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
{
|
|
|
|
exp->language_defn->la_exp_desc->print_subexp (exp, pos, stream, prec);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Standard implementation of print_subexp for use in language_defn
|
|
|
|
vectors. */
|
|
|
|
void
|
|
|
|
print_subexp_standard (struct expression *exp, int *pos,
|
|
|
|
struct ui_file *stream, enum precedence prec)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2003-09-09 08:05:43 +00:00
|
|
|
unsigned tem;
|
|
|
|
const struct op_print *op_print_tab;
|
|
|
|
int pc;
|
1999-04-16 01:35:26 +00:00
|
|
|
unsigned nargs;
|
2003-09-09 08:05:43 +00:00
|
|
|
char *op_str;
|
1999-04-16 01:35:26 +00:00
|
|
|
int assign_modify = 0;
|
|
|
|
enum exp_opcode opcode;
|
|
|
|
enum precedence myprec = PREC_NULL;
|
|
|
|
/* Set to 1 for a right-associative operator. */
|
|
|
|
int assoc = 0;
|
2001-11-10 21:34:56 +00:00
|
|
|
struct value *val;
|
1999-04-16 01:35:26 +00:00
|
|
|
char *tempstr = NULL;
|
|
|
|
|
|
|
|
op_print_tab = exp->language_defn->la_op_print_tab;
|
|
|
|
pc = (*pos)++;
|
|
|
|
opcode = exp->elts[pc].opcode;
|
|
|
|
switch (opcode)
|
|
|
|
{
|
1999-07-07 20:19:36 +00:00
|
|
|
/* Common ops */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
case OP_SCOPE:
|
|
|
|
myprec = PREC_PREFIX;
|
|
|
|
assoc = 0;
|
|
|
|
fputs_filtered (type_name_no_tag (exp->elts[pc + 1].type), stream);
|
|
|
|
fputs_filtered ("::", stream);
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 2].longconst);
|
|
|
|
(*pos) += 4 + BYTES_TO_EXP_ELEM (nargs + 1);
|
|
|
|
fputs_filtered (&exp->elts[pc + 3].string, stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_LONG:
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
{
|
|
|
|
struct value_print_options opts;
|
|
|
|
get_raw_print_options (&opts);
|
|
|
|
(*pos) += 3;
|
|
|
|
value_print (value_from_longest (exp->elts[pc + 1].type,
|
|
|
|
exp->elts[pc + 2].longconst),
|
|
|
|
stream, &opts);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_DOUBLE:
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
{
|
|
|
|
struct value_print_options opts;
|
|
|
|
get_raw_print_options (&opts);
|
|
|
|
(*pos) += 3;
|
|
|
|
value_print (value_from_double (exp->elts[pc + 1].type,
|
|
|
|
exp->elts[pc + 2].doubleconst),
|
|
|
|
stream, &opts);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_VAR_VALUE:
|
|
|
|
{
|
|
|
|
struct block *b;
|
|
|
|
(*pos) += 3;
|
|
|
|
b = exp->elts[pc + 1].block;
|
|
|
|
if (b != NULL
|
|
|
|
&& BLOCK_FUNCTION (b) != NULL
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 17:17:25 +00:00
|
|
|
&& SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)) != NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 17:17:25 +00:00
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)), stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
fputs_filtered ("::", stream);
|
|
|
|
}
|
2003-02-20 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_PRINT_NAME): Rename from SYMBOL_SOURCE_NAME;
expand comment.
* ada-lang.c (user_select_syms, ada_finish_decode_line_1): Replace
SYMBOL_PRINT_NAME with SYMBOL_SOURCE_NAME.
* ada-typeprint.c (ada_typedef_print): Ditto.
* ax-gdb.c (gen_var_ref): Ditto.
* breakpoint.c (print_one_breakpoint): Ditto.
* buildsym.c (finish_block): Ditto.
* c-valprint.c (c_val_print): Ditto.
* expprint.c (print_subexp): Ditto.
* findvar.c (locate_var_value): Ditto.
* infcmd.c (jump_command): Ditto.
* linespec.c (decode_line_2, decode_compound): Ditto.
* maint.c (maintenance_translate_address): Ditto.
* objc-lang.c (compare_selectors, compare_classes): Ditto.
* printcmd.c (build_address_symbolic, sym_info, print_frame_args):
Ditto.
* p-valprint.c (pascal_val_print): Ditto.
* stabsread.c (define_symbol): Ditto.
* stack.c (print_frame, frame_info, print_block_frame_locals)
(print_frame_arg_vars, return_command): Ditto.
* symfile.c (compare_symbols, compare_psymbols): Ditto.
* symmisc.c (print_symbol): Ditto.
* symtab.c (lookup_partial_symbol, lookup_block_symbol)
(compare_search_syms, print_symbol_info, print_msymbol_info)
(rbreak_command): Ditto.
* tracepoint.c (tracepoints_info): Ditto.
* typeprint.c (typedef_print): Ditto.
* valops.c (value_of_variable, hand_function_call): Ditto.
* cli/cli-cmds.c (edit_command, list_command): Ditto.
* ada-typeprint.c: Update Copyright.
* infcmd.c, objc-lang.c, p-valprint.c, symmisc.c: Ditto.
* tracepoint.c, cli/cli-cmds.c: Ditto.
2003-02-20 17:17:25 +00:00
|
|
|
fputs_filtered (SYMBOL_PRINT_NAME (exp->elts[pc + 2].symbol), stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_LAST:
|
|
|
|
(*pos) += 2;
|
|
|
|
fprintf_filtered (stream, "$%d",
|
|
|
|
longest_to_int (exp->elts[pc + 1].longconst));
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_REGISTER:
|
2002-09-25 20:30:38 +00:00
|
|
|
{
|
2007-06-13 17:11:09 +00:00
|
|
|
const char *name = &exp->elts[pc + 2].string;
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (exp->elts[pc + 1].longconst + 1);
|
2003-07-07 14:36:58 +00:00
|
|
|
fprintf_filtered (stream, "$%s", name);
|
2002-09-25 20:30:38 +00:00
|
|
|
return;
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
case OP_BOOL:
|
|
|
|
(*pos) += 2;
|
|
|
|
fprintf_filtered (stream, "%s",
|
|
|
|
longest_to_int (exp->elts[pc + 1].longconst)
|
|
|
|
? "TRUE" : "FALSE");
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_INTERNALVAR:
|
|
|
|
(*pos) += 2;
|
|
|
|
fprintf_filtered (stream, "$%s",
|
1999-07-07 20:19:36 +00:00
|
|
|
internalvar_name (exp->elts[pc + 1].internalvar));
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_FUNCALL:
|
|
|
|
(*pos) += 2;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered (" (", stream);
|
|
|
|
for (tem = 0; tem < nargs; tem++)
|
|
|
|
{
|
|
|
|
if (tem != 0)
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
}
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_NAME:
|
1999-07-07 20:19:36 +00:00
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
|
|
|
|
fputs_filtered (&exp->elts[pc + 2].string, stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_STRING:
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
{
|
|
|
|
struct value_print_options opts;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
|
|
|
|
/* LA_PRINT_STRING will print using the current repeat count threshold.
|
|
|
|
If necessary, we can temporarily set it to zero, or pass it as an
|
|
|
|
additional parameter to LA_PRINT_STRING. -fnf */
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
LA_PRINT_STRING (stream, &exp->elts[pc + 2].string, nargs, 1, 0,
|
|
|
|
&opts);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_BITSTRING:
|
1999-07-07 20:19:36 +00:00
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
(*pos)
|
|
|
|
+= 3 + BYTES_TO_EXP_ELEM ((nargs + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT);
|
|
|
|
fprintf_unfiltered (stream, "B'<unimplemented>'");
|
|
|
|
return;
|
|
|
|
|
2002-11-19 03:36:44 +00:00
|
|
|
case OP_OBJC_NSSTRING: /* Objective-C Foundation Class NSString constant. */
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
{
|
|
|
|
struct value_print_options opts;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (nargs + 1);
|
|
|
|
fputs_filtered ("@\"", stream);
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
LA_PRINT_STRING (stream, &exp->elts[pc + 2].string, nargs, 1, 0,
|
|
|
|
&opts);
|
|
|
|
fputs_filtered ("\"", stream);
|
|
|
|
}
|
2002-11-19 03:36:44 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_OBJC_MSGCALL:
|
|
|
|
{ /* Objective C message (method) call. */
|
|
|
|
char *selector;
|
|
|
|
(*pos) += 3;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 2].longconst);
|
|
|
|
fprintf_unfiltered (stream, "[");
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
if (0 == target_read_string (exp->elts[pc + 1].longconst,
|
|
|
|
&selector, 1024, NULL))
|
|
|
|
{
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("bad selector"));
|
2002-11-19 03:36:44 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (nargs)
|
|
|
|
{
|
|
|
|
char *s, *nextS;
|
|
|
|
s = alloca (strlen (selector) + 1);
|
|
|
|
strcpy (s, selector);
|
|
|
|
for (tem = 0; tem < nargs; tem++)
|
|
|
|
{
|
|
|
|
nextS = strchr (s, ':');
|
2007-09-05 00:14:02 +00:00
|
|
|
gdb_assert (nextS); /* Make sure we found ':'. */
|
2002-11-19 03:36:44 +00:00
|
|
|
*nextS = '\0';
|
|
|
|
fprintf_unfiltered (stream, " %s: ", s);
|
|
|
|
s = nextS + 1;
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fprintf_unfiltered (stream, " %s", selector);
|
|
|
|
}
|
|
|
|
fprintf_unfiltered (stream, "]");
|
|
|
|
/* "selector" was malloc'd by target_read_string. Free it. */
|
2003-01-09 18:03:38 +00:00
|
|
|
xfree (selector);
|
2002-11-19 03:36:44 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
case OP_ARRAY:
|
|
|
|
(*pos) += 3;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 2].longconst);
|
|
|
|
nargs -= longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
nargs++;
|
|
|
|
tem = 0;
|
|
|
|
if (exp->elts[pc + 4].opcode == OP_LONG
|
2008-09-11 14:28:47 +00:00
|
|
|
&& exp->elts[pc + 5].type
|
|
|
|
== builtin_type (exp->gdbarch)->builtin_char
|
1999-04-16 01:35:26 +00:00
|
|
|
&& exp->language_defn->la_language == language_c)
|
|
|
|
{
|
|
|
|
/* Attempt to print C character arrays using string syntax.
|
|
|
|
Walk through the args, picking up one character from each
|
|
|
|
of the OP_LONG expression elements. If any array element
|
|
|
|
does not match our expection of what we should find for
|
|
|
|
a simple string, revert back to array printing. Note that
|
|
|
|
the last expression element is an explicit null terminator
|
|
|
|
byte, which doesn't get printed. */
|
|
|
|
tempstr = alloca (nargs);
|
|
|
|
pc += 4;
|
|
|
|
while (tem < nargs)
|
|
|
|
{
|
|
|
|
if (exp->elts[pc].opcode != OP_LONG
|
2008-09-11 14:28:47 +00:00
|
|
|
|| exp->elts[pc + 1].type
|
|
|
|
!= builtin_type (exp->gdbarch)->builtin_char)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/* Not a simple array of char, use regular array printing. */
|
|
|
|
tem = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tempstr[tem++] =
|
|
|
|
longest_to_int (exp->elts[pc + 2].longconst);
|
|
|
|
pc += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (tem > 0)
|
|
|
|
{
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
struct value_print_options opts;
|
|
|
|
get_user_print_options (&opts);
|
|
|
|
LA_PRINT_STRING (stream, tempstr, nargs - 1, 1, 0,
|
|
|
|
&opts);
|
1999-04-16 01:35:26 +00:00
|
|
|
(*pos) = pc;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-08-01 Andrew Cagney <cagney@redhat.com>
* NEWS: Menion that CHILL has been made obsolete.
* gdbtypes.c (chill_varying_type): Make chill references obsolete.
* gdbserver/Makefile.in: Ditto.
* stabsread.c (read_range_type): Ditto.
* gdbtypes.h: Ditto.
* language.c (binop_type_check): Ditto.
(binop_result_type): Ditto.
(integral_type): Ditto.
(character_type): Ditto.
(string_type): Ditto.
(boolean_type): Ditto.
(structured_type): Ditto.
(lang_bool_type): Ditto.
(binop_type_check): Ditto.
* language.h (_LANG_chill): Ditto.
* dwarfread.c (set_cu_language): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
* dwarfread.c (handle_producer): Ditto.
* expression.h (enum exp_opcode): Ditto.
* eval.c: Ditto for comments.
* typeprint.c (typedef_print) [_LANG_chill]: Ditto.
* expprint.c (print_subexp): Ditto.
(print_subexp): Ditto.
* valops.c (value_cast): Ditto.
(search_struct_field): Ditto.
* value.h (COERCE_VARYING_ARRAY): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* valarith.c (value_binop): Ditto.
(value_neg): Ditto.
* valops.c (value_slice): Ditto.
* symtab.h (union language_specific): Ditto.
(SYMBOL_INIT_LANGUAGE_SPECIFIC): Ditto.
(SYMBOL_DEMANGLED_NAME): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* defs.h (enum language): Ditto.
* symtab.c (got_symtab): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* ch-typeprint.c: Make file obsolete.
* ch-valprint.c: Make file obsolete.
* ch-lang.h: Make file obsolete.
* ch-exp.c: Make file obsolete.
* ch-lang.c: Make file obsolete.
* Makefile.in (FLAGS_TO_PASS): Do not pass CHILL or CHILLFLAGS or
CHILL_LIB.
(TARGET_FLAGS_TO_PASS): Ditto.
(CHILLFLAGS): Obsolete.
(CHILL): Obsolete.
(CHILL_FOR_TARGET): Obsolete.
(CHILL_LIB): Obsolete.
(SFILES): Remove ch-exp.c, ch-lang.c, ch-typeprint.c and
ch-valprint.c.
(HFILES_NO_SRCDIR): Remove ch-lang.h.
(COMMON_OBS): Remove ch-valprint.o, ch-typeprint.o, ch-exp.o and
ch-lang.o.
(ch-exp.o, ch-lang.o, ch-typeprint.o, ch-valprint.o): Delete
targets.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* stabs.texinfo, gdb.texinfo, gdbint.texinfo: Obsolete references
to CHILL.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,
CHILL_FOR_TARGET and CHILL_LIB.
* configure.in (configdirs): Remove gdb.chill.
* configure: Regenerate.
* lib/gdb.exp: Obsolete references to chill.
* gdb.fortran/types.exp: Ditto.
* gdb.fortran/exprs.exp: Ditto.
2002-08-01 17:18:35 +00:00
|
|
|
fputs_filtered (" {", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
for (tem = 0; tem < nargs; tem++)
|
|
|
|
{
|
|
|
|
if (tem != 0)
|
|
|
|
{
|
|
|
|
fputs_filtered (", ", stream);
|
|
|
|
}
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
}
|
2002-08-01 Andrew Cagney <cagney@redhat.com>
* NEWS: Menion that CHILL has been made obsolete.
* gdbtypes.c (chill_varying_type): Make chill references obsolete.
* gdbserver/Makefile.in: Ditto.
* stabsread.c (read_range_type): Ditto.
* gdbtypes.h: Ditto.
* language.c (binop_type_check): Ditto.
(binop_result_type): Ditto.
(integral_type): Ditto.
(character_type): Ditto.
(string_type): Ditto.
(boolean_type): Ditto.
(structured_type): Ditto.
(lang_bool_type): Ditto.
(binop_type_check): Ditto.
* language.h (_LANG_chill): Ditto.
* dwarfread.c (set_cu_language): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
* dwarfread.c (handle_producer): Ditto.
* expression.h (enum exp_opcode): Ditto.
* eval.c: Ditto for comments.
* typeprint.c (typedef_print) [_LANG_chill]: Ditto.
* expprint.c (print_subexp): Ditto.
(print_subexp): Ditto.
* valops.c (value_cast): Ditto.
(search_struct_field): Ditto.
* value.h (COERCE_VARYING_ARRAY): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* valarith.c (value_binop): Ditto.
(value_neg): Ditto.
* valops.c (value_slice): Ditto.
* symtab.h (union language_specific): Ditto.
(SYMBOL_INIT_LANGUAGE_SPECIFIC): Ditto.
(SYMBOL_DEMANGLED_NAME): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* defs.h (enum language): Ditto.
* symtab.c (got_symtab): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* ch-typeprint.c: Make file obsolete.
* ch-valprint.c: Make file obsolete.
* ch-lang.h: Make file obsolete.
* ch-exp.c: Make file obsolete.
* ch-lang.c: Make file obsolete.
* Makefile.in (FLAGS_TO_PASS): Do not pass CHILL or CHILLFLAGS or
CHILL_LIB.
(TARGET_FLAGS_TO_PASS): Ditto.
(CHILLFLAGS): Obsolete.
(CHILL): Obsolete.
(CHILL_FOR_TARGET): Obsolete.
(CHILL_LIB): Obsolete.
(SFILES): Remove ch-exp.c, ch-lang.c, ch-typeprint.c and
ch-valprint.c.
(HFILES_NO_SRCDIR): Remove ch-lang.h.
(COMMON_OBS): Remove ch-valprint.o, ch-typeprint.o, ch-exp.o and
ch-lang.o.
(ch-exp.o, ch-lang.o, ch-typeprint.o, ch-valprint.o): Delete
targets.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* stabs.texinfo, gdb.texinfo, gdbint.texinfo: Obsolete references
to CHILL.
2002-08-01 Andrew Cagney <cagney@redhat.com>
* Makefile.in (TARGET_FLAGS_TO_PASS): Remove CHILLFLAGS, CHILL,
CHILL_FOR_TARGET and CHILL_LIB.
* configure.in (configdirs): Remove gdb.chill.
* configure: Regenerate.
* lib/gdb.exp: Obsolete references to chill.
* gdb.fortran/types.exp: Ditto.
* gdb.fortran/exprs.exp: Ditto.
2002-08-01 17:18:35 +00:00
|
|
|
fputs_filtered ("}", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
case OP_LABELED:
|
|
|
|
tem = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
|
2003-01-02 Andrew Cagney <ac131313@redhat.com>
* valarith.c (value_binop): Delete obsolete code and comments.
* configure.host: Ditto.
* buildsym.h (make_blockvector): Ditto.
* buildsym.c (make_blockvector): Ditto.
* defs.h (enum language): Ditto.
(chill_demangle): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
(set_cu_language): Ditto.
(handle_producer): Ditto.
* expprint.c (print_subexp): Ditto.
* gdbtypes.c (chill_varying_type): Ditto.
* gdbtypes.h (builtin_type_chill_bool): Ditto.
(builtin_type_chill_char, builtin_type_chill_long): Ditto.
(builtin_type_chill_ulong, builtin_type_chill_real): Ditto.
(chill_varying_type): Ditto.
* language.h (_LANG_chill): Ditto.
* language.c (binop_result_type, integral_type): Ditto.
(character_type, string_type, structured_type): Ditto.
(lang_bool_type, binop_type_check): Ditto.
* stabsread.h (os9k_stabs): Ditto.
* stabsread.c (os9k_type_vector, dbx_lookup_type): Ditto.
(define_symbol, read_type, read_struct_fields): Ditto.
(read_array_type, read_enum_type, read_huge_number): Ditto.
(read_range_type, start_stabs): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* symtab.c (symbol_init_language_specific): Ditto.
(symbol_init_demangled_name, symbol_demangled_name): Ditto.
* symtab.h (struct general_symbol_info): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* typeprint.c (typedef_print): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* valops.c (value_cast, search_struct_field, value_slice): Delete
obsolete code.
(varying_to_slice): Delete function.
* value.h (COERCE_VARYING_ARRAY): Delete obsolete macro contents.
(varying_to_slice): Delete declaration.
* MAINTAINERS: Update.
2003-01-02 14:27:27 +00:00
|
|
|
/* Gcc support both these syntaxes. Unsure which is preferred. */
|
1999-04-16 01:35:26 +00:00
|
|
|
#if 1
|
2003-01-02 Andrew Cagney <ac131313@redhat.com>
* valarith.c (value_binop): Delete obsolete code and comments.
* configure.host: Ditto.
* buildsym.h (make_blockvector): Ditto.
* buildsym.c (make_blockvector): Ditto.
* defs.h (enum language): Ditto.
(chill_demangle): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
(set_cu_language): Ditto.
(handle_producer): Ditto.
* expprint.c (print_subexp): Ditto.
* gdbtypes.c (chill_varying_type): Ditto.
* gdbtypes.h (builtin_type_chill_bool): Ditto.
(builtin_type_chill_char, builtin_type_chill_long): Ditto.
(builtin_type_chill_ulong, builtin_type_chill_real): Ditto.
(chill_varying_type): Ditto.
* language.h (_LANG_chill): Ditto.
* language.c (binop_result_type, integral_type): Ditto.
(character_type, string_type, structured_type): Ditto.
(lang_bool_type, binop_type_check): Ditto.
* stabsread.h (os9k_stabs): Ditto.
* stabsread.c (os9k_type_vector, dbx_lookup_type): Ditto.
(define_symbol, read_type, read_struct_fields): Ditto.
(read_array_type, read_enum_type, read_huge_number): Ditto.
(read_range_type, start_stabs): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* symtab.c (symbol_init_language_specific): Ditto.
(symbol_init_demangled_name, symbol_demangled_name): Ditto.
* symtab.h (struct general_symbol_info): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* typeprint.c (typedef_print): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* valops.c (value_cast, search_struct_field, value_slice): Delete
obsolete code.
(varying_to_slice): Delete function.
* value.h (COERCE_VARYING_ARRAY): Delete obsolete macro contents.
(varying_to_slice): Delete declaration.
* MAINTAINERS: Update.
2003-01-02 14:27:27 +00:00
|
|
|
fputs_filtered (&exp->elts[pc + 2].string, stream);
|
|
|
|
fputs_filtered (": ", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
#else
|
2003-01-02 Andrew Cagney <ac131313@redhat.com>
* valarith.c (value_binop): Delete obsolete code and comments.
* configure.host: Ditto.
* buildsym.h (make_blockvector): Ditto.
* buildsym.c (make_blockvector): Ditto.
* defs.h (enum language): Ditto.
(chill_demangle): Ditto.
* elfread.c (elf_symtab_read): Ditto.
* dwarfread.c (CHILL_PRODUCER): Ditto.
(set_cu_language): Ditto.
(handle_producer): Ditto.
* expprint.c (print_subexp): Ditto.
* gdbtypes.c (chill_varying_type): Ditto.
* gdbtypes.h (builtin_type_chill_bool): Ditto.
(builtin_type_chill_char, builtin_type_chill_long): Ditto.
(builtin_type_chill_ulong, builtin_type_chill_real): Ditto.
(chill_varying_type): Ditto.
* language.h (_LANG_chill): Ditto.
* language.c (binop_result_type, integral_type): Ditto.
(character_type, string_type, structured_type): Ditto.
(lang_bool_type, binop_type_check): Ditto.
* stabsread.h (os9k_stabs): Ditto.
* stabsread.c (os9k_type_vector, dbx_lookup_type): Ditto.
(define_symbol, read_type, read_struct_fields): Ditto.
(read_array_type, read_enum_type, read_huge_number): Ditto.
(read_range_type, start_stabs): Ditto.
* symfile.c (init_filename_language_table): Ditto.
(add_psymbol_with_dem_name_to_list): Ditto.
* symtab.c (symbol_init_language_specific): Ditto.
(symbol_init_demangled_name, symbol_demangled_name): Ditto.
* symtab.h (struct general_symbol_info): Ditto.
(SYMBOL_CHILL_DEMANGLED_NAME): Ditto.
* typeprint.c (typedef_print): Ditto.
* utils.c (fprintf_symbol_filtered): Ditto.
* valops.c (value_cast, search_struct_field, value_slice): Delete
obsolete code.
(varying_to_slice): Delete function.
* value.h (COERCE_VARYING_ARRAY): Delete obsolete macro contents.
(varying_to_slice): Delete declaration.
* MAINTAINERS: Update.
2003-01-02 14:27:27 +00:00
|
|
|
fputs_filtered (".", stream);
|
|
|
|
fputs_filtered (&exp->elts[pc + 2].string, stream);
|
|
|
|
fputs_filtered ("=", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
#endif
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case TERNOP_COND:
|
|
|
|
if ((int) prec > (int) PREC_COMMA)
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
/* Print the subexpressions, forcing parentheses
|
1999-07-07 20:19:36 +00:00
|
|
|
around any binary operations within them.
|
|
|
|
This is more parentheses than are strictly necessary,
|
|
|
|
but it looks clearer. */
|
1999-04-16 01:35:26 +00:00
|
|
|
print_subexp (exp, pos, stream, PREC_HYPER);
|
|
|
|
fputs_filtered (" ? ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_HYPER);
|
|
|
|
fputs_filtered (" : ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_HYPER);
|
|
|
|
if ((int) prec > (int) PREC_COMMA)
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
case TERNOP_SLICE_COUNT:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
fputs_filtered (opcode == TERNOP_SLICE ? " : " : " UP ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
tem = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered (".", stream);
|
|
|
|
fputs_filtered (&exp->elts[pc + 2].string, stream);
|
|
|
|
return;
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
/* Will not occur for Modula-2 */
|
1999-04-16 01:35:26 +00:00
|
|
|
case STRUCTOP_PTR:
|
|
|
|
tem = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("->", stream);
|
|
|
|
fputs_filtered (&exp->elts[pc + 2].string, stream);
|
|
|
|
return;
|
|
|
|
|
2006-08-07 03:30:54 +00:00
|
|
|
case STRUCTOP_MEMBER:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered (".*", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case STRUCTOP_MPTR:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("->*", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
return;
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
case BINOP_SUBSCRIPT:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("[", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
fputs_filtered ("]", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case UNOP_POSTINCREMENT:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("++", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case UNOP_POSTDECREMENT:
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered ("--", stream);
|
|
|
|
return;
|
|
|
|
|
|
|
|
case UNOP_CAST:
|
|
|
|
(*pos) += 2;
|
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
1999-07-07 20:19:36 +00:00
|
|
|
fputs_filtered ("(", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
type_print (exp->elts[pc + 1].type, "", stream, 0);
|
|
|
|
fputs_filtered (") ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
1999-07-07 20:19:36 +00:00
|
|
|
fputs_filtered (")", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
case UNOP_MEMVAL:
|
|
|
|
(*pos) += 2;
|
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
1999-07-07 20:19:36 +00:00
|
|
|
fputs_filtered ("(", stream);
|
2002-05-13 Daniel Jacobowitz <drow@mvista.com>
* ax-gdb.c (gen_sign_extend, gen_fetch, gen_usual_unary)
(gen_cast, gen_scale, gen_add, gen_sub, gen_binop, gen_deref)
(gen_address_of, gen_struct_ref, gen_repeat): Use type
access macros.
* c-typeprint.c (cp_type_print_method_args): Likewise.
(c_type_print_args): Likewise.
* d10v-tdep.c (d10v_push_arguments): Likewise.
(d10v_extract_return_value): Likewise.
* expprint.c (print_subexp): Likewise.
* gdbtypes.c (lookup_primitive_typename): Likewise.
(lookup_template_type, add_mangled_type, print_arg_types): Likewise.
* gdbtypes.h (TYPE_UNSIGNED, TYPE_NOSIGN, TYPE_STUB)
(TYPE_TARGET_STUB, TYPE_STATIC, TYPE_CONST, TYPE_VOLATILE)
(TYPE_PROTOTYPED, TYPE_INCOMPLETE, TYPE_CODE_SPACE, TYPE_VARARGS)
(TYPE_VECTOR): Likewise.
* hpread.c (hpread_read_struct_type)
(fix_static_member_physnames, fixup_class_method_type)
(hpread_type_lookup): Likewise.
* mdebugread.c (parse_symbol, parse_type): Likewise.
* p-lang.c (is_pascal_string_type): Likewise.
* valops.c (hand_function_call): Likewise.
* x86-64-tdep.c (classify_argument): Likewise.
* hpread.c (hpread_read_function_type)
(hpread_read_doc_function_type): Call replace_type.
* dstread.c (create_new_type): Delete.
(decode_dst_structure, process_dst_function): Call alloc_type.
Use type access macros.
2002-05-13 14:00:36 +00:00
|
|
|
if (TYPE_CODE (exp->elts[pc + 1].type) == TYPE_CODE_FUNC &&
|
1999-07-07 20:19:36 +00:00
|
|
|
exp->elts[pc + 3].opcode == OP_LONG)
|
|
|
|
{
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
struct value_print_options opts;
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
/* We have a minimal symbol fn, probably. It's encoded
|
|
|
|
as a UNOP_MEMVAL (function-type) of an OP_LONG (int, address).
|
|
|
|
Swallow the OP_LONG (including both its opcodes); ignore
|
|
|
|
its type; print the value in the type of the MEMVAL. */
|
|
|
|
(*pos) += 4;
|
|
|
|
val = value_at_lazy (exp->elts[pc + 1].type,
|
2004-11-09 Andrew Cagney <cagney@gnu.org>
* value.h (struct value): Delete field bfd_section.
(VALUE_BFD_SECTION): Delete macro.
(COERCE_REF): Update.
(value_at, value_at_lazy): Delete asection parameter.
* printcmd.c (print_formatted, x_command): Update.
(do_examine): Delete asection parameter.
(next_section): Delete variable.
* valops.c (value_cast, value_at, value_at_lazy)
(value_coerce_function, value_addr, value_ind, value_string)
(find_rt_vbase_offset, value_full_object): Update.
* hpacc-abi.c (hpacc_virtual_fn_field)
(hpacc_value_rtti_type): Update.
* gnu-v3-abi.c (gnuv3_rtti_type, gnuv3_virtual_fn_field)
(gnuv3_baseclass_offset): Update.
* f-valprint.c (f_val_print): Update.
* c-valprint.c (c_val_print): Update.
* p-valprint.c (pascal_val_print): Update.
* jv-valprint.c (java_value_print): Update.
* jv-lang.c (java_class_from_object, evaluate_subexp_java): Update.
* ada-lang.c (ada_value_primitive_packed_val)
(ada_evaluate_subexp): Update.
* dwarf2loc.c (dwarf2_evaluate_loc_desc): Update.
* expprint.c (print_subexp_standard): Update.
* infcall.c (call_function_by_hand): Update.
* valarith.c (value_add): Update.
* eval.c (evaluate_subexp_standard): Update.
* values.c (allocate_value, value_copy, value_static_field): Update.
* findvar.c (read_var_value, locate_var_value): Update.
2004-11-09 14:43:27 +00:00
|
|
|
(CORE_ADDR) exp->elts[pc + 5].longconst);
|
gdb
* varobj.c (value_get_print_value): Include valprint.h.
(value_get_print_value): Use get_formatted_print_options.
* value.h (struct value_print_options): Declare.
(value_print, val_print, common_val_print, val_print_string):
Update.
* value.c: Include valprint.h.
(show_values): Use get_user_print_options.
(show_convenience): Likewise.
* valprint.h (prettyprint_arrays, prettyprint_structs): Don't
declare.
(struct value_print_options): New type.
(vtblprint, unionprint, addressprint, objectprint, print_max,
inspect_it, repeat_count_threshold, output_format,
stop_print_at_null): Don't declare.
(user_print_options, get_user_print_options,
get_raw_print_options, get_formatted_print_options): Declare.
(print_array_indexes_p): Don't declare.
(maybe_print_array_index, val_print_array_elements): Update.
* valprint.c (print_max): Remove.
(user_print_options): New global.
(get_user_print_options, get_raw_print_options,
get_formatted_print_options): New functions.
(print_array_indexes, repeat_count_threshold, stop_print_at_null,
prettyprint_structs, prettyprint_arrays, unionprint,
addressprint): Remove.
(val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(common_val_print): Likewise.
(print_array_indexes_p): Remove.
(maybe_print_array_index): Remove format, pretty arguments; add
options. Update.
(val_print_array_elements): Remove format, deref_ref, pretty
arguments; add options. Update.
(val_print_string): Add options argument. Update.
(_initialize_valprint): Use user_print_options.
(output_format): Remove.
(set_output_radix_1): Use user_print_options.
* typeprint.c: Include valprint.h.
(objectprint): Don't declare.
(whatis_exp): Use get_user_print_options.
* tui/tui-regs.c: Include valprint.h.
(tui_register_format): Use get_formatted_print_options.
* tracepoint.c: Include valprint.h.
(addressprint): Don't declare.
(trace_mention): Use get_user_print_options.
(tracepoints_info): Likewise.
* stack.c (print_frame_args): Use get_raw_print_options.
(print_frame_info): Use get_user_print_options.
(print_frame): Likewise.
* sh64-tdep.c: Include valprint.h
(sh64_do_register): Use get_formatted_print_options.
* scm-valprint.c (scm_inferior_print): Remove format, deref_ref,
pretty arguments; add options.
(scm_scmlist_print): Likewise. Update.
(scm_scmval_print): Likewise.
(scm_val_print): Likewise.
(scm_value_print): Remove format, pretty arguments; add options.
Update.
* scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print):
Update.
* scm-lang.c (scm_printstr): Add options argument.
* python/python-value.c: Include valprint.h.
(valpy_str): Use get_user_print_options.
* printcmd.c: Include valprint.h.
(addressprint): Don't declare.
(inspect_it): Remove.
(print_formatted): Remove format option; add options. Update.
(print_scalar_formatted): Likewise.
(print_address_demangle): Use get_user_print_options.
(do_examine): Use get_formatted_print_options.
(print_command_1): Likewise.
(output_command): Use get_formatted_print_options.
(do_one_display): Likewise.
(print_variable_value): Use get_user_print_options.
* p-valprint.c (pascal_val_print): Remove format, deref_ref,
pretty arguments; add options. Update.
(pascal_value_print): Remove format, pretty arguments; add
options. Update.
(vtblprint, objectprint): Don't declare.
(pascal_static_field_print): Remove.
(pascal_object_print_value_fields): Remove format, pretty
arguments; add options. Update.
(pascal_object_print_static_field): Likewise.
(_initialize_pascal_valprint): Use user_print_options. Update.
* p-lang.h (pascal_val_print, pascal_value_print,
pascal_printstr, pascal_object_print_value_fields): Update.
(vtblprint, static_field_print): Don't declare.
* p-lang.c (pascal_printstr): Add options argument. Update.
* objc-lang.c (objc_printstr): Add options argument. Update.
* mt-tdep.c: Include valprint.h.
(mt_registers_info): Use get_raw_print_options.
* mips-tdep.c: Include valprint.h.
(mips_print_fp_register): Use get_formatted_print_options.
(mips_print_register): Likewise.
* mi/mi-main.c: Include valprint.h.
(get_register): Use get_user_print_options.
(mi_cmd_data_evaluate_expression): Likewise.
(mi_cmd_data_read_memory): Use get_formatted_print_options.
* mi/mi-cmd-stack.c: Include valprint.h.
(list_args_or_locals): Use get_raw_print_options.
* m2-valprint.c (print_function_pointer_address): Add addressprint
argument.
(m2_print_long_set): Remove format, pretty arguments.
(m2_print_unbounded_array): Remove format, deref_ref, pretty
arguments; add options. Update.
(print_unpacked_pointer): Remove format argument; add options.
Now static. Update.
(print_variable_at_address): Remove format, deref_ref, pretty
arguments; add options. Update.
(m2_print_array_contents): Likewise.
(m2_val_print): Likewise.
* m2-lang.h (m2_val_print): Update.
* m2-lang.c (m2_printstr): Add options argument. Update.
* language.h (struct value_print_options): Declare.
(struct language_defn) <la_printstr>: Add options argument.
<la_val_print>: Remove format, deref_ref, pretty argument; add
options.
<la_value_print>: Remove format, pretty arguments; add options.
<la_print_array_index>: Likewise.
(LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING,
LA_PRINT_ARRAY_INDEX): Update.
(default_print_array_index): Update.
* language.c (default_print_array_index): Remove format, pretty
arguments; add options. Update.
(unk_lang_printstr): Add options argument.
(unk_lang_val_print): Remove format, deref_ref, pretty arguments;
add options.
(unk_lang_value_print): Remove format, pretty arguments; add
options.
* jv-valprint.c (java_value_print): Remove format, pretty
arguments; add options. Update.
(java_print_value_fields): Likewise.
(java_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
* jv-lang.h (java_val_print, java_value_print): Declare.
* infcmd.c: Include valprint.h.
(print_return_value): Use get_raw_print_options.
(default_print_registers_info): Use get_user_print_options,
get_formatted_print_options.
(registers_info): Use get_formatted_print_options.
* gdbtypes.h (struct value_print_options): Declare.
(print_scalar_formatted): Update.
* f-valprint.c (f77_print_array_1): Remove format, deref_ref,
pretty arguments; add options. Update.
(f77_print_array): Likewise.
(f_val_print): Likewise.
* f-lang.h (f_val_print): Update.
* f-lang.c (f_printstr): Add options argument. Update.
(c_value_print): Update declaration.
* expprint.c: Include valprint.h.
(print_subexp_standard): Use get_raw_print_options,
get_user_print_options.
* eval.c: Include valprint.h.
(objectprint): Don't declare.
(evaluate_subexp_standard): Use get_user_print_options.
* cp-valprint.c (vtblprint, objectprint, static_field_print):
Remove.
(cp_print_value_fields): Remove format, pretty arguments; add
options. Update.
(cp_print_value): Likewise.
(cp_print_static_field): Likewise.
(_initialize_cp_valprint): Use user_print_options. Update.
* c-valprint.c (print_function_pointer_address): Add addressprint
argument.
(c_val_print): Remove format, deref_ref, pretty arguments; add
options. Update.
(c_value_print): Add options argument. Update.
* c-lang.h (c_val_print, c_value_print, c_printstr): Update.
(vtblprint, static_field_print): Don't declare.
(cp_print_value_fields): Update.
* c-lang.c (c_printstr): Add options argument. Update.
* breakpoint.c: Include valprint.h.
(addressprint): Don't declare.
(watchpoint_value_print): Use get_user_print_options.
(print_one_breakpoint_location): Likewise.
(breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention,
print_exception_catchpoint): Likewise.
* auxv.c (fprint_target_auxv): Don't declare addressprint. Use
get_user_print_options.
* ada-valprint.c (struct ada_val_print_args): Remove format,
deref_ref, and pretty; add options.
(print_optional_low_bound): Add options argument.
(val_print_packed_array_elements): Remove format and pretty
arguments; add options. Update.
(printstr): Add options argument. Update.
(ada_printstr): Likewise.
(ada_val_print): Remove format, deref_ref, pretty arguments; add
options argument. Update.
(ada_val_print_stub): Update.
(ada_val_print_array): Remove format, deref_ref, pretty arguments;
add options. Update.
(ada_val_print_1): Likewise.
(print_variant_part): Likewise.
(ada_value_print): Remove format, pretty arguments; add options.
Update.
(print_record): Likewise.
(print_field_values): Likewise.
* ada-lang.h (ada_val_print, ada_value_print, ada_printstr):
Update.
* ada-lang.c (ada_print_array_index): Add options argument; remove
format and pretty arguments.
(print_one_exception): Use get_user_print_options.
gdb/testsuite
* gdb.base/exprs.exp (test_expr): Add enum formatting tests.
2008-10-28 17:19:58 +00:00
|
|
|
get_raw_print_options (&opts);
|
|
|
|
value_print (val, stream, &opts);
|
1999-07-07 20:19:36 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fputs_filtered ("{", stream);
|
|
|
|
type_print (exp->elts[pc + 1].type, "", stream, 0);
|
|
|
|
fputs_filtered ("} ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
1999-07-07 20:19:36 +00:00
|
|
|
fputs_filtered (")", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
|
|
|
|
2006-10-10 03:17:53 +00:00
|
|
|
case UNOP_MEMVAL_TLS:
|
|
|
|
(*pos) += 3;
|
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
fputs_filtered ("{", stream);
|
|
|
|
type_print (exp->elts[pc + 2].type, "", stream, 0);
|
|
|
|
fputs_filtered ("} ", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
if ((int) prec > (int) PREC_PREFIX)
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
return;
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
case BINOP_ASSIGN_MODIFY:
|
|
|
|
opcode = exp->elts[pc + 1].opcode;
|
|
|
|
(*pos) += 2;
|
|
|
|
myprec = PREC_ASSIGN;
|
|
|
|
assoc = 1;
|
|
|
|
assign_modify = 1;
|
|
|
|
op_str = "???";
|
|
|
|
for (tem = 0; op_print_tab[tem].opcode != OP_NULL; tem++)
|
|
|
|
if (op_print_tab[tem].opcode == opcode)
|
|
|
|
{
|
|
|
|
op_str = op_print_tab[tem].string;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (op_print_tab[tem].opcode != opcode)
|
|
|
|
/* Not found; don't try to keep going because we don't know how
|
|
|
|
to interpret further elements. */
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Invalid expression"));
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
/* C++ ops */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
case OP_THIS:
|
|
|
|
++(*pos);
|
|
|
|
fputs_filtered ("this", stream);
|
|
|
|
return;
|
|
|
|
|
2002-11-19 03:36:44 +00:00
|
|
|
/* Objective-C ops */
|
|
|
|
|
|
|
|
case OP_OBJC_SELF:
|
|
|
|
++(*pos);
|
|
|
|
fputs_filtered ("self", stream); /* The ObjC equivalent of "this". */
|
|
|
|
return;
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
/* Modula-2 ops */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
case MULTI_SUBSCRIPT:
|
|
|
|
(*pos) += 2;
|
|
|
|
nargs = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fprintf_unfiltered (stream, " [");
|
|
|
|
for (tem = 0; tem < nargs; tem++)
|
|
|
|
{
|
|
|
|
if (tem != 0)
|
|
|
|
fprintf_unfiltered (stream, ", ");
|
|
|
|
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
|
|
|
|
}
|
|
|
|
fprintf_unfiltered (stream, "]");
|
|
|
|
return;
|
|
|
|
|
|
|
|
case BINOP_VAL:
|
1999-07-07 20:19:36 +00:00
|
|
|
(*pos) += 2;
|
|
|
|
fprintf_unfiltered (stream, "VAL(");
|
|
|
|
type_print (exp->elts[pc + 1].type, "", stream, 0);
|
|
|
|
fprintf_unfiltered (stream, ",");
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
fprintf_unfiltered (stream, ")");
|
1999-04-16 01:35:26 +00:00
|
|
|
return;
|
1999-07-07 20:19:36 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
case BINOP_INCL:
|
|
|
|
case BINOP_EXCL:
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("print_subexp: Not implemented."));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
/* Default ops */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
op_str = "???";
|
|
|
|
for (tem = 0; op_print_tab[tem].opcode != OP_NULL; tem++)
|
|
|
|
if (op_print_tab[tem].opcode == opcode)
|
|
|
|
{
|
|
|
|
op_str = op_print_tab[tem].string;
|
|
|
|
myprec = op_print_tab[tem].precedence;
|
|
|
|
assoc = op_print_tab[tem].right_assoc;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (op_print_tab[tem].opcode != opcode)
|
|
|
|
/* Not found; don't try to keep going because we don't know how
|
|
|
|
to interpret further elements. For example, this happens
|
|
|
|
if opcode is OP_TYPE. */
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 04:06:14 +00:00
|
|
|
error (_("Invalid expression"));
|
1999-07-07 20:19:36 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Note that PREC_BUILTIN will always emit parentheses. */
|
|
|
|
if ((int) myprec < (int) prec)
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
if ((int) opcode > (int) BINOP_END)
|
|
|
|
{
|
|
|
|
if (assoc)
|
|
|
|
{
|
|
|
|
/* Unary postfix operator. */
|
|
|
|
print_subexp (exp, pos, stream, PREC_SUFFIX);
|
|
|
|
fputs_filtered (op_str, stream);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Unary prefix operator. */
|
|
|
|
fputs_filtered (op_str, stream);
|
|
|
|
if (myprec == PREC_BUILTIN_FUNCTION)
|
|
|
|
fputs_filtered ("(", stream);
|
|
|
|
print_subexp (exp, pos, stream, PREC_PREFIX);
|
|
|
|
if (myprec == PREC_BUILTIN_FUNCTION)
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Binary operator. */
|
|
|
|
/* Print left operand.
|
1999-07-07 20:19:36 +00:00
|
|
|
If operator is right-associative,
|
|
|
|
increment precedence for this operand. */
|
1999-04-16 01:35:26 +00:00
|
|
|
print_subexp (exp, pos, stream,
|
|
|
|
(enum precedence) ((int) myprec + assoc));
|
|
|
|
/* Print the operator itself. */
|
|
|
|
if (assign_modify)
|
|
|
|
fprintf_filtered (stream, " %s= ", op_str);
|
|
|
|
else if (op_str[0] == ',')
|
|
|
|
fprintf_filtered (stream, "%s ", op_str);
|
|
|
|
else
|
|
|
|
fprintf_filtered (stream, " %s ", op_str);
|
|
|
|
/* Print right operand.
|
1999-07-07 20:19:36 +00:00
|
|
|
If operator is left-associative,
|
|
|
|
increment precedence for this operand. */
|
1999-04-16 01:35:26 +00:00
|
|
|
print_subexp (exp, pos, stream,
|
|
|
|
(enum precedence) ((int) myprec + !assoc));
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((int) myprec < (int) prec)
|
|
|
|
fputs_filtered (")", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the operator corresponding to opcode OP as
|
|
|
|
a string. NULL indicates that the opcode was not found in the
|
|
|
|
current language table. */
|
|
|
|
char *
|
2000-07-30 01:48:28 +00:00
|
|
|
op_string (enum exp_opcode op)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int tem;
|
2003-09-09 08:05:43 +00:00
|
|
|
const struct op_print *op_print_tab;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
op_print_tab = current_language->la_op_print_tab;
|
|
|
|
for (tem = 0; op_print_tab[tem].opcode != OP_NULL; tem++)
|
|
|
|
if (op_print_tab[tem].opcode == op)
|
|
|
|
return op_print_tab[tem].string;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Support for dumping the raw data from expressions in a human readable
|
|
|
|
form. */
|
|
|
|
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
static char *op_name (struct expression *, enum exp_opcode);
|
2003-09-24 08:29:42 +00:00
|
|
|
static int dump_subexp_body (struct expression *exp, struct ui_file *, int);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
/* Name for OPCODE, when it appears in expression EXP. */
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
static char *
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
op_name (struct expression *exp, enum exp_opcode opcode)
|
|
|
|
{
|
|
|
|
return exp->language_defn->la_exp_desc->op_name (opcode);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Default name for the standard operator OPCODE (i.e., one defined in
|
|
|
|
the definition of enum exp_opcode). */
|
|
|
|
|
|
|
|
char *
|
|
|
|
op_name_standard (enum exp_opcode opcode)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
switch (opcode)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
static char buf[30];
|
|
|
|
|
|
|
|
sprintf (buf, "<unknown %d>", opcode);
|
|
|
|
return buf;
|
|
|
|
}
|
1999-07-07 20:19:36 +00:00
|
|
|
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_INCL:
|
|
|
|
return "BINOP_INCL";
|
|
|
|
case BINOP_EXCL:
|
|
|
|
return "BINOP_EXCL";
|
|
|
|
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_MEMVAL:
|
|
|
|
return "UNOP_MEMVAL";
|
2006-10-10 03:17:53 +00:00
|
|
|
case UNOP_MEMVAL_TLS:
|
|
|
|
return "UNOP_MEMVAL_TLS";
|
1999-07-07 20:19:36 +00:00
|
|
|
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_LOWER:
|
|
|
|
return "UNOP_LOWER";
|
|
|
|
case UNOP_UPPER:
|
|
|
|
return "UNOP_UPPER";
|
|
|
|
case UNOP_LENGTH:
|
|
|
|
return "UNOP_LENGTH";
|
|
|
|
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";
|
2002-11-19 03:36:44 +00:00
|
|
|
case OP_OBJC_SELF:
|
|
|
|
return "OP_OBJC_SELF";
|
1999-07-07 20:19:36 +00:00
|
|
|
case OP_SCOPE:
|
|
|
|
return "OP_SCOPE";
|
|
|
|
case OP_TYPE:
|
|
|
|
return "OP_TYPE";
|
|
|
|
case OP_LABELED:
|
|
|
|
return "OP_LABELED";
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-09-24 08:29:42 +00:00
|
|
|
dump_raw_expression (struct expression *exp, struct ui_file *stream,
|
|
|
|
char *note)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int elt;
|
|
|
|
char *opcode_name;
|
|
|
|
char *eltscan;
|
|
|
|
int eltsize;
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Dump of expression @ ");
|
1999-09-09 00:02:17 +00:00
|
|
|
gdb_print_host_address (exp, stream);
|
2000-02-29 07:45:13 +00:00
|
|
|
fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",
|
1999-07-07 20:19:36 +00:00
|
|
|
exp->language_defn->la_name, exp->nelts,
|
2000-02-29 07:45:13 +00:00
|
|
|
(long) sizeof (union exp_element));
|
1999-04-16 01:35:26 +00:00
|
|
|
fprintf_filtered (stream, "\t%5s %20s %16s %s\n", "Index", "Opcode",
|
|
|
|
"Hex Value", "String Value");
|
1999-07-07 20:19:36 +00:00
|
|
|
for (elt = 0; elt < exp->nelts; elt++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
fprintf_filtered (stream, "\t%5d ", elt);
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
opcode_name = op_name (exp, exp->elts[elt].opcode);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
fprintf_filtered (stream, "%20s ", opcode_name);
|
1999-07-07 20:19:36 +00:00
|
|
|
print_longest (stream, 'd', 0, exp->elts[elt].longconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
fprintf_filtered (stream, " ");
|
|
|
|
|
|
|
|
for (eltscan = (char *) &exp->elts[elt],
|
1999-07-07 20:19:36 +00:00
|
|
|
eltsize = sizeof (union exp_element);
|
1999-04-16 01:35:26 +00:00
|
|
|
eltsize-- > 0;
|
|
|
|
eltscan++)
|
|
|
|
{
|
|
|
|
fprintf_filtered (stream, "%c",
|
|
|
|
isprint (*eltscan) ? (*eltscan & 0xFF) : '.');
|
|
|
|
}
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-09-24 08:29:42 +00:00
|
|
|
/* Dump the subexpression of prefix expression EXP whose operator is at
|
|
|
|
position ELT onto STREAM. Returns the position of the next
|
|
|
|
subexpression in EXP. */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2003-09-24 08:29:42 +00:00
|
|
|
int
|
2000-07-30 01:48:28 +00:00
|
|
|
dump_subexp (struct expression *exp, struct ui_file *stream, int elt)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
static int indent = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "\n");
|
|
|
|
fprintf_filtered (stream, "\t%5d ", elt);
|
|
|
|
|
|
|
|
for (i = 1; i <= indent; i++)
|
|
|
|
fprintf_filtered (stream, " ");
|
|
|
|
indent += 2;
|
|
|
|
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
fprintf_filtered (stream, "%-20s ", op_name (exp, exp->elts[elt].opcode));
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2003-09-24 08:29:42 +00:00
|
|
|
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)
|
* parser-defs.h (struct exp_descriptor): New definition, containing
language-specific info for printing, prefixifying, dumping, and
evaluating expressions.
(exp_descriptor_standard): Declare new variable.
(print_subexp): Make global and declare here (from expprint.c).
(dump_subexp): Ditto.
(dump_subexp_body_standard): Declare.
(operator_length_standard): Declare.
(op_name_standard): Declare.
(print_subexp): Declare.
(print_subexp_standard): Declare.
* language.h (struct language_defn): Add la_exp_desc field to hold
pointer to table for language-specific operators.
Remove evaluate_exp field, which is now in struct exp_descriptor.
* parse.c (operator_length): Move most code to new
operator_length_standard function. Use language-specific information.
(operator_length_standard): New function taking most code from
operator_length.
(exp_descriptor_standard): New constant.
* expression.h (enum exp_opcode): Add definitions of OP_EXTENDED0
and OP_EXTENDED_LAST.
* expprint.c (print_subexp): Use language-specific print_subexp.
Make global; remove static declaration.
Move most code to print_subexp_standard.
(print_subexp_standard): New function, containing code formerly in
print_subexp.
(op_name): Add expression to argument signature.
Use langauge-specific op_name.
Move most code to op_name_standard.
(op_name_standard): New function, containing code formerly in op_name.
(dump_subexp): Use new version of op_name function.
Use language-specific dump_subexp_body, and move most existing code to
dump_subexp_body_standard.
(dump_raw_expression): Use new op_name interface.
(dump_subexp_body): Move most code to dump_subexp_body_standard.
(dump_subexp_body_standard): New function, containing code formerly
in dump_subexp_body.
* language.c (unknown_language): Add default la_exp_desc field and
remove evaluate_exp field.
(auto_language): Ditto.
(local_language): Ditto.
* f-lang.c (f_language_defn): Ditto.
* c-lang.c (c_language_defn): Ditto.
(cplus_language_defn): Ditto.
(asm_language_defn): Ditto.
(minimal_language_defn): Ditto.
* p-lang.c (pascal_language_defn): Ditto.
* m2-lang.c (m2_language_defn): Ditto.
* objc-lang.c (objc_language_defn): Ditto.
* jv-lang.c (exp_descriptor_java): New variable, containing
Java-specific expression evaluator.
(java_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* scm-lang.c (exp_descriptor_scm): New variable, containing
Scheme-specific expression evaluator.
(scm_language_defn): Add la_exp_desc field and remove evaluate_exp
field.
* objc-lang.c (print_object_command): Take evaluate_exp from the
la_exp_desc field.
* Makefile.in (eval.o): Add dependency on parser-defs.h.
* eval.c: Include parser-defs.h for the full declaration of
la_exp_desc's type.
(evaluate_subexp): Get evaluate_exp out of la_exp_desc field.
2003-09-25 08:40:45 +00:00
|
|
|
{
|
|
|
|
return exp->language_defn->la_exp_desc->dump_subexp_body (exp, stream, elt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Default value for subexp_body in exp_descriptor vector. */
|
|
|
|
|
|
|
|
int
|
|
|
|
dump_subexp_body_standard (struct expression *exp,
|
|
|
|
struct ui_file *stream, int elt)
|
2003-09-24 08:29:42 +00:00
|
|
|
{
|
|
|
|
int opcode = exp->elts[elt++].opcode;
|
|
|
|
|
|
|
|
switch (opcode)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
case TERNOP_COND:
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
case TERNOP_SLICE_COUNT:
|
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
case BINOP_ADD:
|
|
|
|
case BINOP_SUB:
|
|
|
|
case BINOP_MUL:
|
|
|
|
case BINOP_DIV:
|
|
|
|
case BINOP_REM:
|
|
|
|
case BINOP_MOD:
|
|
|
|
case BINOP_LSH:
|
|
|
|
case BINOP_RSH:
|
|
|
|
case BINOP_LOGICAL_AND:
|
|
|
|
case BINOP_LOGICAL_OR:
|
|
|
|
case BINOP_BITWISE_AND:
|
|
|
|
case BINOP_BITWISE_IOR:
|
|
|
|
case BINOP_BITWISE_XOR:
|
|
|
|
case BINOP_EQUAL:
|
|
|
|
case BINOP_NOTEQUAL:
|
|
|
|
case BINOP_LESS:
|
|
|
|
case BINOP_GTR:
|
|
|
|
case BINOP_LEQ:
|
|
|
|
case BINOP_GEQ:
|
|
|
|
case BINOP_REPEAT:
|
|
|
|
case BINOP_ASSIGN:
|
|
|
|
case BINOP_COMMA:
|
|
|
|
case BINOP_SUBSCRIPT:
|
|
|
|
case BINOP_EXP:
|
|
|
|
case BINOP_MIN:
|
|
|
|
case BINOP_MAX:
|
|
|
|
case BINOP_INTDIV:
|
|
|
|
case BINOP_ASSIGN_MODIFY:
|
|
|
|
case BINOP_VAL:
|
|
|
|
case BINOP_INCL:
|
|
|
|
case BINOP_EXCL:
|
|
|
|
case BINOP_CONCAT:
|
|
|
|
case BINOP_IN:
|
|
|
|
case BINOP_RANGE:
|
|
|
|
case BINOP_END:
|
2006-08-07 03:30:54 +00:00
|
|
|
case STRUCTOP_MEMBER:
|
|
|
|
case STRUCTOP_MPTR:
|
1999-04-16 01:35:26 +00:00
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
case UNOP_NEG:
|
|
|
|
case UNOP_LOGICAL_NOT:
|
|
|
|
case UNOP_COMPLEMENT:
|
|
|
|
case UNOP_IND:
|
|
|
|
case UNOP_ADDR:
|
|
|
|
case UNOP_PREINCREMENT:
|
|
|
|
case UNOP_POSTINCREMENT:
|
|
|
|
case UNOP_PREDECREMENT:
|
|
|
|
case UNOP_POSTDECREMENT:
|
|
|
|
case UNOP_SIZEOF:
|
|
|
|
case UNOP_PLUS:
|
|
|
|
case UNOP_CAP:
|
|
|
|
case UNOP_CHR:
|
|
|
|
case UNOP_ORD:
|
|
|
|
case UNOP_ABS:
|
|
|
|
case UNOP_FLOAT:
|
|
|
|
case UNOP_HIGH:
|
|
|
|
case UNOP_MAX:
|
|
|
|
case UNOP_MIN:
|
|
|
|
case UNOP_ODD:
|
|
|
|
case UNOP_TRUNC:
|
|
|
|
case UNOP_LOWER:
|
|
|
|
case UNOP_UPPER:
|
|
|
|
case UNOP_LENGTH:
|
|
|
|
case UNOP_CARD:
|
|
|
|
case UNOP_CHMAX:
|
|
|
|
case UNOP_CHMIN:
|
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
break;
|
|
|
|
case OP_LONG:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].type, stream);
|
|
|
|
fprintf_filtered (stream, " (");
|
1999-04-16 01:35:26 +00:00
|
|
|
type_print (exp->elts[elt].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, "), value %ld (0x%lx)",
|
1999-07-07 20:19:36 +00:00
|
|
|
(long) exp->elts[elt + 1].longconst,
|
|
|
|
(long) exp->elts[elt + 1].longconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
elt += 3;
|
|
|
|
break;
|
|
|
|
case OP_DOUBLE:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].type, stream);
|
|
|
|
fprintf_filtered (stream, " (");
|
1999-04-16 01:35:26 +00:00
|
|
|
type_print (exp->elts[elt].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, "), value %g",
|
1999-07-07 20:19:36 +00:00
|
|
|
(double) exp->elts[elt + 1].doubleconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
elt += 3;
|
|
|
|
break;
|
|
|
|
case OP_VAR_VALUE:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Block @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].block, stream);
|
|
|
|
fprintf_filtered (stream, ", symbol @");
|
|
|
|
gdb_print_host_address (exp->elts[elt + 1].symbol, stream);
|
|
|
|
fprintf_filtered (stream, " (%s)",
|
* ax-gdb.c (gen_var_ref): Use SYMBOL_LINKAGE_NAME.
* blockframe.c (find_pc_partial_function): Likewise.
* buildsym.c (find_symbol_in_list): Likewise.
* c-valprint.c (c_val_print): Likewise.
* coffread.c (patch_opaque_types, process_coff_symbol): Likewise.
(coff_read_enum_type): Likewise. Use SYMBOL_SET_LINKAGE_NAME.
* cp-support.c (cp_remove_params): Renamed from remove_params and
made global.
(overload_list_add_symbol): Update call to remove_params.
* cp-support.h (cp_remove_params): Declare.
* dwarf2read.c (process_enumeration_scope): Use SYMBOL_LINKAGE_NAME.
(dwarf2_const_value): Use SYMBOL_PRINT_NAME.
* expprint.c (dump_subexp_body_standard): Likewise.
* f-valprint.c (info_common_command, there_is_a_visible_common_named):
Use SYMBOL_LINKAGE_NAME to find symbols and SYMBOL_PRINT_NAME
for messages.
* findvar.c (read_var_value): Use SYMBOL_LINKAGE_NAME.
* gnu-v2-abi.c (gnuv2_value_rtti_type): Likewise.
* hppa-hpux-tdep.c (hppa32_hpux_in_solib_call_trampoline)
(hppa_hpux_skip_trampoline_code): Use SYMBOL_LINKAGE_NAME to find
symbols and SYMBOL_PRINT_NAME for messages.
* jv-lang.c (add_class_symbol): Use SYMBOL_SET_LINKAGE_NAME.
* linespec.c (decode_line_2): Use SYMBOL_LINKAGE_NAME.
* mdebugread.c (parse_symbol): Use SYMBOL_LINKAGE_NAME and
SYMBOL_SET_LINKAGE_NAME.
(mylookup_symbol): Use SYMBOL_LINKAGE_NAME.
* minsyms.c (add_minsym_to_demangled_hash_table): Use
SYMBOL_SEARCH_NAME.
(lookup_minimal_symbol): Use SYMBOL_LINKAGE_NAME or
SYMBOL_MATCHES_SEARCH_NAME, depending on the pass.
* objfiles.h (ALL_OBJFILE_MSYMBOLS): Use SYMBOL_LINKAGE_NAME.
* printcmd.c (build_address_symbolic): Use SYMBOL_LINKAGE_NAME.
(address_info): Use SYMBOL_PRINT_NAME for messages and
SYMBOL_LINKAGE_NAME for lookups.
* sol-thread.c (info_cb): Use SYMBOL_PRINT_NAME for messages.
* stabsread.c (patch_block_stabs, define_symbol)
(read_type, read_enum_type, common_block_end)
(cleanup_undefined_types_1, scan_file_globals): Use
SYMBOL_LINKAGE_NAME, SYMBOL_SET_LINKAGE_NAME, ALL_OBJFILE_MSYMBOLS,
and SYMBOL_PRINT_NAME.
* stack.c (print_frame_args): Use SYMBOL_LINKAGE_NAME.
(print_frame, frame_info): Use SYMBOL_PRINT_NAME for output. Use
cp_remove_params instead of cplus_demangle.
(print_block_frame_labels, print_frame_arg_vars): Use
SYMBOL_LINKAGE_NAME.
* symmisc.c (dump_msymbols): Use ALL_OBJFILE_MSYMBOLS and
SYMBOL_LINKAGE_NAME.
(dump_symtab_1, print_symbol, print_partial_symbols)
(maintenance_check_symtabs): Use SYMBOL_LINKAGE_NAME.
* symtab.h (DEPRECATED_SYMBOL_NAME): Delete.
(SYMBOL_SET_LINKAGE_NAME): New.
(SYMBOL_SET_NAMES): Add a comment.
* tracepoint.c (set_traceframe_context, validate_actionline)
(collect_symbol, scope_info): Use SYMBOL_LINKAGE_NAME for
lookups and SYMBOL_PRINT_NAME for output.
* typeprint.c (typedef_print): Use SYMBOL_LINKAGE_NAME.
* xcoffread.c (process_xcoff_symbol): Use SYMBOL_SET_LINKAGE_NAME.
2008-08-21 18:14:39 +00:00
|
|
|
SYMBOL_PRINT_NAME (exp->elts[elt + 1].symbol));
|
1999-04-16 01:35:26 +00:00
|
|
|
elt += 3;
|
|
|
|
break;
|
|
|
|
case OP_LAST:
|
|
|
|
fprintf_filtered (stream, "History element %ld",
|
1999-07-07 20:19:36 +00:00
|
|
|
(long) exp->elts[elt].longconst);
|
1999-04-16 01:35:26 +00:00
|
|
|
elt += 2;
|
|
|
|
break;
|
|
|
|
case OP_REGISTER:
|
2007-06-13 17:11:09 +00:00
|
|
|
fprintf_filtered (stream, "Register $%s", &exp->elts[elt + 1].string);
|
|
|
|
elt += 3 + BYTES_TO_EXP_ELEM (exp->elts[elt].longconst + 1);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case OP_INTERNALVAR:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Internal var @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].internalvar, stream);
|
|
|
|
fprintf_filtered (stream, " (%s)",
|
1999-04-16 01:35:26 +00:00
|
|
|
exp->elts[elt].internalvar->name);
|
|
|
|
elt += 2;
|
|
|
|
break;
|
|
|
|
case OP_FUNCALL:
|
|
|
|
{
|
2003-09-24 08:29:42 +00:00
|
|
|
int i, nargs;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
nargs = longest_to_int (exp->elts[elt].longconst);
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Number of args: %d", nargs);
|
|
|
|
elt += 2;
|
|
|
|
|
|
|
|
for (i = 1; i <= nargs + 1; i++)
|
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case OP_ARRAY:
|
|
|
|
{
|
|
|
|
int lower, upper;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
lower = longest_to_int (exp->elts[elt].longconst);
|
|
|
|
upper = longest_to_int (exp->elts[elt + 1].longconst);
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Bounds [%d:%d]", lower, upper);
|
|
|
|
elt += 3;
|
|
|
|
|
|
|
|
for (i = 1; i <= upper - lower + 1; i++)
|
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case UNOP_MEMVAL:
|
|
|
|
case UNOP_CAST:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].type, stream);
|
|
|
|
fprintf_filtered (stream, " (");
|
1999-04-16 01:35:26 +00:00
|
|
|
type_print (exp->elts[elt].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, ")");
|
|
|
|
elt = dump_subexp (exp, stream, elt + 2);
|
|
|
|
break;
|
2006-10-10 03:17:53 +00:00
|
|
|
case UNOP_MEMVAL_TLS:
|
|
|
|
fprintf_filtered (stream, "TLS type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt + 1].type, stream);
|
|
|
|
fprintf_filtered (stream, " (__thread /* \"%s\" */ ",
|
|
|
|
(exp->elts[elt].objfile == NULL ? "(null)"
|
|
|
|
: exp->elts[elt].objfile->name));
|
|
|
|
type_print (exp->elts[elt + 1].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, ")");
|
|
|
|
elt = dump_subexp (exp, stream, elt + 3);
|
|
|
|
break;
|
1999-04-16 01:35:26 +00:00
|
|
|
case OP_TYPE:
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].type, stream);
|
|
|
|
fprintf_filtered (stream, " (");
|
1999-04-16 01:35:26 +00:00
|
|
|
type_print (exp->elts[elt].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, ")");
|
|
|
|
elt += 2;
|
|
|
|
break;
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
case STRUCTOP_PTR:
|
|
|
|
{
|
|
|
|
char *elem_name;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
len = longest_to_int (exp->elts[elt].longconst);
|
|
|
|
elem_name = &exp->elts[elt + 1].string;
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Element name: `%.*s'", len, elem_name);
|
|
|
|
elt = dump_subexp (exp, stream, elt + 3 + BYTES_TO_EXP_ELEM (len + 1));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case OP_SCOPE:
|
|
|
|
{
|
|
|
|
char *elem_name;
|
|
|
|
int len;
|
|
|
|
|
1999-09-09 00:02:17 +00:00
|
|
|
fprintf_filtered (stream, "Type @");
|
|
|
|
gdb_print_host_address (exp->elts[elt].type, stream);
|
|
|
|
fprintf_filtered (stream, " (");
|
1999-04-16 01:35:26 +00:00
|
|
|
type_print (exp->elts[elt].type, NULL, stream, 0);
|
|
|
|
fprintf_filtered (stream, ") ");
|
|
|
|
|
|
|
|
len = longest_to_int (exp->elts[elt + 1].longconst);
|
|
|
|
elem_name = &exp->elts[elt + 2].string;
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Field name: `%.*s'", len, elem_name);
|
|
|
|
elt += 4 + BYTES_TO_EXP_ELEM (len + 1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
case OP_NULL:
|
|
|
|
case MULTI_SUBSCRIPT:
|
|
|
|
case OP_F77_UNDETERMINED_ARGLIST:
|
|
|
|
case OP_COMPLEX:
|
|
|
|
case OP_STRING:
|
|
|
|
case OP_BITSTRING:
|
|
|
|
case OP_BOOL:
|
|
|
|
case OP_M2_STRING:
|
|
|
|
case OP_THIS:
|
|
|
|
case OP_LABELED:
|
|
|
|
case OP_NAME:
|
|
|
|
fprintf_filtered (stream, "Unknown format");
|
|
|
|
}
|
|
|
|
|
|
|
|
return elt;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-09-24 08:29:42 +00:00
|
|
|
dump_prefix_expression (struct expression *exp, struct ui_file *stream)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int elt;
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "Dump of expression @ ");
|
1999-09-09 00:02:17 +00:00
|
|
|
gdb_print_host_address (exp, stream);
|
2003-09-24 08:29:42 +00:00
|
|
|
fputs_filtered (", after conversion to prefix form:\nExpression: `", stream);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (exp->elts[0].opcode != OP_TYPE)
|
|
|
|
print_expression (exp, stream);
|
|
|
|
else
|
|
|
|
fputs_filtered ("Type printing not yet supported....", stream);
|
2000-02-29 07:45:13 +00:00
|
|
|
fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",
|
1999-07-07 20:19:36 +00:00
|
|
|
exp->language_defn->la_name, exp->nelts,
|
2000-02-29 07:45:13 +00:00
|
|
|
(long) sizeof (union exp_element));
|
1999-04-16 01:35:26 +00:00
|
|
|
fputs_filtered ("\n", stream);
|
|
|
|
|
1999-07-07 20:19:36 +00:00
|
|
|
for (elt = 0; elt < exp->nelts;)
|
1999-04-16 01:35:26 +00:00
|
|
|
elt = dump_subexp (exp, stream, elt);
|
|
|
|
fputs_filtered ("\n", stream);
|
|
|
|
}
|