1999-04-16 03:35:26 +02:00
|
|
|
/* Java language support routines for GDB, the GNU debugger.
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
Copyright 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02: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
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02: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 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "expression.h"
|
|
|
|
#include "parser-defs.h"
|
|
|
|
#include "language.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "symfile.h"
|
|
|
|
#include "objfiles.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include "value.h"
|
|
|
|
#include "c-lang.h"
|
|
|
|
#include "jv-lang.h"
|
|
|
|
#include "gdbcore.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 01:01:07 +01:00
|
|
|
#include "block.h"
|
2003-04-02 05:02:46 +02:00
|
|
|
#include "demangle.h"
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
#include "dictionary.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
|
struct type *java_int_type;
|
|
|
|
struct type *java_byte_type;
|
|
|
|
struct type *java_short_type;
|
|
|
|
struct type *java_long_type;
|
|
|
|
struct type *java_boolean_type;
|
|
|
|
struct type *java_char_type;
|
|
|
|
struct type *java_float_type;
|
|
|
|
struct type *java_double_type;
|
|
|
|
struct type *java_void_type;
|
|
|
|
|
1999-05-25 20:09:09 +02:00
|
|
|
/* Local functions */
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void _initialize_java_language (void);
|
1999-05-25 20:09:09 +02:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
static int java_demangled_signature_length (char *);
|
|
|
|
static void java_demangled_signature_copy (char *, char *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
static struct symtab *get_java_class_symtab (void);
|
2001-10-21 03:57:42 +02:00
|
|
|
static char *get_java_utf8_name (struct obstack *obstack, struct value *name);
|
|
|
|
static int java_class_is_primitive (struct value *clas);
|
2000-05-28 03:12:42 +02:00
|
|
|
static struct type *java_lookup_type (char *signature);
|
2001-10-21 03:57:42 +02:00
|
|
|
static struct value *java_value_string (char *ptr, int len);
|
1999-05-25 20:09:09 +02:00
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
static void java_emit_char (int c, struct ui_file * stream, int quoter);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/* This objfile contains symtabs that have been dynamically created
|
|
|
|
to record dynamically loaded Java classes and dynamically
|
|
|
|
compiled java methods. */
|
|
|
|
|
|
|
|
static struct objfile *dynamics_objfile = NULL;
|
|
|
|
|
2001-10-21 03:57:42 +02:00
|
|
|
static struct type *java_link_class_type (struct type *, struct value *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2003-02-04 22:55:26 +01:00
|
|
|
/* FIXME: carlton/2003-02-04: This is the main or only caller of
|
|
|
|
allocate_objfile with first argument NULL; as a result, this code
|
|
|
|
breaks every so often. Somebody should write a test case that
|
|
|
|
exercises GDB in various ways (e.g. something involving loading a
|
|
|
|
dynamic library) after this code has been called. */
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
static struct objfile *
|
2000-07-30 03:48:28 +02:00
|
|
|
get_dynamics_objfile (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (dynamics_objfile == NULL)
|
|
|
|
{
|
1999-10-12 06:37:53 +02:00
|
|
|
dynamics_objfile = allocate_objfile (NULL, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
return dynamics_objfile;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
/* symtab contains classes read from the inferior. */
|
|
|
|
|
|
|
|
static struct symtab *class_symtab = NULL;
|
|
|
|
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
static void free_class_block (struct symtab *symtab);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-05-25 20:09:09 +02:00
|
|
|
static struct symtab *
|
2000-07-30 03:48:28 +02:00
|
|
|
get_java_class_symtab (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (class_symtab == NULL)
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
struct objfile *objfile = get_dynamics_objfile ();
|
1999-04-16 03:35:26 +02:00
|
|
|
struct blockvector *bv;
|
|
|
|
struct block *bl;
|
|
|
|
class_symtab = allocate_symtab ("<java-classes>", objfile);
|
|
|
|
class_symtab->language = language_java;
|
|
|
|
bv = (struct blockvector *)
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
obstack_alloc (&objfile->symbol_obstack,
|
|
|
|
sizeof (struct blockvector) + sizeof (struct block *));
|
1999-04-16 03:35:26 +02:00
|
|
|
BLOCKVECTOR_NBLOCKS (bv) = 1;
|
|
|
|
BLOCKVECTOR (class_symtab) = bv;
|
|
|
|
|
|
|
|
/* Allocate dummy STATIC_BLOCK. */
|
|
|
|
bl = (struct block *)
|
|
|
|
obstack_alloc (&objfile->symbol_obstack, sizeof (struct block));
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
BLOCK_DICT (bl) = dict_create_linear (&objfile->symbol_obstack,
|
|
|
|
NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
BLOCK_START (bl) = 0;
|
|
|
|
BLOCK_END (bl) = 0;
|
|
|
|
BLOCK_FUNCTION (bl) = NULL;
|
|
|
|
BLOCK_SUPERBLOCK (bl) = NULL;
|
2003-04-15 David Carlton <carlton@math.stanford.edu>
* Makefile.in (SFILES): Add cp-namespace.c.
(COMMON_OBS): Add cp-namespace.o.
(block.o): Depend on gdb_obstack_h and cp_support_h.
(buildsym.o): Depend on cp_support_h.
(cp-namespace.o): New.
(cp-support.o): Depend on gdb_string_h, demangle_h, gdb_assert_h,
gdb_obstack_h, symtab_h, symfile_h, and gdbcmd_h.
(dwarf2read.o): Depend on cp_support_h.
* jv-lang.c (get_java_class_symtab): Set BLOCK_NAMESPACE.
* dwarf2read.c (process_die): Set processing_has_namespace_info,
processing_current_namespace.
(read_namespace): Update processing_current_namespace; check for
anonymous namespaces.
(dwarf2_name): New function.
(dwarf2_extension): Ditto.
* cp-support.h: Update copyright, contributors.
Add inclusion guards.
Add opaque declaration for structs obstack, block, symbol.
(struct using_direct): New struct.
Add declarations for cp_find_first_component,
cp_entire_prefix_len, processing_has_namespace_info,
processing_current_namespace, cp_is_anonymous,
cp_add_using_directive, cp_initialize_namespace,
cp_finalize_namespace, cp_set_block_scope,
cp_scan_for_anonymous_namespaces.
* cp-namespace.c: New file.
* cp-support.c: Update copyright.
Include ctype.h, gdb_assert.h, gdbcmd.h.
New variable maint_cplus_cmd_list.
(cp_find_first_component): New function.
(cp_entire_prefix_len, maint_cplus_command)
(first_component_command, _initialize_cp_support): Ditto.
* buildsym.c: Include cp-support.h.
New variable using_list.
(add_symbol_to_list): Check for anonymous namespaces.
(finish_block): Set block's scope.
(start_symtab): Initialize C++ namespace support.
(end_symtab): Finalize C++ namespace support.
* block.h: Add opaque declarations for structs
block_namespace_info, using_direct, and obstack.
Add declarations for block_set_scope and block_set_using.
(struct block): Add 'language_specific' member.
(BLOCK_NAMESPACE): New macro.
* block.c: Include gdb_obstack.h and cp-support.h.
(struct block_namespace_info): New struct.
(block_set_scope): New function.
(block_set_using, block_initialize_namespace): Ditto.
2003-04-15 David Carlton <carlton@math.stanford.edu>
* gdb.c++/maint.exp: New file.
2003-04-16 01:07:11 +02:00
|
|
|
BLOCK_NAMESPACE (bl) = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
BLOCK_GCC_COMPILED (bl) = 0;
|
|
|
|
BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK) = bl;
|
|
|
|
|
|
|
|
/* Allocate GLOBAL_BLOCK. This has to be relocatable. */
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
bl = (struct block *)
|
|
|
|
obstack_alloc (&objfile->symbol_obstack, sizeof (struct block));
|
1999-04-16 03:35:26 +02:00
|
|
|
*bl = *BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
BLOCK_DICT (bl) = dict_create_hashed_expandable ();
|
1999-04-16 03:35:26 +02:00
|
|
|
BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK) = bl;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
class_symtab->free_func = free_class_block;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
return class_symtab;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
add_class_symtab_symbol (struct symbol *sym)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct symtab *symtab = get_java_class_symtab ();
|
|
|
|
struct blockvector *bv = BLOCKVECTOR (symtab);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
dict_add_symbol (BLOCK_DICT (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)), sym);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
static struct symbol *add_class_symbol (struct type *type, CORE_ADDR addr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
static struct symbol *
|
2000-07-30 03:48:28 +02:00
|
|
|
add_class_symbol (struct type *type, CORE_ADDR addr)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct symbol *sym;
|
|
|
|
sym = (struct symbol *)
|
|
|
|
obstack_alloc (&dynamics_objfile->symbol_obstack, sizeof (struct symbol));
|
|
|
|
memset (sym, 0, sizeof (struct symbol));
|
|
|
|
SYMBOL_LANGUAGE (sym) = language_java;
|
2003-02-25 David Carlton <carlton@math.stanford.edu>
* symtab.h (SYMBOL_NATURAL_NAME): New macro.
(SYMBOL_LINKAGE_NAME): Ditto.
(SYMBOL_PRINT_NAME): Use SYMBOL_NATURAL_NAME and
SYMBOL_LINKAGE_NAME.
(struct general_symbol_info): Expand comment.
(DEPRECATED_SYMBOL_NAME): Rename from SYMBOL_NAME.
(SYMBOL_MATCHES_NAME): Use DEPRECATED_SYMBOL_NAME.
(SYMBOL_MATCHES_REGEXP): Ditto.
* symtab.c (symbol_natural_name): New function.
* objfiles.h: Replace all uses of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* xcoffread.c, valops.c, typeprint.c, tracepoint.c: Ditto.
* symtab.c, symmisc.c, symfile.c, stack.c, stabsread.c: Ditto.
* somsolib.c, sol-thread.c, rs6000-tdep.c, p-valprint.c: Ditto.
* printcmd.c, objfiles.c, objc-lang.c, mipsread.c: Ditto.
* minsyms.c, mdebugread.c, linespec.c, jv-lang.c: Ditto.
* i386-tdep.c, i386-linux-tdep.c, hpread.c, hppa-tdep.c: Ditto.
* gnu-v2-abi.c, f-valprint.c, findvar.c, expprint.c: Ditto.
* dwarfread.c, dwarf2read.c, dbxread.c, c-valprint.c: Ditto.
* cp-valprint.c, coffread.c, buildsym.c, breakpoint.c: Ditto.
* blockframe.c, ax-gdb.c, arm-linux-tdep.c, ada-lang.c: Ditto.
* ada-exp.y: Ditto.
* ada-exp.y: Update copyright.
* sol-thread.c, mipsread.c, jv-lang.c, f-valprint.c: Ditto.
* cp-valprint.c: Ditto.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* generic/gdbtk.h: Replace all instances of SYMBOL_NAME by
DEPRECATED_SYMBOL_NAME.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Ditto.
* generic/gdbtk-stack.c, generic/gdbtk-cmds.c: Update copyright.
2003-02-25 David Carlton <carlton@math.stanford.edu>
* mi-cmd-stack.c: Replace all instances of SYMBOL_NAME with
DEPRECATED_SYMBOL_NAME. Update copyright.
2003-02-25 22:36:23 +01:00
|
|
|
DEPRECATED_SYMBOL_NAME (sym) = TYPE_TAG_NAME (type);
|
1999-04-16 03:35:26 +02:00
|
|
|
SYMBOL_CLASS (sym) = LOC_TYPEDEF;
|
1999-07-07 22:19:36 +02:00
|
|
|
/* SYMBOL_VALUE (sym) = valu; */
|
1999-04-16 03:35:26 +02:00
|
|
|
SYMBOL_TYPE (sym) = type;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
SYMBOL_VALUE_ADDRESS (sym) = addr;
|
|
|
|
return sym;
|
|
|
|
}
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
|
|
|
|
/* Free the dynamic symbols block. */
|
|
|
|
static void
|
|
|
|
free_class_block (struct symtab *symtab)
|
|
|
|
{
|
|
|
|
struct blockvector *bv = BLOCKVECTOR (symtab);
|
|
|
|
struct block *bl = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
|
|
|
|
|
|
|
|
dict_free (BLOCK_DICT (bl));
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_lookup_class (char *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct symbol *sym;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
sym = lookup_symbol (name, expression_context_block, STRUCT_DOMAIN,
|
1999-04-16 03:35:26 +02:00
|
|
|
(int *) 0, (struct symtab **) NULL);
|
|
|
|
if (sym != NULL)
|
|
|
|
return SYMBOL_TYPE (sym);
|
|
|
|
#if 0
|
|
|
|
CORE_ADDR addr;
|
|
|
|
if (called from parser)
|
|
|
|
{
|
|
|
|
call lookup_class (or similar) in inferior;
|
1999-07-07 22:19:36 +02:00
|
|
|
if not
|
|
|
|
found:
|
1999-04-16 03:35:26 +02:00
|
|
|
return NULL;
|
|
|
|
addr = found in inferior;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
addr = 0;
|
|
|
|
struct type *type;
|
|
|
|
type = alloc_type (objfile);
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_STRUCT;
|
|
|
|
INIT_CPLUS_SPECIFIC (type);
|
1999-07-07 22:19:36 +02:00
|
|
|
TYPE_TAG_NAME (type) = obsavestring (name, strlen (name), &objfile->type_obstack);
|
1999-04-16 03:35:26 +02:00
|
|
|
TYPE_FLAGS (type) |= TYPE_FLAG_STUB;
|
|
|
|
TYPE ? = addr;
|
|
|
|
return type;
|
|
|
|
#else
|
|
|
|
/* FIXME - should search inferior's symbol table. */
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return a nul-terminated string (allocated on OBSTACK) for
|
|
|
|
a name given by NAME (which has type Utf8Const*). */
|
|
|
|
|
|
|
|
char *
|
2001-10-21 03:57:42 +02:00
|
|
|
get_java_utf8_name (struct obstack *obstack, struct value *name)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
char *chrs;
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *temp = name;
|
1999-04-16 03:35:26 +02:00
|
|
|
int name_length;
|
|
|
|
CORE_ADDR data_addr;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "length", NULL, "structure");
|
|
|
|
name_length = (int) value_as_long (temp);
|
|
|
|
data_addr = VALUE_ADDRESS (temp) + VALUE_OFFSET (temp)
|
|
|
|
+ TYPE_LENGTH (VALUE_TYPE (temp));
|
1999-07-07 22:19:36 +02:00
|
|
|
chrs = obstack_alloc (obstack, name_length + 1);
|
|
|
|
chrs[name_length] = '\0';
|
2000-05-20 12:29:51 +02:00
|
|
|
read_memory (data_addr, chrs, name_length);
|
1999-04-16 03:35:26 +02:00
|
|
|
return chrs;
|
|
|
|
}
|
|
|
|
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *
|
|
|
|
java_class_from_object (struct value *obj_val)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
/* This is all rather inefficient, since the offsets of vtable and
|
|
|
|
class are fixed. FIXME */
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *vtable_val;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (obj_val)) == TYPE_CODE_PTR
|
|
|
|
&& TYPE_LENGTH (TYPE_TARGET_TYPE (VALUE_TYPE (obj_val))) == 0)
|
|
|
|
obj_val = value_at (get_java_object_type (),
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
value_as_address (obj_val), NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
vtable_val = value_struct_elt (&obj_val, NULL, "vtable", NULL, "structure");
|
|
|
|
return value_struct_elt (&vtable_val, NULL, "class", NULL, "structure");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if CLASS_IS_PRIMITIVE(value of clas): */
|
1999-05-25 20:09:09 +02:00
|
|
|
static int
|
2001-10-21 03:57:42 +02:00
|
|
|
java_class_is_primitive (struct value *clas)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *vtable = value_struct_elt (&clas, NULL, "vtable", NULL, "struct");
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
CORE_ADDR i = value_as_address (vtable);
|
1999-04-16 03:35:26 +02:00
|
|
|
return (int) (i & 0x7fffffff) == (int) 0x7fffffff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read a GCJ Class object, and generated a gdb (TYPE_CODE_STRUCT) type. */
|
|
|
|
|
|
|
|
struct type *
|
2001-10-21 03:57:42 +02:00
|
|
|
type_from_class (struct value *clas)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct type *type;
|
|
|
|
char *name;
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *temp;
|
1999-04-16 03:35:26 +02:00
|
|
|
struct objfile *objfile;
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *utf8_name;
|
1999-04-16 03:35:26 +02:00
|
|
|
char *nptr;
|
|
|
|
CORE_ADDR addr;
|
|
|
|
struct block *bl;
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
struct dict_iterator iter;
|
1999-04-16 03:35:26 +02:00
|
|
|
int is_array = 0;
|
|
|
|
|
|
|
|
type = check_typedef (VALUE_TYPE (clas));
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
{
|
|
|
|
if (value_logical_not (clas))
|
|
|
|
return NULL;
|
|
|
|
clas = value_ind (clas);
|
|
|
|
}
|
|
|
|
addr = VALUE_ADDRESS (clas) + VALUE_OFFSET (clas);
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
get_java_class_symtab ();
|
|
|
|
bl = BLOCKVECTOR_BLOCK (BLOCKVECTOR (class_symtab), GLOBAL_BLOCK);
|
2003-06-11 David Carlton <carlton@bactrian.org>
* dictionary.h: New.
* dictionary.c: New.
* block.h: Add opaque declaration for struct dictionary.
(struct block): Add 'dict' member; delete 'hashtable', 'nsyms',
'sym' members.
(BLOCK_DICT): New macro.
Delete macros BLOCK_HASHTABLE, BLOCK_NSYMS, BLOCK_SYM,
BLOCK_BUCKETS, BLOCK_BUCKET, BLOCK_HASHTABLE_SIZE,
BLOCK_SHOULD_SORT.
(ALL_BLOCK_SYMBOLS): Update definition.
* Makefile.in (SFILES): Add dictionary.c.
(dictionary_h): New.
(COMMON_OBS): Add dictionary.o.
(dictionary.o): New.
(ada-lang.o): Depend on dictionary_h.
(buildsym.o, coffread.o, jv-lang.o, mdebugread.o, objfiles.o)
(stack.o, symmisc.o, symtab.o, tracepoint.o, valops.o)
(mi-cmd-stack.o): Ditto.
(gdbtk-cmds.o): Update dependencies.
(gdbtk-stack.o): Ditto.
* ada-lang.c: Include dictionary.h.
(symtab_for_sym): Update uses of ALL_BLOCK_SYMBOLS.
(fill_in_ada_prototype, debug_print_block): Ditto.
(ada_add_block_symbols): Update uses of ALL_BLOCK_SYMBOLS; replace
explicit iteration by use of ALL_BLOCK_SYMBOLS. Delete variable
'is_sorted'.
* mdebugread.c: Include dictionary.h.
(struct parse_stack): Delete 'maxsyms' member.
(parse_symbol): Update calls to new_block. Delete calls to
shrink_block. Use dictionary methods.
(psymtab_to_symtab_1): Delete calls to sort_symtab_syms.
Update calls to new_symtab. Don't maintain maxsyms data.
(mylookup_symbol): Update use of ALL_BLOCK_SYMBOLS.
(add_symbol): Just call dict_add_symbol.
(new_symtab): Delete 'maxsyms' argument.
(new_symtab): Update calls to new_block.
(new_block): Delete 'maxsyms' argument; add 'function' argument.
(shrink_block): Delete function.
(fixup_sigtramp): Update call to new_block. Add symbol via
dict_add_symbol.
* jv-lang.c: Include dictionary.h.
(get_java_class_symtab): Set the BLOCK_DICT of the blocks
appropriately. Set class_symtab->free_func. Make sure the
blockvector is big enough to hold two blocks.
(add_class_symtab_symbol): Use dictionary methods.
(free_class_block): New function.
(type_from_class): Replace explicit iteration by
ALL_BLOCK_SYMBOLS.
* symtab.h (struct symtab): Replace 'free_ptr' method by
'free_func'.
* dwarf2read.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* dwarfread.c (psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* coffread.c (coff_symfile_read): Delete call to sort_symtab_syms.
Include dictionary.h.
(patch_opaque_types): Update use of ALL_BLOCK_SYMBOLS.
* dbxread.c (dbx_psymtab_to_symtab_1): Delete call to
sort_symtab_syms.
* objfiles.c: Include dictionary.h.
(objfile_relocate): Update use of ALL_BLOCK_SYMBOLS.
* buildsym.c: Include dictionary.h.
(finish_block): Use dictionary methods.
(end_symtab): Set free_func to NULL, not free_ptr.
* tracepoint.c: Include dictionary.h.
(add_local_symbols): Update use of ALL_BLOCK_SYMBOLS.
(scope_info): Ditto.
* stack.c: Include dictionary.h.
(print_block_frame_locals): Update use of ALL_BLOCK_SYMBOLS.
(print_block_frame_labels, print_frame_arg_vars)
(print_frame_args): Ditto.
* symmisc.c (free_symtab_block): Use dictionary methods.
(dump_symtab): Ditto.
(free_symtab): Replace use of 'free_ptr' by 'free_func'.
Include dictionary.h.
* symfile.h: Delete declarations of sort_block_syms,
sort_symtab_syms.
* symfile.c (sort_block_syms): Delete.
(sort_symtab_syms): Delete.
* symtab.c: Include dictionary.h.
(lookup_block_symbol): Use dictionary iterators.
(find_pc_sect_symtab): Update use of ALL_BLOCK_SYMBOLS.
(search_symbols, make_symbol_completion_list): Ditto.
(make_symbol_overload_list): Ditto.
* valops.c (value_of_local): Use dict_empty.
Include dictionary.h.
2003-06-11 David Carlton <carlton@bactrian.org>
* generic/gdbtk-stack.c: Include dictionary.h.
(gdb_block_vars): Update use of ALL_BLOCK_SYMBOLS.
(gdb_get_blocks, gdb_get_vars_command): Ditto.
* generic/gdbtk-cmds.c: Include dictionary.h.
(gdb_listfuncs): Update use of ALL_BLOCK_SYMBOLS.
2003-06-11 David Carlton <carlton@bactrian.org>
* mi-cmd-stack.c: Include dictionary.h.
(list_args_or_locals): Update use of ALL_BLOCK_SYMBOLS.
2003-06-12 01:29:49 +02:00
|
|
|
ALL_BLOCK_SYMBOLS (block, iter, sym)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (SYMBOL_VALUE_ADDRESS (sym) == addr)
|
|
|
|
return SYMBOL_TYPE (sym);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
objfile = get_dynamics_objfile ();
|
1999-04-16 03:35:26 +02:00
|
|
|
if (java_class_is_primitive (clas))
|
|
|
|
{
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *sig;
|
1999-04-16 03:35:26 +02:00
|
|
|
temp = clas;
|
|
|
|
sig = value_struct_elt (&temp, NULL, "method_count", NULL, "structure");
|
|
|
|
return java_primitive_type (value_as_long (sig));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get Class name. */
|
|
|
|
/* if clasloader non-null, prepend loader address. FIXME */
|
|
|
|
temp = clas;
|
|
|
|
utf8_name = value_struct_elt (&temp, NULL, "name", NULL, "structure");
|
|
|
|
name = get_java_utf8_name (&objfile->type_obstack, utf8_name);
|
1999-07-07 22:19:36 +02:00
|
|
|
for (nptr = name; *nptr != 0; nptr++)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (*nptr == '/')
|
|
|
|
*nptr = '.';
|
|
|
|
}
|
|
|
|
|
|
|
|
type = java_lookup_class (name);
|
|
|
|
if (type != NULL)
|
|
|
|
return type;
|
|
|
|
|
|
|
|
type = alloc_type (objfile);
|
|
|
|
TYPE_CODE (type) = TYPE_CODE_STRUCT;
|
|
|
|
INIT_CPLUS_SPECIFIC (type);
|
|
|
|
|
|
|
|
if (name[0] == '[')
|
|
|
|
{
|
|
|
|
char *signature = name;
|
|
|
|
int namelen = java_demangled_signature_length (signature);
|
|
|
|
if (namelen > strlen (name))
|
1999-07-07 22:19:36 +02:00
|
|
|
name = obstack_alloc (&objfile->type_obstack, namelen + 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
java_demangled_signature_copy (name, signature);
|
|
|
|
name[namelen] = '\0';
|
|
|
|
is_array = 1;
|
|
|
|
temp = clas;
|
|
|
|
/* Set array element type. */
|
|
|
|
temp = value_struct_elt (&temp, NULL, "methods", NULL, "structure");
|
|
|
|
VALUE_TYPE (temp) = lookup_pointer_type (VALUE_TYPE (clas));
|
|
|
|
TYPE_TARGET_TYPE (type) = type_from_class (temp);
|
|
|
|
}
|
|
|
|
|
|
|
|
ALLOCATE_CPLUS_STRUCT_TYPE (type);
|
|
|
|
TYPE_TAG_NAME (type) = name;
|
|
|
|
|
|
|
|
add_class_symtab_symbol (add_class_symbol (type, addr));
|
|
|
|
return java_link_class_type (type, clas);
|
|
|
|
}
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
/* Fill in class TYPE with data from the CLAS value. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
struct type *
|
2001-10-21 03:57:42 +02:00
|
|
|
java_link_class_type (struct type *type, struct value *clas)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *temp;
|
1999-04-16 03:35:26 +02:00
|
|
|
char *unqualified_name;
|
|
|
|
char *name = TYPE_TAG_NAME (type);
|
|
|
|
int ninterfaces, nfields, nmethods;
|
|
|
|
int type_is_object = 0;
|
|
|
|
struct fn_field *fn_fields;
|
|
|
|
struct fn_fieldlist *fn_fieldlists;
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *fields;
|
|
|
|
struct value *methods;
|
2001-03-23 23:48:44 +01:00
|
|
|
struct value *method = NULL;
|
|
|
|
struct value *field = NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
int i, j;
|
1999-07-07 22:19:36 +02:00
|
|
|
struct objfile *objfile = get_dynamics_objfile ();
|
1999-04-16 03:35:26 +02:00
|
|
|
struct type *tsuper;
|
|
|
|
|
|
|
|
unqualified_name = strrchr (name, '.');
|
|
|
|
if (unqualified_name == NULL)
|
|
|
|
unqualified_name = name;
|
|
|
|
|
|
|
|
temp = clas;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "superclass", NULL, "structure");
|
|
|
|
if (name != NULL && strcmp (name, "java.lang.Object") == 0)
|
|
|
|
{
|
|
|
|
tsuper = get_java_object_type ();
|
|
|
|
if (tsuper && TYPE_CODE (tsuper) == TYPE_CODE_PTR)
|
|
|
|
tsuper = TYPE_TARGET_TYPE (tsuper);
|
|
|
|
type_is_object = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tsuper = type_from_class (temp);
|
|
|
|
|
|
|
|
#if 1
|
|
|
|
ninterfaces = 0;
|
|
|
|
#else
|
|
|
|
temp = clas;
|
|
|
|
ninterfaces = value_as_long (value_struct_elt (&temp, NULL, "interface_len", NULL, "structure"));
|
|
|
|
#endif
|
|
|
|
TYPE_N_BASECLASSES (type) = (tsuper == NULL ? 0 : 1) + ninterfaces;
|
|
|
|
temp = clas;
|
|
|
|
nfields = value_as_long (value_struct_elt (&temp, NULL, "field_count", NULL, "structure"));
|
|
|
|
nfields += TYPE_N_BASECLASSES (type);
|
1999-07-07 22:19:36 +02:00
|
|
|
nfields++; /* Add one for dummy "class" field. */
|
1999-04-16 03:35:26 +02:00
|
|
|
TYPE_NFIELDS (type) = nfields;
|
|
|
|
TYPE_FIELDS (type) = (struct field *)
|
|
|
|
TYPE_ALLOC (type, sizeof (struct field) * nfields);
|
|
|
|
|
|
|
|
memset (TYPE_FIELDS (type), 0, sizeof (struct field) * nfields);
|
|
|
|
|
|
|
|
TYPE_FIELD_PRIVATE_BITS (type) =
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
B_CLRALL (TYPE_FIELD_PRIVATE_BITS (type), nfields);
|
|
|
|
|
|
|
|
TYPE_FIELD_PROTECTED_BITS (type) =
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
B_CLRALL (TYPE_FIELD_PROTECTED_BITS (type), nfields);
|
|
|
|
|
|
|
|
TYPE_FIELD_IGNORE_BITS (type) =
|
|
|
|
(B_TYPE *) TYPE_ALLOC (type, B_BYTES (nfields));
|
|
|
|
B_CLRALL (TYPE_FIELD_IGNORE_BITS (type), nfields);
|
|
|
|
|
|
|
|
TYPE_FIELD_VIRTUAL_BITS (type) = (B_TYPE *)
|
|
|
|
TYPE_ALLOC (type, B_BYTES (TYPE_N_BASECLASSES (type)));
|
|
|
|
B_CLRALL (TYPE_FIELD_VIRTUAL_BITS (type), TYPE_N_BASECLASSES (type));
|
|
|
|
|
|
|
|
if (tsuper != NULL)
|
|
|
|
{
|
|
|
|
TYPE_BASECLASS (type, 0) = tsuper;
|
|
|
|
if (type_is_object)
|
|
|
|
SET_TYPE_FIELD_PRIVATE (type, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
i = strlen (name);
|
1999-07-07 22:19:36 +02:00
|
|
|
if (i > 2 && name[i - 1] == ']' && tsuper != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
/* FIXME */
|
1999-07-07 22:19:36 +02:00
|
|
|
TYPE_LENGTH (type) = TYPE_LENGTH (tsuper) + 4; /* size with "length" */
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
temp = clas;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "size_in_bytes", NULL, "structure");
|
|
|
|
TYPE_LENGTH (type) = value_as_long (temp);
|
|
|
|
}
|
|
|
|
|
|
|
|
fields = NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
nfields--; /* First set up dummy "class" field. */
|
1999-04-16 03:35:26 +02:00
|
|
|
SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields),
|
|
|
|
VALUE_ADDRESS (clas) + VALUE_OFFSET (clas));
|
|
|
|
TYPE_FIELD_NAME (type, nfields) = "class";
|
|
|
|
TYPE_FIELD_TYPE (type, nfields) = VALUE_TYPE (clas);
|
|
|
|
SET_TYPE_FIELD_PRIVATE (type, nfields);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
|
|
|
for (i = TYPE_N_BASECLASSES (type); i < nfields; i++)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int accflags;
|
|
|
|
int boffset;
|
|
|
|
if (fields == NULL)
|
|
|
|
{
|
|
|
|
temp = clas;
|
|
|
|
fields = value_struct_elt (&temp, NULL, "fields", NULL, "structure");
|
|
|
|
field = value_ind (fields);
|
|
|
|
}
|
|
|
|
else
|
1999-07-07 22:19:36 +02:00
|
|
|
{ /* Re-use field value for next field. */
|
1999-04-16 03:35:26 +02:00
|
|
|
VALUE_ADDRESS (field) += TYPE_LENGTH (VALUE_TYPE (field));
|
|
|
|
VALUE_LAZY (field) = 1;
|
|
|
|
}
|
|
|
|
temp = field;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "name", NULL, "structure");
|
|
|
|
TYPE_FIELD_NAME (type, i) =
|
|
|
|
get_java_utf8_name (&objfile->type_obstack, temp);
|
|
|
|
temp = field;
|
|
|
|
accflags = value_as_long (value_struct_elt (&temp, NULL, "accflags",
|
|
|
|
NULL, "structure"));
|
|
|
|
temp = field;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "info", NULL, "structure");
|
|
|
|
boffset = value_as_long (value_struct_elt (&temp, NULL, "boffset",
|
1999-07-07 22:19:36 +02:00
|
|
|
NULL, "structure"));
|
|
|
|
if (accflags & 0x0001) /* public access */
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
/* ??? */
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
if (accflags & 0x0002) /* private access */
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
SET_TYPE_FIELD_PRIVATE (type, i);
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
if (accflags & 0x0004) /* protected access */
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
SET_TYPE_FIELD_PROTECTED (type, i);
|
|
|
|
}
|
1999-07-07 22:19:36 +02:00
|
|
|
if (accflags & 0x0008) /* ACC_STATIC */
|
|
|
|
SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
TYPE_FIELD_BITPOS (type, i) = 8 * boffset;
|
1999-07-07 22:19:36 +02:00
|
|
|
if (accflags & 0x8000) /* FIELD_UNRESOLVED_FLAG */
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
TYPE_FIELD_TYPE (type, i) = get_java_object_type (); /* FIXME */
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct type *ftype;
|
|
|
|
temp = field;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "type", NULL, "structure");
|
|
|
|
ftype = type_from_class (temp);
|
|
|
|
if (TYPE_CODE (ftype) == TYPE_CODE_STRUCT)
|
|
|
|
ftype = lookup_pointer_type (ftype);
|
|
|
|
TYPE_FIELD_TYPE (type, i) = ftype;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
temp = clas;
|
|
|
|
nmethods = value_as_long (value_struct_elt (&temp, NULL, "method_count",
|
|
|
|
NULL, "structure"));
|
|
|
|
TYPE_NFN_FIELDS_TOTAL (type) = nmethods;
|
|
|
|
j = nmethods * sizeof (struct fn_field);
|
1999-07-07 22:19:36 +02:00
|
|
|
fn_fields = (struct fn_field *)
|
1999-04-16 03:35:26 +02:00
|
|
|
obstack_alloc (&dynamics_objfile->symbol_obstack, j);
|
|
|
|
memset (fn_fields, 0, j);
|
1999-07-07 22:19:36 +02:00
|
|
|
fn_fieldlists = (struct fn_fieldlist *)
|
1999-04-16 03:35:26 +02:00
|
|
|
alloca (nmethods * sizeof (struct fn_fieldlist));
|
|
|
|
|
|
|
|
methods = NULL;
|
1999-07-07 22:19:36 +02:00
|
|
|
for (i = 0; i < nmethods; i++)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
char *mname;
|
|
|
|
int k;
|
|
|
|
if (methods == NULL)
|
|
|
|
{
|
|
|
|
temp = clas;
|
|
|
|
methods = value_struct_elt (&temp, NULL, "methods", NULL, "structure");
|
|
|
|
method = value_ind (methods);
|
|
|
|
}
|
|
|
|
else
|
1999-07-07 22:19:36 +02:00
|
|
|
{ /* Re-use method value for next method. */
|
1999-04-16 03:35:26 +02:00
|
|
|
VALUE_ADDRESS (method) += TYPE_LENGTH (VALUE_TYPE (method));
|
|
|
|
VALUE_LAZY (method) = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get method name. */
|
|
|
|
temp = method;
|
|
|
|
temp = value_struct_elt (&temp, NULL, "name", NULL, "structure");
|
|
|
|
mname = get_java_utf8_name (&objfile->type_obstack, temp);
|
|
|
|
if (strcmp (mname, "<init>") == 0)
|
|
|
|
mname = unqualified_name;
|
|
|
|
|
|
|
|
/* Check for an existing method with the same name.
|
|
|
|
* This makes building the fn_fieldslists an O(nmethods**2)
|
|
|
|
* operation. That could be using hashing, but I doubt it
|
|
|
|
* is worth it. Note that we do maintain the order of methods
|
|
|
|
* in the inferior's Method table (as long as that is grouped
|
|
|
|
* by method name), which I think is desirable. --PB */
|
1999-07-07 22:19:36 +02:00
|
|
|
for (k = 0, j = TYPE_NFN_FIELDS (type);;)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (--j < 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
{ /* No match - new method name. */
|
|
|
|
j = TYPE_NFN_FIELDS (type)++;
|
1999-04-16 03:35:26 +02:00
|
|
|
fn_fieldlists[j].name = mname;
|
|
|
|
fn_fieldlists[j].length = 1;
|
|
|
|
fn_fieldlists[j].fn_fields = &fn_fields[i];
|
|
|
|
k = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (strcmp (mname, fn_fieldlists[j].name) == 0)
|
1999-07-07 22:19:36 +02:00
|
|
|
{ /* Found an existing method with the same name. */
|
1999-04-16 03:35:26 +02:00
|
|
|
int l;
|
|
|
|
if (mname != unqualified_name)
|
|
|
|
obstack_free (&objfile->type_obstack, mname);
|
|
|
|
mname = fn_fieldlists[j].name;
|
|
|
|
fn_fieldlists[j].length++;
|
1999-07-07 22:19:36 +02:00
|
|
|
k = i - k; /* Index of new slot. */
|
1999-04-16 03:35:26 +02:00
|
|
|
/* Shift intervening fn_fields (between k and i) down. */
|
1999-07-07 22:19:36 +02:00
|
|
|
for (l = i; l > k; l--)
|
|
|
|
fn_fields[l] = fn_fields[l - 1];
|
|
|
|
for (l = TYPE_NFN_FIELDS (type); --l > j;)
|
1999-04-16 03:35:26 +02:00
|
|
|
fn_fieldlists[l].fn_fields++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
k += fn_fieldlists[j].length;
|
|
|
|
}
|
|
|
|
fn_fields[k].physname = "";
|
|
|
|
fn_fields[k].is_stub = 1;
|
1999-07-07 22:19:36 +02:00
|
|
|
fn_fields[k].type = make_function_type (java_void_type, NULL); /* FIXME */
|
1999-04-16 03:35:26 +02:00
|
|
|
TYPE_CODE (fn_fields[k].type) = TYPE_CODE_METHOD;
|
|
|
|
}
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
j = TYPE_NFN_FIELDS (type) * sizeof (struct fn_fieldlist);
|
|
|
|
TYPE_FN_FIELDLISTS (type) = (struct fn_fieldlist *)
|
1999-04-16 03:35:26 +02:00
|
|
|
obstack_alloc (&dynamics_objfile->symbol_obstack, j);
|
|
|
|
memcpy (TYPE_FN_FIELDLISTS (type), fn_fieldlists, j);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct type *java_object_type;
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
get_java_object_type (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (java_object_type == NULL)
|
|
|
|
{
|
|
|
|
struct symbol *sym;
|
2003-05-14 Elena Zannoni <ezannoni@redhat.com>
* symtab.h (enum domain_enum): Rename from namespace_enum.
(UNDEF_DOMAIN, VAR_DOMAIN, STRUCT_DOMAIN, LABEL_DOMAIN,
VARIABLES_DOMAIN, FUNCTIONS_DOMAIN, TYPES_DOMAIN, METHODS_DOMAIN):
Rename from UNDEF_NAMESPACE, VAR_NAMESPACE, STRUCT_NAMESPACE,
LABEL_NAMESPACE, VARIABLES_NAMESPACE, FUNCTIONS_NAMESPACE,
TYPES_NAMESPACE, METHODS_NAMESPACE.
(SYMBOL_NAMESPACE): Rename to SYMBOL_DOMAIN.
(struct symbol, struct partial_symbol): Rename field
'namespace_enum namespace' to 'domain_enum domain'.
(PSYMBOL_NAMESPACE): Rename to PSYMBOL_DOMAIN.
Delete old define kludge for namespace.
* ada-exp.y, ada-lang.c, ada-lang.h, alpha-tdep.c, arm-tdep.c,
blockframe.c, c-exp.y, c-valprint.c, coffread.c, dbxread.c,
dwarf2read.c, dwarfread.c, f-exp.y, gdbtypes.c, gdbtypes.h,
gnu-v3-abi.c, hppa-tdep.c, hpread.c, jv-exp.y, jv-lang.c,
language.c, linespec.c, m2-exp.y, m3-nat.c, mdebugread.c,
mips-tdep.c, nlmread.c, objc-exp.y, objc-lang.c, objfiles.c,
p-exp.y, p-valprint.c, parse.c, printcmd.c, scm-lang.c, source.c,
stabsread.c, stack.c, symfile.c, symfile.h, symmisc.c, symtab.c,
valops.c, values.c, xcoffread.c, xstormy16-tdep.c: Replace all
occurrences of the above.
2003-05-12 Elena Zannoni <ezannoni@redhat.com>
* mi-mi-cmd-stack.c (list_args_or_locals): Rename VAR_NAMESPACE to
VAR_DOMAIN.
2003-05-14 19:43:20 +02:00
|
|
|
sym = lookup_symbol ("java.lang.Object", NULL, STRUCT_DOMAIN,
|
1999-04-16 03:35:26 +02:00
|
|
|
(int *) 0, (struct symtab **) NULL);
|
|
|
|
if (sym == NULL)
|
|
|
|
error ("cannot find java.lang.Object");
|
|
|
|
java_object_type = SYMBOL_TYPE (sym);
|
|
|
|
}
|
|
|
|
return java_object_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-30 03:48:28 +02:00
|
|
|
get_java_object_header_size (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct type *objtype = get_java_object_type ();
|
|
|
|
if (objtype == NULL)
|
|
|
|
return (2 * TARGET_PTR_BIT / TARGET_CHAR_BIT);
|
|
|
|
else
|
|
|
|
return TYPE_LENGTH (objtype);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-07-30 03:48:28 +02:00
|
|
|
is_object_type (struct type *type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
{
|
|
|
|
struct type *ttype = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
char *name;
|
|
|
|
if (TYPE_CODE (ttype) != TYPE_CODE_STRUCT)
|
|
|
|
return 0;
|
|
|
|
while (TYPE_N_BASECLASSES (ttype) > 0)
|
|
|
|
ttype = TYPE_BASECLASS (ttype, 0);
|
|
|
|
name = TYPE_TAG_NAME (ttype);
|
|
|
|
if (name != NULL && strcmp (name, "java.lang.Object") == 0)
|
|
|
|
return 1;
|
1999-07-07 22:19:36 +02:00
|
|
|
name = TYPE_NFIELDS (ttype) > 0 ? TYPE_FIELD_NAME (ttype, 0) : (char *) 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
if (name != NULL && strcmp (name, "vtable") == 0)
|
|
|
|
{
|
|
|
|
if (java_object_type == NULL)
|
|
|
|
java_object_type = type;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_primitive_type (int signature)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
switch (signature)
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
case 'B':
|
|
|
|
return java_byte_type;
|
|
|
|
case 'S':
|
|
|
|
return java_short_type;
|
|
|
|
case 'I':
|
|
|
|
return java_int_type;
|
|
|
|
case 'J':
|
|
|
|
return java_long_type;
|
|
|
|
case 'Z':
|
|
|
|
return java_boolean_type;
|
|
|
|
case 'C':
|
|
|
|
return java_char_type;
|
|
|
|
case 'F':
|
|
|
|
return java_float_type;
|
|
|
|
case 'D':
|
|
|
|
return java_double_type;
|
|
|
|
case 'V':
|
|
|
|
return java_void_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
error ("unknown signature '%c' for primitive type", (char) signature);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If name[0 .. namelen-1] is the name of a primitive Java type,
|
|
|
|
return that type. Otherwise, return NULL. */
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_primitive_type_from_name (char *name, int namelen)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
switch (name[0])
|
|
|
|
{
|
|
|
|
case 'b':
|
|
|
|
if (namelen == 4 && memcmp (name, "byte", 4) == 0)
|
|
|
|
return java_byte_type;
|
|
|
|
if (namelen == 7 && memcmp (name, "boolean", 7) == 0)
|
|
|
|
return java_boolean_type;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
if (namelen == 4 && memcmp (name, "char", 4) == 0)
|
|
|
|
return java_char_type;
|
|
|
|
case 'd':
|
|
|
|
if (namelen == 6 && memcmp (name, "double", 6) == 0)
|
|
|
|
return java_double_type;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
if (namelen == 5 && memcmp (name, "float", 5) == 0)
|
|
|
|
return java_float_type;
|
|
|
|
break;
|
|
|
|
case 'i':
|
|
|
|
if (namelen == 3 && memcmp (name, "int", 3) == 0)
|
|
|
|
return java_int_type;
|
|
|
|
break;
|
|
|
|
case 'l':
|
|
|
|
if (namelen == 4 && memcmp (name, "long", 4) == 0)
|
|
|
|
return java_long_type;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (namelen == 5 && memcmp (name, "short", 5) == 0)
|
|
|
|
return java_short_type;
|
|
|
|
break;
|
|
|
|
case 'v':
|
|
|
|
if (namelen == 4 && memcmp (name, "void", 4) == 0)
|
|
|
|
return java_void_type;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the length (in bytes) of demangled name of the Java type
|
|
|
|
signature string SIGNATURE. */
|
|
|
|
|
|
|
|
static int
|
2000-07-30 03:48:28 +02:00
|
|
|
java_demangled_signature_length (char *signature)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int array = 0;
|
1999-07-07 22:19:36 +02:00
|
|
|
for (; *signature == '['; signature++)
|
|
|
|
array += 2; /* Two chars for "[]". */
|
1999-04-16 03:35:26 +02:00
|
|
|
switch (signature[0])
|
|
|
|
{
|
|
|
|
case 'L':
|
|
|
|
/* Subtract 2 for 'L' and ';'. */
|
|
|
|
return strlen (signature) - 2 + array;
|
|
|
|
default:
|
|
|
|
return strlen (TYPE_NAME (java_primitive_type (signature[0]))) + array;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Demangle the Java type signature SIGNATURE, leaving the result in RESULT. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
java_demangled_signature_copy (char *result, char *signature)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int array = 0;
|
|
|
|
char *ptr;
|
|
|
|
int i;
|
|
|
|
while (*signature == '[')
|
|
|
|
{
|
|
|
|
array++;
|
|
|
|
signature++;
|
|
|
|
}
|
|
|
|
switch (signature[0])
|
|
|
|
{
|
|
|
|
case 'L':
|
|
|
|
/* Subtract 2 for 'L' and ';', but add 1 for final nul. */
|
|
|
|
signature++;
|
|
|
|
ptr = result;
|
1999-07-07 22:19:36 +02:00
|
|
|
for (; *signature != ';' && *signature != '\0'; signature++)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (*signature == '/')
|
|
|
|
*ptr++ = '.';
|
|
|
|
else
|
|
|
|
*ptr++ = *signature;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ptr = TYPE_NAME (java_primitive_type (signature[0]));
|
|
|
|
i = strlen (ptr);
|
|
|
|
strcpy (result, ptr);
|
|
|
|
ptr = result + i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
while (--array >= 0)
|
|
|
|
{
|
|
|
|
*ptr++ = '[';
|
|
|
|
*ptr++ = ']';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the demangled name of the Java type signature string SIGNATURE,
|
|
|
|
as a freshly allocated copy. */
|
|
|
|
|
|
|
|
char *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_demangle_type_signature (char *signature)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int length = java_demangled_signature_length (signature);
|
|
|
|
char *result = xmalloc (length + 1);
|
|
|
|
java_demangled_signature_copy (result, signature);
|
|
|
|
result[length] = '\0';
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_lookup_type (char *signature)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
switch (signature[0])
|
|
|
|
{
|
|
|
|
case 'L':
|
|
|
|
case '[':
|
|
|
|
error ("java_lookup_type not fully implemented");
|
|
|
|
default:
|
|
|
|
return java_primitive_type (signature[0]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the type of TYPE followed by DIMS pairs of [ ].
|
|
|
|
If DIMS == 0, TYPE is returned. */
|
|
|
|
|
|
|
|
struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_array_type (struct type *type, int dims)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
struct type *range_type;
|
|
|
|
|
|
|
|
while (dims-- > 0)
|
|
|
|
{
|
|
|
|
range_type = create_range_type (NULL, builtin_type_int, 0, 0);
|
|
|
|
/* FIXME This is bogus! Java arrays are not gdb arrays! */
|
|
|
|
type = create_array_type (NULL, type, range_type);
|
|
|
|
}
|
|
|
|
|
|
|
|
return type;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a Java string in the inferior from a (Utf8) literal. */
|
|
|
|
|
2001-10-21 03:57:42 +02:00
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_value_string (char *ptr, int len)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
error ("not implemented - java_value_string"); /* FIXME */
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Print the character C on STREAM as part of the contents of a literal
|
|
|
|
string whose delimiter is QUOTER. Note that that format for printing
|
|
|
|
characters and strings is language specific. */
|
|
|
|
|
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
java_emit_char (int c, struct ui_file *stream, int quoter)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case '\\':
|
|
|
|
case '\'':
|
|
|
|
fprintf_filtered (stream, "\\%c", c);
|
|
|
|
break;
|
|
|
|
case '\b':
|
|
|
|
fputs_filtered ("\\b", stream);
|
|
|
|
break;
|
|
|
|
case '\t':
|
|
|
|
fputs_filtered ("\\t", stream);
|
|
|
|
break;
|
|
|
|
case '\n':
|
|
|
|
fputs_filtered ("\\n", stream);
|
|
|
|
break;
|
|
|
|
case '\f':
|
|
|
|
fputs_filtered ("\\f", stream);
|
|
|
|
break;
|
|
|
|
case '\r':
|
|
|
|
fputs_filtered ("\\r", stream);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (isprint (c))
|
|
|
|
fputc_filtered (c, stream);
|
|
|
|
else
|
|
|
|
fprintf_filtered (stream, "\\u%.4x", (unsigned int) c);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-10-21 03:57:42 +02:00
|
|
|
static struct value *
|
2000-07-30 03:48:28 +02:00
|
|
|
evaluate_subexp_java (struct type *expect_type, register struct expression *exp,
|
|
|
|
register int *pos, enum noside noside)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int pc = *pos;
|
|
|
|
int i;
|
|
|
|
char *name;
|
|
|
|
enum exp_opcode op = exp->elts[*pos].opcode;
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *arg1;
|
|
|
|
struct value *arg2;
|
1999-04-16 03:35:26 +02:00
|
|
|
struct type *type;
|
|
|
|
switch (op)
|
|
|
|
{
|
|
|
|
case UNOP_IND:
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
goto standard;
|
|
|
|
(*pos)++;
|
|
|
|
arg1 = evaluate_subexp_java (NULL_TYPE, exp, pos, EVAL_NORMAL);
|
|
|
|
if (is_object_type (VALUE_TYPE (arg1)))
|
|
|
|
{
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
type = type_from_class (java_class_from_object (arg1));
|
|
|
|
arg1 = value_cast (lookup_pointer_type (type), arg1);
|
|
|
|
}
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
goto nosideret;
|
|
|
|
return value_ind (arg1);
|
|
|
|
|
|
|
|
case BINOP_SUBSCRIPT:
|
|
|
|
(*pos)++;
|
|
|
|
arg1 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
arg2 = evaluate_subexp_with_coercion (exp, pos, noside);
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
goto nosideret;
|
|
|
|
/* If the user attempts to subscript something that is not an
|
1999-07-07 22:19:36 +02:00
|
|
|
array or pointer type (like a plain int variable for example),
|
|
|
|
then report this as an error. */
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
COERCE_REF (arg1);
|
|
|
|
type = check_typedef (VALUE_TYPE (arg1));
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_PTR)
|
|
|
|
type = check_typedef (TYPE_TARGET_TYPE (type));
|
|
|
|
name = TYPE_NAME (type);
|
|
|
|
if (name == NULL)
|
|
|
|
name = TYPE_TAG_NAME (type);
|
|
|
|
i = name == NULL ? 0 : strlen (name);
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_STRUCT
|
1999-07-07 22:19:36 +02:00
|
|
|
&& i > 2 && name[i - 1] == ']')
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
CORE_ADDR address;
|
|
|
|
long length, index;
|
|
|
|
struct type *el_type;
|
|
|
|
char buf4[4];
|
|
|
|
|
2001-10-21 03:57:42 +02:00
|
|
|
struct value *clas = java_class_from_object (arg1);
|
|
|
|
struct value *temp = clas;
|
1999-04-16 03:35:26 +02:00
|
|
|
/* Get CLASS_ELEMENT_TYPE of the array type. */
|
|
|
|
temp = value_struct_elt (&temp, NULL, "methods",
|
1999-07-07 22:19:36 +02:00
|
|
|
NULL, "structure");
|
1999-04-16 03:35:26 +02:00
|
|
|
VALUE_TYPE (temp) = VALUE_TYPE (clas);
|
|
|
|
el_type = type_from_class (temp);
|
|
|
|
if (TYPE_CODE (el_type) == TYPE_CODE_STRUCT)
|
|
|
|
el_type = lookup_pointer_type (el_type);
|
|
|
|
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
return value_zero (el_type, VALUE_LVAL (arg1));
|
* value.h (value_as_address): Rename value_as_pointer.
* eval.c, findvar.c, gnu-v2-abi.c, gnu-v3-abi.c, jv-lang.c,
jv-valprint.c, printcmd.c, stack.c, top.c, valarith.c, valops.c,
values.c: Update.
2001-10-16 03:58:07 +02:00
|
|
|
address = value_as_address (arg1);
|
1999-04-16 03:35:26 +02:00
|
|
|
address += JAVA_OBJECT_SIZE;
|
|
|
|
read_memory (address, buf4, 4);
|
|
|
|
length = (long) extract_signed_integer (buf4, 4);
|
|
|
|
index = (long) value_as_long (arg2);
|
|
|
|
if (index >= length || index < 0)
|
|
|
|
error ("array index (%ld) out of bounds (length: %ld)",
|
|
|
|
index, length);
|
|
|
|
address = (address + 4) + index * TYPE_LENGTH (el_type);
|
|
|
|
return value_at (el_type, address, NULL);
|
|
|
|
}
|
|
|
|
else if (TYPE_CODE (type) == TYPE_CODE_ARRAY)
|
|
|
|
{
|
|
|
|
if (noside == EVAL_AVOID_SIDE_EFFECTS)
|
|
|
|
return value_zero (TYPE_TARGET_TYPE (type), VALUE_LVAL (arg1));
|
|
|
|
else
|
|
|
|
return value_subscript (arg1, arg2);
|
|
|
|
}
|
|
|
|
if (name)
|
|
|
|
error ("cannot subscript something of type `%s'", name);
|
|
|
|
else
|
|
|
|
error ("cannot subscript requested type");
|
|
|
|
|
|
|
|
case OP_STRING:
|
|
|
|
(*pos)++;
|
|
|
|
i = longest_to_int (exp->elts[pc + 1].longconst);
|
|
|
|
(*pos) += 3 + BYTES_TO_EXP_ELEM (i + 1);
|
|
|
|
if (noside == EVAL_SKIP)
|
|
|
|
goto nosideret;
|
|
|
|
return java_value_string (&exp->elts[pc + 2].string, i);
|
|
|
|
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
arg1 = evaluate_subexp_standard (expect_type, exp, pos, noside);
|
|
|
|
/* Convert object field (such as TYPE.class) to reference. */
|
|
|
|
if (TYPE_CODE (VALUE_TYPE (arg1)) == TYPE_CODE_STRUCT)
|
|
|
|
arg1 = value_addr (arg1);
|
|
|
|
return arg1;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
standard:
|
|
|
|
return evaluate_subexp_standard (expect_type, exp, pos, noside);
|
1999-07-07 22:19:36 +02:00
|
|
|
nosideret:
|
1999-04-16 03:35:26 +02:00
|
|
|
return value_from_longest (builtin_type_long, (LONGEST) 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct type *
|
2000-07-30 03:48:28 +02:00
|
|
|
java_create_fundamental_type (struct objfile *objfile, int typeid)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
switch (typeid)
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
case FT_VOID:
|
|
|
|
return java_void_type;
|
|
|
|
case FT_BOOLEAN:
|
|
|
|
return java_boolean_type;
|
|
|
|
case FT_CHAR:
|
|
|
|
return java_char_type;
|
|
|
|
case FT_FLOAT:
|
|
|
|
return java_float_type;
|
|
|
|
case FT_DBL_PREC_FLOAT:
|
|
|
|
return java_double_type;
|
|
|
|
case FT_BYTE:
|
|
|
|
case FT_SIGNED_CHAR:
|
|
|
|
return java_byte_type;
|
|
|
|
case FT_SHORT:
|
|
|
|
case FT_SIGNED_SHORT:
|
|
|
|
return java_short_type;
|
|
|
|
case FT_INTEGER:
|
|
|
|
case FT_SIGNED_INTEGER:
|
|
|
|
return java_int_type;
|
|
|
|
case FT_LONG:
|
|
|
|
case FT_SIGNED_LONG:
|
|
|
|
return java_long_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
return c_create_fundamental_type (objfile, typeid);
|
|
|
|
}
|
|
|
|
|
2003-04-02 05:02:46 +02:00
|
|
|
static char *java_demangle (const char *mangled, int options)
|
|
|
|
{
|
|
|
|
return cplus_demangle (mangled, options | DMGL_JAVA);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
/* Table mapping opcodes into strings for printing operators
|
|
|
|
and precedences of the operators. */
|
|
|
|
|
|
|
|
const struct op_print java_op_print_tab[] =
|
1999-07-07 22:19:36 +02:00
|
|
|
{
|
|
|
|
{",", BINOP_COMMA, PREC_COMMA, 0},
|
|
|
|
{"=", BINOP_ASSIGN, PREC_ASSIGN, 1},
|
|
|
|
{"||", BINOP_LOGICAL_OR, PREC_LOGICAL_OR, 0},
|
|
|
|
{"&&", BINOP_LOGICAL_AND, PREC_LOGICAL_AND, 0},
|
|
|
|
{"|", BINOP_BITWISE_IOR, PREC_BITWISE_IOR, 0},
|
|
|
|
{"^", BINOP_BITWISE_XOR, PREC_BITWISE_XOR, 0},
|
|
|
|
{"&", BINOP_BITWISE_AND, PREC_BITWISE_AND, 0},
|
|
|
|
{"==", BINOP_EQUAL, PREC_EQUAL, 0},
|
|
|
|
{"!=", BINOP_NOTEQUAL, PREC_EQUAL, 0},
|
|
|
|
{"<=", BINOP_LEQ, PREC_ORDER, 0},
|
|
|
|
{">=", BINOP_GEQ, PREC_ORDER, 0},
|
|
|
|
{">", BINOP_GTR, PREC_ORDER, 0},
|
|
|
|
{"<", BINOP_LESS, PREC_ORDER, 0},
|
|
|
|
{">>", BINOP_RSH, PREC_SHIFT, 0},
|
|
|
|
{"<<", BINOP_LSH, PREC_SHIFT, 0},
|
1999-04-16 03:35:26 +02:00
|
|
|
#if 0
|
1999-07-07 22:19:36 +02:00
|
|
|
{">>>", BINOP_ ? ? ?, PREC_SHIFT, 0},
|
1999-04-16 03:35:26 +02:00
|
|
|
#endif
|
1999-07-07 22:19:36 +02:00
|
|
|
{"+", BINOP_ADD, PREC_ADD, 0},
|
|
|
|
{"-", BINOP_SUB, PREC_ADD, 0},
|
|
|
|
{"*", BINOP_MUL, PREC_MUL, 0},
|
|
|
|
{"/", BINOP_DIV, PREC_MUL, 0},
|
|
|
|
{"%", BINOP_REM, PREC_MUL, 0},
|
|
|
|
{"-", UNOP_NEG, PREC_PREFIX, 0},
|
|
|
|
{"!", UNOP_LOGICAL_NOT, PREC_PREFIX, 0},
|
|
|
|
{"~", UNOP_COMPLEMENT, PREC_PREFIX, 0},
|
|
|
|
{"*", UNOP_IND, PREC_PREFIX, 0},
|
1999-04-16 03:35:26 +02:00
|
|
|
#if 0
|
1999-07-07 22:19:36 +02:00
|
|
|
{"instanceof", ? ? ?, ? ? ?, 0},
|
1999-04-16 03:35:26 +02:00
|
|
|
#endif
|
1999-07-07 22:19:36 +02:00
|
|
|
{"++", UNOP_PREINCREMENT, PREC_PREFIX, 0},
|
|
|
|
{"--", UNOP_PREDECREMENT, PREC_PREFIX, 0},
|
|
|
|
{NULL, 0, 0, 0}
|
1999-04-16 03:35:26 +02:00
|
|
|
};
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
const struct language_defn java_language_defn =
|
|
|
|
{
|
|
|
|
"java", /* Language name */
|
1999-04-16 03:35:26 +02:00
|
|
|
language_java,
|
|
|
|
c_builtin_types,
|
|
|
|
range_check_off,
|
|
|
|
type_check_off,
|
2000-08-10 Jimmy Guo <guo@cup.hp.com>
* c-lang.c: Set case sensitivity on for c_language_defn,
cplus_language_defn, and asm_language_defn.
* ch-lang.c: Set case sensitivity on for chill_language_defn.
* f-lang.c: Set case sensivitity off for f_language_defn.
* jv-lang.c: Set case sensitivity on for java_language_defn.
* language.h: Add enum case_mode, case_sensitivity.
* language.c: Define case_mode, case_sensitivity. Set case
sensitivity on for unknown_language_defn, auto_language_defn,
and local_language_defn.
(show_case_command,set_case_command,set_case_str): New static func.
(set_type_range_case): New static func, replaces set_type_range ().
(set_language_command,set_type_command,set_range_command,set_language):
Call set_type_range_case ().
(language_info): Print case sensitivity setting.
(_initialize_language): Add set/show commands for 'case-sensitive'.
Set default case mode 'auto'. Set default language 'auto'.
* m2-lang.c: Set case sensitivity on for m2_language_defn.
* p-lang.c: Set case sensitivity on for pascal_language_defn.
* scm-lang.c: Set case sensitivity off for scm_language_defn.
* symtab.c (lookup_symbol): Downcase symbol name if case sensivitity
is off.
2000-08-11 03:02:35 +02:00
|
|
|
case_sensitive_on,
|
1999-04-16 03:35:26 +02:00
|
|
|
java_parse,
|
|
|
|
java_error,
|
|
|
|
evaluate_subexp_java,
|
|
|
|
c_printchar, /* Print a character constant */
|
|
|
|
c_printstr, /* Function to print string constant */
|
|
|
|
java_emit_char, /* Function to print a single character */
|
|
|
|
java_create_fundamental_type, /* Create fundamental type in this language */
|
|
|
|
java_print_type, /* Print a type using appropriate syntax */
|
|
|
|
java_val_print, /* Print a value using appropriate syntax */
|
|
|
|
java_value_print, /* Print a top-level value */
|
2003-03-26 04:39:44 +01:00
|
|
|
NULL, /* Language specific skip_trampoline */
|
2003-05-20 03:55:18 +02:00
|
|
|
value_of_this, /* value_of_this */
|
|
|
|
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
|
2003-04-02 05:02:46 +02:00
|
|
|
java_demangle, /* Language specific symbol demangler */
|
1999-07-07 22:19:36 +02:00
|
|
|
{"", "", "", ""}, /* Binary format info */
|
|
|
|
{"0%lo", "0", "o", ""}, /* Octal format info */
|
|
|
|
{"%ld", "", "d", ""}, /* Decimal format info */
|
|
|
|
{"0x%lx", "0x", "x", ""}, /* Hex format info */
|
1999-04-16 03:35:26 +02:00
|
|
|
java_op_print_tab, /* expression operators for printing */
|
|
|
|
0, /* not c-style arrays */
|
|
|
|
0, /* String lower bound */
|
1999-07-07 22:19:36 +02:00
|
|
|
&builtin_type_char, /* Type of string elements */
|
1999-04-16 03:35:26 +02:00
|
|
|
LANG_MAGIC
|
|
|
|
};
|
|
|
|
|
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
_initialize_java_language (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
java_int_type = init_type (TYPE_CODE_INT, 4, 0, "int", NULL);
|
|
|
|
java_short_type = init_type (TYPE_CODE_INT, 2, 0, "short", NULL);
|
|
|
|
java_long_type = init_type (TYPE_CODE_INT, 8, 0, "long", NULL);
|
|
|
|
java_byte_type = init_type (TYPE_CODE_INT, 1, 0, "byte", NULL);
|
|
|
|
java_boolean_type = init_type (TYPE_CODE_BOOL, 1, 0, "boolean", NULL);
|
|
|
|
java_char_type = init_type (TYPE_CODE_CHAR, 2, TYPE_FLAG_UNSIGNED, "char", NULL);
|
|
|
|
java_float_type = init_type (TYPE_CODE_FLT, 4, 0, "float", NULL);
|
|
|
|
java_double_type = init_type (TYPE_CODE_FLT, 8, 0, "double", NULL);
|
|
|
|
java_void_type = init_type (TYPE_CODE_VOID, 1, 0, "void", NULL);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
add_language (&java_language_defn);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Cleanup code that should be run on every "run".
|
|
|
|
We should use make_run_cleanup to have this be called.
|
|
|
|
But will that mess up values in value histry? FIXME */
|
|
|
|
|
2000-05-28 03:12:42 +02:00
|
|
|
extern void java_rerun_cleanup (void);
|
1999-05-25 20:09:09 +02:00
|
|
|
void
|
2000-07-30 03:48:28 +02:00
|
|
|
java_rerun_cleanup (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (class_symtab != NULL)
|
|
|
|
{
|
1999-07-07 22:19:36 +02:00
|
|
|
free_symtab (class_symtab); /* ??? */
|
1999-04-16 03:35:26 +02:00
|
|
|
class_symtab = NULL;
|
|
|
|
}
|
|
|
|
if (dynamics_objfile != NULL)
|
|
|
|
{
|
|
|
|
free_objfile (dynamics_objfile);
|
|
|
|
dynamics_objfile = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
java_object_type = NULL;
|
|
|
|
}
|