OSDN Git Service

* alpha-tdep.h (ALPHA_REGISTER_BYTES): Delete.
authordrow <drow>
Sat, 3 May 2008 22:20:12 +0000 (22:20 +0000)
committerdrow <drow>
Sat, 3 May 2008 22:20:12 +0000 (22:20 +0000)
* arm-tdep.h (STATUS_REGISTER_SIZE): Delete.
* breakpoint.c (args_for_catchpoint_enable, current_exception_event):
Delete.
* c-typeprint.c (c_type_print_base): Delete handling of template
instantiations.
* cp-support.h (METHOD_PTR_IS_VIRTUAL, METHOD_PTR_FROM_VOFFSET)
(METHOD_PTR_TO_VOFFSET): Delete.
* defs.h (QUIT_FIXME): Delete.
* f-lang.h (DEFAULT_DOTMAIN_NAME_IN_MF77, DEFAULT_MAIN_NAME_IN_MF77)
(DEFAULT_DOTMAIN_NAME_IN_XLF_BUGGY, DEFAULT_DOTMAIN_NAME_IN_XLF): Delete.
* gdbtypes.h (struct cplus_struct_type): Delete is_inlined,
ninstantiations, and instantiations.
(TYPE_INSTANTIATIONS, TYPE_NINSTANTIATIONS, TYPE_INSTANTIATION)
(TYPE_FN_FIELD_INLINED): Delete.
* srec.h (SREC_BINARY): Delete.
* symtab.c (symbol_init_demangled_name): Delete.
* symtab.h (SYMBOL_INIT_DEMANGLED_NAME, symbol_init_demangled_name)
(SYMBOL_OBJFILE, struct exception_event_record, CURRENT_EXCEPTION_KIND)
(CURRENT_EXCEPTION_CATCH_SAL, CURRENT_EXCEPTION_CATCH_LINE)
(CURRENT_EXCEPTION_CATCH_FILE, CURRENT_EXCEPTION_CATCH_PC)
(CURRENT_EXCEPTION_THROW_SAL, CURRENT_EXCEPTION_THROW_LINE)
(CURRENT_EXCEPTION_THROW_FILE, CURRENT_EXCEPTION_THROW_PC): Delete.
* target.h (enum thread_control_capabilities): Delete tc_switch.
(target_can_switch_threads): Delete.

13 files changed:
gdb/ChangeLog
gdb/alpha-tdep.h
gdb/arm-tdep.h
gdb/breakpoint.c
gdb/c-typeprint.c
gdb/cp-support.h
gdb/defs.h
gdb/f-lang.h
gdb/gdbtypes.h
gdb/srec.h
gdb/symtab.c
gdb/symtab.h
gdb/target.h

index 655a5cc..0f45823 100644 (file)
@@ -1,5 +1,33 @@
 2008-05-03  Daniel Jacobowitz  <dan@codesourcery.com>
 
+       * alpha-tdep.h (ALPHA_REGISTER_BYTES): Delete.
+       * arm-tdep.h (STATUS_REGISTER_SIZE): Delete.
+       * breakpoint.c (args_for_catchpoint_enable, current_exception_event):
+       Delete.
+       * c-typeprint.c (c_type_print_base): Delete handling of template
+       instantiations.
+       * cp-support.h (METHOD_PTR_IS_VIRTUAL, METHOD_PTR_FROM_VOFFSET)
+       (METHOD_PTR_TO_VOFFSET): Delete.
+       * defs.h (QUIT_FIXME): Delete.
+       * f-lang.h (DEFAULT_DOTMAIN_NAME_IN_MF77, DEFAULT_MAIN_NAME_IN_MF77)
+       (DEFAULT_DOTMAIN_NAME_IN_XLF_BUGGY, DEFAULT_DOTMAIN_NAME_IN_XLF): Delete.
+       * gdbtypes.h (struct cplus_struct_type): Delete is_inlined,
+       ninstantiations, and instantiations.
+       (TYPE_INSTANTIATIONS, TYPE_NINSTANTIATIONS, TYPE_INSTANTIATION)
+       (TYPE_FN_FIELD_INLINED): Delete.
+       * srec.h (SREC_BINARY): Delete.
+       * symtab.c (symbol_init_demangled_name): Delete.
+       * symtab.h (SYMBOL_INIT_DEMANGLED_NAME, symbol_init_demangled_name)
+       (SYMBOL_OBJFILE, struct exception_event_record, CURRENT_EXCEPTION_KIND)
+       (CURRENT_EXCEPTION_CATCH_SAL, CURRENT_EXCEPTION_CATCH_LINE)
+       (CURRENT_EXCEPTION_CATCH_FILE, CURRENT_EXCEPTION_CATCH_PC)
+       (CURRENT_EXCEPTION_THROW_SAL, CURRENT_EXCEPTION_THROW_LINE)
+       (CURRENT_EXCEPTION_THROW_FILE, CURRENT_EXCEPTION_THROW_PC): Delete.
+       * target.h (enum thread_control_capabilities): Delete tc_switch.
+       (target_can_switch_threads): Delete.
+
+2008-05-03  Daniel Jacobowitz  <dan@codesourcery.com>
+
        * Makefile.in (objfiles.o): Update.
        * exec.c (exec_set_section_address): Support p->addr != 0.
        * objfiles.c (objfile_relocate): Update exec_ops section
index 33df8bd..805271b 100644 (file)
@@ -30,10 +30,6 @@ struct regcache;
 /* Number of machine registers.  */
 #define ALPHA_NUM_REGS 67
 
-/* Total amount of space needed to store our copies of the machine's
-   register state.  */
-#define ALPHA_REGISTER_BYTES (ALPHA_NUM_REGS * 8)
-
 /* Register numbers of various important registers.  Note that most of
    these values are "real" register numbers, and correspond to the
    general registers of the machine.  */
index 80c4bda..e8d07ae 100644 (file)
@@ -68,11 +68,6 @@ enum gdb_regnum {
    bits.  DWORD aligned they use 96 bits.  */
 #define FP_REGISTER_SIZE       12
 
-/* Status registers are the same size as general purpose registers.
-   Used for documentation purposes and code readability in this
-   header.  */
-#define STATUS_REGISTER_SIZE   4
-
 /* Number of machine registers.  The only define actually required 
    is gdbarch_num_regs.  The other definitions are used for documentation
    purposes and code readability.  */
index ee9b14b..737558e 100644 (file)
@@ -141,13 +141,6 @@ static enum print_stop_action print_it_typical (bpstat);
 
 static enum print_stop_action print_bp_stop_message (bpstat bs);
 
-typedef struct
-  {
-    enum exception_event_kind kind;
-    int enable_p;
-  }
-args_for_catchpoint_enable;
-
 static int watchpoint_check (void *);
 
 static void maintenance_info_breakpoints (char *, int);
@@ -323,9 +316,6 @@ struct bp_location *bp_location_chain;
 
 int breakpoint_count;
 
-/* Pointer to current exception event record */
-static struct exception_event_record *current_exception_event;
-
 /* This function returns a pointer to the string representation of the
    pathname of the dynamically-linked library that has just been
    loaded.
index e02a5e3..56d12f9 100644 (file)
@@ -1043,8 +1043,6 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show,
                               TYPE_LOCALTYPE_FILE (type),
                               TYPE_LOCALTYPE_LINE (type));
        }
-      if (TYPE_CODE (type) == TYPE_CODE_TEMPLATE)
-       goto go_back;
       break;
 
     case TYPE_CODE_ENUM:
@@ -1127,22 +1125,7 @@ c_type_print_base (struct type *type, struct ui_file *stream, int show,
            fprintf_filtered (stream, ", ");
        }
       fprintf_filtered (stream, "> class ");
-      /* Yuck, factor this out to a subroutine so we can call
-         it and return to the point marked with the "goback:" label... - RT */
       goto struct_union;
-    go_back:
-      if (TYPE_NINSTANTIATIONS (type) > 0)
-       {
-         fprintf_filtered (stream, _("\ntemplate instantiations:\n"));
-         for (i = 0; i < TYPE_NINSTANTIATIONS (type); i++)
-           {
-             fprintf_filtered (stream, "  ");
-             c_type_print_base (TYPE_INSTANTIATION (type, i), stream, 0, level);
-             if (i < TYPE_NINSTANTIATIONS (type) - 1)
-               fprintf_filtered (stream, "\n");
-           }
-       }
-      break;
 
     case TYPE_CODE_NAMESPACE:
       fputs_filtered ("namespace ", stream);
index b6af579..f52154b 100644 (file)
@@ -127,10 +127,4 @@ extern char *cp_comp_to_string (struct demangle_component *result,
 
 extern struct cmd_list_element *maint_cplus_cmd_list;
 
-/* Pointer to member function.  Depends on compiler implementation.  */
-
-#define METHOD_PTR_IS_VIRTUAL(ADDR)  ((ADDR) & 0x80000000)
-#define METHOD_PTR_FROM_VOFFSET(OFFSET) (0x80000000 + (OFFSET))
-#define METHOD_PTR_TO_VOFFSET(ADDR) (~0x80000000 & (ADDR))
-
 #endif /* CP_SUPPORT_H */
index 0fa0e6c..c4c5826 100644 (file)
@@ -152,16 +152,10 @@ extern void quit (void);
    [kingdon].  A profile analyzing the current situtation is
    needed. */
 
-#ifdef QUIT
-/* do twice to force compiler warning */
-#define QUIT_FIXME "FIXME"
-#define QUIT_FIXME "ignoring redefinition of QUIT"
-#else
 #define QUIT { \
   if (quit_flag) quit (); \
   if (deprecated_interactive_hook) deprecated_interactive_hook (); \
 }
-#endif
 
 /* Languages represented in the symbol table and elsewhere.
    This should probably be in language.h, but since enum's can't
index 1ae6b99..8a8a3b3 100644 (file)
@@ -104,8 +104,3 @@ extern int f77_get_dynamic_lowerbound (struct type *, int *);
 extern void f77_get_dynamic_array_length (struct type *);
 
 extern int calc_f77_array_dims (struct type *);
-
-#define DEFAULT_DOTMAIN_NAME_IN_MF77            ".MAIN_"
-#define DEFAULT_MAIN_NAME_IN_MF77               "MAIN_"
-#define DEFAULT_DOTMAIN_NAME_IN_XLF_BUGGY       ".main "
-#define DEFAULT_DOTMAIN_NAME_IN_XLF             ".main"
index b33ba25..7ef7d67 100644 (file)
@@ -683,11 +683,8 @@ struct cplus_struct_type
               to reconstruct the rest of the fields).  */
            unsigned int is_stub:1;
 
-           /* C++ method that is inlined */
-           unsigned int is_inlined:1;
-
            /* Unused.  */
-           unsigned int dummy:3;
+           unsigned int dummy:4;
 
            /* Index into that baseclass's virtual function table,
               minus 2; else if static: VOFFSET_STATIC; else: 0.  */
@@ -717,14 +714,6 @@ struct cplus_struct_type
       }
      *template_args;
 
-    /* If this "struct type" describes a template, it has a list
-     * of instantiations. "instantiations" is a pointer to an array
-     * of type's, one representing each instantiation. There
-     * are "ninstantiations" elements in this array.
-     */
-    short ninstantiations;
-    struct type **instantiations;
-
     /* Pointer to information about enclosing scope, if this is a
      * local type.  If it is not a local type, this is NULL
      */
@@ -784,7 +773,6 @@ extern void allocate_cplus_struct_type (struct type *);
 #define TYPE_NFIELDS(thistype) TYPE_MAIN_TYPE(thistype)->nfields
 #define TYPE_FIELDS(thistype) TYPE_MAIN_TYPE(thistype)->fields
 #define TYPE_TEMPLATE_ARGS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->template_args
-#define TYPE_INSTANTIATIONS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->instantiations
 
 #define TYPE_INDEX_TYPE(type) TYPE_FIELD_TYPE (type, 0)
 #define TYPE_LOW_BOUND(range_type) TYPE_FIELD_BITPOS (range_type, 0)
@@ -812,7 +800,6 @@ extern void allocate_cplus_struct_type (struct type *);
 #define TYPE_NFN_FIELDS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->nfn_fields
 #define TYPE_NFN_FIELDS_TOTAL(thistype) TYPE_CPLUS_SPECIFIC(thistype)->nfn_fields_total
 #define TYPE_NTEMPLATE_ARGS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->ntemplate_args
-#define TYPE_NINSTANTIATIONS(thistype) TYPE_CPLUS_SPECIFIC(thistype)->ninstantiations
 #define TYPE_DECLARED_TYPE(thistype) TYPE_CPLUS_SPECIFIC(thistype)->declared_type
 #define        TYPE_TYPE_SPECIFIC(thistype) TYPE_MAIN_TYPE(thistype)->type_specific
 #define TYPE_CPLUS_SPECIFIC(thistype) TYPE_MAIN_TYPE(thistype)->type_specific.cplus_stuff
@@ -849,7 +836,6 @@ extern void allocate_cplus_struct_type (struct type *);
 #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE(TYPE_FIELD(thistype,n))
 #define TYPE_FIELD_PACKED(thistype, n) (FIELD_BITSIZE(TYPE_FIELD(thistype,n))!=0)
 #define TYPE_TEMPLATE_ARG(thistype, n) TYPE_CPLUS_SPECIFIC(thistype)->template_args[n]
-#define TYPE_INSTANTIATION(thistype, n) TYPE_CPLUS_SPECIFIC(thistype)->instantiations[n]
 
 #define TYPE_FIELD_PRIVATE_BITS(thistype) \
   TYPE_CPLUS_SPECIFIC(thistype)->private_field_bits
@@ -908,7 +894,6 @@ extern void allocate_cplus_struct_type (struct type *);
 #define TYPE_FN_FIELD_ARTIFICIAL(thisfn, n) ((thisfn)[n].is_artificial)
 #define TYPE_FN_FIELD_ABSTRACT(thisfn, n) ((thisfn)[n].is_abstract)
 #define TYPE_FN_FIELD_STUB(thisfn, n) ((thisfn)[n].is_stub)
-#define TYPE_FN_FIELD_INLINED(thisfn, n) ((thisfn)[n].is_inlined)
 #define TYPE_FN_FIELD_FCONTEXT(thisfn, n) ((thisfn)[n].fcontext)
 #define TYPE_FN_FIELD_VOFFSET(thisfn, n) ((thisfn)[n].voffset-2)
 #define TYPE_FN_FIELD_VIRTUAL_P(thisfn, n) ((thisfn)[n].voffset > 1)
index 1f507b1..42b90ba 100644 (file)
@@ -33,5 +33,3 @@ void load_srec (struct serial *desc, const char *file, bfd_vma load_offset,
 #define SREC_ALL (SREC_2_BYTE_ADDR | SREC_3_BYTE_ADDR | SREC_4_BYTE_ADDR \
                  | ((SREC_2_BYTE_ADDR | SREC_3_BYTE_ADDR | SREC_4_BYTE_ADDR) \
                     << SREC_TERM_SHIFT))
-
-#define SREC_BINARY    0x00000040      /* Supports binary form of S-records */
index 608ce6b..1c9425c 100644 (file)
@@ -627,40 +627,6 @@ symbol_set_names (struct general_symbol_info *gsymbol,
     gsymbol->language_specific.cplus_specific.demangled_name = NULL;
 }
 
-/* Initialize the demangled name of GSYMBOL if possible.  Any required space
-   to store the name is obtained from the specified obstack.  The function
-   symbol_set_names, above, should be used instead where possible for more
-   efficient memory usage.  */
-
-void
-symbol_init_demangled_name (struct general_symbol_info *gsymbol,
-                            struct obstack *obstack)
-{
-  char *mangled = gsymbol->name;
-  char *demangled = NULL;
-
-  demangled = symbol_find_demangled_name (gsymbol, mangled);
-  if (gsymbol->language == language_cplus
-      || gsymbol->language == language_java
-      || gsymbol->language == language_objc)
-    {
-      if (demangled)
-       {
-         gsymbol->language_specific.cplus_specific.demangled_name
-           = obsavestring (demangled, strlen (demangled), obstack);
-         xfree (demangled);
-       }
-      else
-       gsymbol->language_specific.cplus_specific.demangled_name = NULL;
-    }
-  else
-    {
-      /* Unknown language; just clean up quietly.  */
-      if (demangled)
-       xfree (demangled);
-    }
-}
-
 /* Return the source code name of a symbol.  In languages where
    demangling is necessary, this is the demangled name.  */
 
index 8aa3fc5..deb7e02 100644 (file)
@@ -157,8 +157,8 @@ extern CORE_ADDR symbol_overlayed_address (CORE_ADDR, asection *);
 /* Note that all the following SYMBOL_* macros are used with the
    SYMBOL argument being either a partial symbol, a minimal symbol or
    a full symbol.  All three types have a ginfo field.  In particular
-   the SYMBOL_INIT_LANGUAGE_SPECIFIC, SYMBOL_INIT_DEMANGLED_NAME,
-   SYMBOL_DEMANGLED_NAME macros cannot be entirely substituted by
+   the SYMBOL_INIT_LANGUAGE_SPECIFIC, SYMBOL_DEMANGLED_NAME, etc.
+   macros cannot be entirely substituted by
    functions, unless the callers are changed to pass in the ginfo
    field only, instead of the SYMBOL parameter.  */
 
@@ -182,11 +182,6 @@ extern CORE_ADDR symbol_overlayed_address (CORE_ADDR, asection *);
 extern void symbol_init_language_specific (struct general_symbol_info *symbol,
                                           enum language language);
 
-#define SYMBOL_INIT_DEMANGLED_NAME(symbol,obstack) \
-  (symbol_init_demangled_name (&(symbol)->ginfo, (obstack)))
-extern void symbol_init_demangled_name (struct general_symbol_info *symbol,
-                                       struct obstack *obstack);
-
 #define SYMBOL_SET_NAMES(symbol,linkage_name,len,objfile) \
   symbol_set_names (&(symbol)->ginfo, linkage_name, len, objfile)
 extern void symbol_set_names (struct general_symbol_info *symbol,
@@ -666,7 +661,6 @@ struct symbol
 #define SYMBOL_LINE(symbol)            (symbol)->line
 #define SYMBOL_SYMTAB(symbol)          (symbol)->symtab
 #define SYMBOL_BASEREG(symbol)         (symbol)->aux_value.basereg
-#define SYMBOL_OBJFILE(symbol)          (symbol)->aux_value.objfile
 #define SYMBOL_OPS(symbol)              (symbol)->ops
 #define SYMBOL_LOCATION_BATON(symbol)   (symbol)->aux_value.ptr
 \f
@@ -1243,27 +1237,6 @@ enum exception_event_kind
   EX_EVENT_CATCH
 };
 
-/* Type for returning info about an exception */
-struct exception_event_record
-{
-  enum exception_event_kind kind;
-  struct symtab_and_line throw_sal;
-  struct symtab_and_line catch_sal;
-  /* This may need to be extended in the future, if
-     some platforms allow reporting more information,
-     such as point of rethrow, type of exception object,
-     type expected by catch clause, etc. */
-};
-
-#define CURRENT_EXCEPTION_KIND       (current_exception_event->kind)
-#define CURRENT_EXCEPTION_CATCH_SAL  (current_exception_event->catch_sal)
-#define CURRENT_EXCEPTION_CATCH_LINE (current_exception_event->catch_sal.line)
-#define CURRENT_EXCEPTION_CATCH_FILE (current_exception_event->catch_sal.symtab->filename)
-#define CURRENT_EXCEPTION_CATCH_PC   (current_exception_event->catch_sal.pc)
-#define CURRENT_EXCEPTION_THROW_SAL  (current_exception_event->throw_sal)
-#define CURRENT_EXCEPTION_THROW_LINE (current_exception_event->throw_sal.line)
-#define CURRENT_EXCEPTION_THROW_FILE (current_exception_event->throw_sal.symtab->filename)
-#define CURRENT_EXCEPTION_THROW_PC   (current_exception_event->throw_sal.pc)
 \f
 
 /* Given a pc value, return line number it is in.  Second arg nonzero means
index 8e7d112..3b424ba 100644 (file)
@@ -69,7 +69,6 @@ enum thread_control_capabilities
   {
     tc_none = 0,               /* Default: can't control thread execution.  */
     tc_schedlock = 1,          /* Can lock the thread scheduler.  */
-    tc_switch = 2              /* Can switch the running thread on demand.  */
   };
 
 /* Stuff for target_wait.  */
@@ -925,15 +924,11 @@ int target_follow_fork (int follow_child);
      (current_target.to_has_execution)
 
 /* Can the target support the debugger control of thread execution?
-   a) Can it lock the thread scheduler?
-   b) Can it switch the currently running thread?  */
+   Can it lock the thread scheduler?  */
 
 #define target_can_lock_scheduler \
      (current_target.to_has_thread_control & tc_schedlock)
 
-#define target_can_switch_threads \
-     (current_target.to_has_thread_control & tc_switch)
-
 /* Can the target support asynchronous execution? */
 #define target_can_async_p() (current_target.to_can_async_p ())