[rfc] Remove unused code - hpread.c removal follow-on [2/2]

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[rfc] Remove unused code - hpread.c removal follow-on [2/2]

Ulrich Weigand
Hello,

this is the second part of the hpread.c removal follow-on.  Since that file
is gone, deprecated_hp_som_som_object_present can never have a non-zero value.
This patch removes this variable and all parts of GDB that handle it, in
particular the parse_nested_classes_for_hpacc routine called from c-exp.y.

Also, since deprecated_hp_som_som_object_present is never set, the hpACC
exception catchpoint support can never be initialized.  (It didn't work
anyway as the child_enable_exception_callback and
child_get_current_exception_event are no longer called anywhere; they
hadn't been converted to target callbacks when switching the hpux target
to use inf-ptrace.c instead of infptrace.c.)

This is turn means that the deprecated_exception_catchpoints_are_fragile
and deprecated_exception_support_initialized variables can no longer ever
have a non-zero value, so the patch removes those variables and code that
handles them as well.

Tested on powerpc-linux and by making sure hppa-hpux-tdep.c still compiles.

Any reason why we should keep this?

Bye,
Ulrich


ChangeLog:

        * hppa-hpux-tdep.c (args_for_find_stub, HP_ACC_EH_notify_hook,
        HP_ACC_EH_set_hook_value, HP_ACC_EH_notify_callback, HP_ACC_EH_break,
        HP_ACC_EH_catch_throw, HP_ACC_EH_catch_catch, __eh_notification,
        hp_cxx_exception_support, hp_cxx_exception_support_initialized,
        eh_notify_hook_addr, eh_notify_callback_addr, eh_break_addr,
        eh_catch_throw_addr, break_callback_sal, setup_d_pid_in_inferior,
        find_stub_with_shl_get, cover_find_stub_with_shl_get,
        initialize_hp_cxx_exception_support, child_enable_exception_callback,
        current_ex_event, child_get_current_exception_event): Remove.
        (hppa_hpux_inferior_created): Remove.
        (hppa_hpux_init_abi): Do not install hppa_hpux_inferior_created.

        * breakpoint.h (deprecated_exception_catchpoints_are_fragile): Remove.
        (deprecated_exception_support_initialized): Remove.
        * breakpoint.c (deprecated_exception_catchpoints_are_fragile): Remove.
        (deprecated_exception_support_initialized): Remove.
        (breakpoint_init_inferior): Remove handling of non-zero
        deprecated_exception_catchpoints_are_fragile.

        * symtab.h (deprecated_hp_som_som_object_present): Remove.
        * symtab.c (deprecated_hp_som_som_object_present): Remove.
        * c-typeprint.c (c_type_print_base): Remove handling of non-zero
        deprecated_hp_som_som_object_present.
        * eval.c (evaluate_subexp_standard): Likewise.
        * valops.c (value_cast): Likewise.

        * parse.c (parse_nested_classes_for_hpacc, coloncolon): Remove.
        * parser-defs.h (parse_nested_classes_for_hpacc): Remove.
        * c-exp.y (yylex): Do not call parse_nested_classes_for_hpacc.


diff -urNp gdb-orig/gdb/breakpoint.c gdb-head/gdb/breakpoint.c
--- gdb-orig/gdb/breakpoint.c 2007-05-11 22:00:55.000000000 +0200
+++ gdb-head/gdb/breakpoint.c 2007-06-01 15:48:47.508238919 +0200
@@ -298,14 +298,6 @@ int breakpoint_count;
 /* Pointer to current exception event record */
 static struct exception_event_record *current_exception_event;
 
-/* Indicator of whether exception catchpoints should be nuked between
-   runs of a program.  */
-int deprecated_exception_catchpoints_are_fragile = 0;
-
-/* Indicator of when exception catchpoints set-up should be
-   reinitialized -- e.g. when program is re-run.  */
-int deprecated_exception_support_initialized = 0;
-
 /* This function returns a pointer to the string representation of the
    pathname of the dynamically-linked library that has just been
    loaded.
@@ -1719,7 +1711,6 @@ breakpoint_init_inferior (enum inf_conte
 {
   struct breakpoint *b, *temp;
   struct bp_location *bpt;
-  static int warning_needed = 0;
 
   ALL_BP_LOCATIONS (bpt)
     bpt->inserted = 0;
@@ -1757,28 +1748,9 @@ breakpoint_init_inferior (enum inf_conte
   }
  break;
       default:
- /* Likewise for exception catchpoints in dynamic-linked
-   executables where required */
- if (ep_is_exception_catchpoint (b)
-    && deprecated_exception_catchpoints_are_fragile)
-  {
-    warning_needed = 1;
-    delete_breakpoint (b);
-  }
  break;
       }
   }
-
-  if (deprecated_exception_catchpoints_are_fragile)
-    deprecated_exception_support_initialized = 0;
-
-  /* Don't issue the warning unless it's really needed... */
-  if (warning_needed && (context != inf_exited))
-    {
-      warning (_("Exception catchpoints from last run were deleted.\n"
- "You must reinsert them explicitly."));
-      warning_needed = 0;
-    }
 }
 
 /* breakpoint_here_p (PC) returns non-zero if an enabled breakpoint
diff -urNp gdb-orig/gdb/breakpoint.h gdb-head/gdb/breakpoint.h
--- gdb-orig/gdb/breakpoint.h 2007-05-31 18:54:30.000000000 +0200
+++ gdb-head/gdb/breakpoint.h 2007-06-01 15:48:47.553364387 +0200
@@ -835,12 +835,4 @@ extern void remove_single_step_breakpoin
 extern void *deprecated_insert_raw_breakpoint (CORE_ADDR);
 extern int deprecated_remove_raw_breakpoint (void *);
 
-/* Indicator of whether exception catchpoints should be nuked between
-   runs of a program.  */
-extern int deprecated_exception_catchpoints_are_fragile;
-
-/* Indicator of when exception catchpoints set-up should be
-   reinitialized -- e.g. when program is re-run.  */
-extern int deprecated_exception_support_initialized;
-
 #endif /* !defined (BREAKPOINT_H) */
diff -urNp gdb-orig/gdb/c-exp.y gdb-head/gdb/c-exp.y
--- gdb-orig/gdb/c-exp.y 2007-01-11 20:57:48.000000000 +0100
+++ gdb-head/gdb/c-exp.y 2007-06-01 15:49:13.673457888 +0200
@@ -1301,10 +1301,8 @@ yylex ()
   int tempbufindex;
   static char *tempbuf;
   static int tempbufsize;
-  struct symbol * sym_class = NULL;
   char * token_string = NULL;
   int class_prefix = 0;
-  int unquoted_expr;
   
  retry:
 
@@ -1320,7 +1318,6 @@ yylex ()
     }
 
   prev_lexptr = lexptr;
-  unquoted_expr = 1;
 
   tokstart = lexptr;
   /* See if it is a special token of length 3.  */
@@ -1392,7 +1389,6 @@ yylex ()
   if (namelen > 2)
     {
       lexptr = tokstart + namelen;
-              unquoted_expr = 0;
       if (lexptr[-1] != '\'')
  error ("Unmatched single quote.");
       namelen -= 2;
@@ -1691,30 +1687,6 @@ yylex ()
       return VARIABLE;
     }
   
-  /* Look ahead and see if we can consume more of the input
-     string to get a reasonable class/namespace spec or a
-     fully-qualified name.  This is a kludge to get around the
-     HP aCC compiler's generation of symbol names with embedded
-     colons for namespace and nested classes. */
-
-  /* NOTE: carlton/2003-09-24: I don't entirely understand the
-     HP-specific code, either here or in linespec.  Having said that,
-     I suspect that we're actually moving towards their model: we want
-     symbols whose names are fully qualified, which matches the
-     description above.  */
-  if (unquoted_expr)
-    {
-      /* Only do it if not inside single quotes */
-      sym_class = parse_nested_classes_for_hpacc (yylval.sval.ptr, yylval.sval.length,
-                                                  &token_string, &class_prefix, &lexptr);
-      if (sym_class)
-        {
-          /* Replace the current token with the bigger one we found */
-          yylval.sval.ptr = token_string;
-          yylval.sval.length = strlen (token_string);
-        }
-    }
-  
   /* Use token-type BLOCKNAME for symbols that happen to be defined as
      functions or symtabs.  If this is not so, then ...
      Use token-type TYPENAME for symbols that happen to be defined
diff -urNp gdb-orig/gdb/c-typeprint.c gdb-head/gdb/c-typeprint.c
--- gdb-orig/gdb/c-typeprint.c 2007-01-11 20:57:48.000000000 +0100
+++ gdb-head/gdb/c-typeprint.c 2007-06-01 15:48:47.572361652 +0200
@@ -1053,19 +1053,6 @@ c_type_print_base (struct type *type, st
 
     case TYPE_CODE_ENUM:
       c_type_print_modifier (type, stream, 0, 1);
-      /* HP C supports sized enums */
-      if (deprecated_hp_som_som_object_present)
- switch (TYPE_LENGTH (type))
-  {
-  case 1:
-    fputs_filtered ("char ", stream);
-    break;
-  case 2:
-    fputs_filtered ("short ", stream);
-    break;
-  default:
-    break;
-  }
       fprintf_filtered (stream, "enum ");
       /* Print the tag name if it exists.
          The aCC compiler emits a spurious
diff -urNp gdb-orig/gdb/eval.c gdb-head/gdb/eval.c
--- gdb-orig/gdb/eval.c 2007-02-22 16:00:06.000000000 +0100
+++ gdb-head/gdb/eval.c 2007-06-01 15:48:47.585359781 +0200
@@ -1022,14 +1022,6 @@ evaluate_subexp_standard (struct type *e
       argvec = (struct value **) alloca (sizeof (struct value *) * (nargs + 3));
       if (op == STRUCTOP_MEMBER || op == STRUCTOP_MPTR)
  {
-  /* 1997-08-01 Currently we do not support function invocation
-     via pointers-to-methods with HP aCC. Pointer does not point
-     to the function, but possibly to some thunk. */
-  if (deprecated_hp_som_som_object_present)
-    {
-      error (_("Not implemented: function invocation through pointer to method with HP aCC"));
-    }
-
   nargs++;
   /* First, evaluate the structure into arg2 */
   pc2 = (*pos)++;
@@ -1415,14 +1407,6 @@ evaluate_subexp_standard (struct type *e
       switch (TYPE_CODE (type))
  {
  case TYPE_CODE_METHODPTR:
-  if (deprecated_hp_som_som_object_present)
-    {
-      /* With HP aCC, pointers to methods do not point to the
- function code.  */
-      /* 1997-08-19 */
-      error (_("Pointers to methods not supported with HP aCC"));
-    }
-
   if (noside == EVAL_AVOID_SIDE_EFFECTS)
     return value_zero (TYPE_TARGET_TYPE (type), not_lval);
   else
@@ -1438,14 +1422,6 @@ evaluate_subexp_standard (struct type *e
      arg1);
 
   mem_offset = value_as_long (arg2);
-  if (deprecated_hp_som_som_object_present)
-    {
-      /* HP aCC generates offsets that have bit #29 set; turn it off to get
- a real offset to the member. */
-      if (!mem_offset) /* no bias -> really null */
- error (_("Attempted dereference of null pointer-to-member"));
-      mem_offset &= ~0x20000000;
-    }
 
   arg3 = value_from_pointer (lookup_pointer_type (TYPE_TARGET_TYPE (type)),
      value_as_long (arg1) + mem_offset);
@@ -1469,24 +1445,6 @@ evaluate_subexp_standard (struct type *e
       arg1 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
       arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside);
 
-      /* Do special stuff for HP aCC pointers to members */
-      if (deprecated_hp_som_som_object_present)
- {
-  /* 1997-08-19 Can't assign HP aCC pointers to methods. No details of
-     the implementation yet; but the pointer appears to point to a code
-     sequence (thunk) in memory -- in any case it is *not* the address
-     of the function as it would be in a naive implementation. */
-  if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_METHODPTR)
-    error (_("Assignment to pointers to methods not implemented with HP aCC"));
-
-  /* HP aCC pointers to data members require a constant bias.  */
-  if (TYPE_CODE (value_type (arg1)) == TYPE_CODE_MEMBERPTR)
-    {
-      unsigned int *ptr = (unsigned int *) value_contents (arg2); /* forces evaluation */
-      *ptr |= 0x20000000; /* set 29th bit */
-    }
- }
-
       if (noside == EVAL_SKIP || noside == EVAL_AVOID_SIDE_EFFECTS)
  return arg1;
       if (binop_user_defined_p (op, arg1, arg2))
@@ -1978,13 +1936,6 @@ evaluate_subexp_standard (struct type *e
       else
  {
   struct value *retvalp = evaluate_subexp_for_address (exp, pos, noside);
-  /* If HP aCC object, use bias for pointers to members */
-  if (deprecated_hp_som_som_object_present
-      && TYPE_CODE (value_type (retvalp)) == TYPE_CODE_MEMBERPTR)
-    {
-      unsigned int *ptr = (unsigned int *) value_contents (retvalp); /* forces evaluation */
-      *ptr |= 0x20000000; /* set 29th bit */
-    }
   return retvalp;
  }
 
diff -urNp gdb-orig/gdb/hppa-hpux-tdep.c gdb-head/gdb/hppa-hpux-tdep.c
--- gdb-orig/gdb/hppa-hpux-tdep.c 2007-05-15 20:29:46.000000000 +0200
+++ gdb-head/gdb/hppa-hpux-tdep.c 2007-06-01 15:48:47.598357909 +0200
@@ -67,14 +67,6 @@
 extern void _initialize_hppa_hpux_tdep (void);
 extern initialize_file_ftype _initialize_hppa_hpux_tdep;
 
-typedef struct
-  {
-    struct minimal_symbol *msym;
-    CORE_ADDR solib_handle;
-    CORE_ADDR return_val;
-  }
-args_for_find_stub;
-
 static int
 in_opd_section (CORE_ADDR pc)
 {
@@ -571,562 +563,6 @@ hppa_skip_permanent_breakpoint (struct r
   /* We can leave the tail's space the same, since there's no jump.  */
 }
 
-/* Exception handling support for the HP-UX ANSI C++ compiler.
-   The compiler (aCC) provides a callback for exception events;
-   GDB can set a breakpoint on this callback and find out what
-   exception event has occurred. */
-
-/* The name of the hook to be set to point to the callback function.  */
-static char HP_ACC_EH_notify_hook[] = "__eh_notify_hook";
-/* The name of the function to be used to set the hook value.  */
-static char HP_ACC_EH_set_hook_value[] = "__eh_set_hook_value";
-/* The name of the callback function in end.o */
-static char HP_ACC_EH_notify_callback[] = "__d_eh_notify_callback";
-/* Name of function in end.o on which a break is set (called by above).  */
-static char HP_ACC_EH_break[] = "__d_eh_break";
-/* Name of flag (in end.o) that enables catching throws.  */
-static char HP_ACC_EH_catch_throw[] = "__d_eh_catch_throw";
-/* Name of flag (in end.o) that enables catching catching.  */
-static char HP_ACC_EH_catch_catch[] = "__d_eh_catch_catch";
-/* The enum used by aCC.  */
-typedef enum
-  {
-    __EH_NOTIFY_THROW,
-    __EH_NOTIFY_CATCH
-  }
-__eh_notification;
-
-/* Is exception-handling support available with this executable? */
-static int hp_cxx_exception_support = 0;
-/* Has the initialize function been run? */
-static int hp_cxx_exception_support_initialized = 0;
-/* Address of __eh_notify_hook */
-static CORE_ADDR eh_notify_hook_addr = 0;
-/* Address of __d_eh_notify_callback */
-static CORE_ADDR eh_notify_callback_addr = 0;
-/* Address of __d_eh_break */
-static CORE_ADDR eh_break_addr = 0;
-/* Address of __d_eh_catch_catch */
-static CORE_ADDR eh_catch_catch_addr = 0;
-/* Address of __d_eh_catch_throw */
-static CORE_ADDR eh_catch_throw_addr = 0;
-/* Sal for __d_eh_break */
-static struct symtab_and_line *break_callback_sal = 0;
-
-/* Code in end.c expects __d_pid to be set in the inferior,
-   otherwise __d_eh_notify_callback doesn't bother to call
-   __d_eh_break!  So we poke the pid into this symbol
-   ourselves.
-   0 => success
-   1 => failure  */
-static int
-setup_d_pid_in_inferior (void)
-{
-  CORE_ADDR anaddr;
-  struct minimal_symbol *msymbol;
-  char buf[4]; /* FIXME 32x64? */
-
-  /* Slam the pid of the process into __d_pid; failing is only a warning!  */
-  msymbol = lookup_minimal_symbol ("__d_pid", NULL, symfile_objfile);
-  if (msymbol == NULL)
-    {
-      warning (_("Unable to find __d_pid symbol in object file.\n"
- "Suggest linking executable with -g (links in /opt/langtools/lib/end.o)."));
-      return 1;
-    }
-
-  anaddr = SYMBOL_VALUE_ADDRESS (msymbol);
-  store_unsigned_integer (buf, 4, PIDGET (inferior_ptid)); /* FIXME 32x64? */
-  if (target_write_memory (anaddr, buf, 4)) /* FIXME 32x64? */
-    {
-      warning (_("Unable to write __d_pid.\n"
- "Suggest linking executable with -g (links in /opt/langtools/lib/end.o)."));
-      return 1;
-    }
-  return 0;
-}
-
-/* elz: Used to lookup a symbol in the shared libraries.
-   This function calls shl_findsym, indirectly through a
-   call to __d_shl_get. __d_shl_get is in end.c, which is always
-   linked in by the hp compilers/linkers.
-   The call to shl_findsym cannot be made directly because it needs
-   to be active in target address space.
-   inputs: - minimal symbol pointer for the function we want to look up
-   - address in target space of the descriptor for the library
-   where we want to look the symbol up.
-   This address is retrieved using the
-   som_solib_get_solib_by_pc function (somsolib.c).
-   output: - real address in the library of the function.          
-   note: the handle can be null, in which case shl_findsym will look for
-   the symbol in all the loaded shared libraries.
-   files to look at if you need reference on this stuff:
-   dld.c, dld_shl_findsym.c
-   end.c
-   man entry for shl_findsym */
-
-static CORE_ADDR
-find_stub_with_shl_get (struct minimal_symbol *function, CORE_ADDR handle)
-{
-  struct symbol *get_sym, *symbol2;
-  struct minimal_symbol *buff_minsym, *msymbol;
-  struct type *ftype;
-  struct value **args;
-  struct value *funcval;
-  struct value *val;
-
-  int x, namelen, err_value, tmp = -1;
-  CORE_ADDR endo_buff_addr, value_return_addr, errno_return_addr;
-  CORE_ADDR stub_addr;
-
-
-  args = alloca (sizeof (struct value *) * 8); /* 6 for the arguments and one null one??? */
-  funcval = find_function_in_inferior ("__d_shl_get");
-  get_sym = lookup_symbol ("__d_shl_get", NULL, VAR_DOMAIN, NULL, NULL);
-  buff_minsym = lookup_minimal_symbol ("__buffer", NULL, NULL);
-  msymbol = lookup_minimal_symbol ("__shldp", NULL, NULL);
-  symbol2 = lookup_symbol ("__shldp", NULL, VAR_DOMAIN, NULL, NULL);
-  endo_buff_addr = SYMBOL_VALUE_ADDRESS (buff_minsym);
-  namelen = strlen (DEPRECATED_SYMBOL_NAME (function));
-  value_return_addr = endo_buff_addr + namelen;
-  ftype = check_typedef (SYMBOL_TYPE (get_sym));
-
-  /* do alignment */
-  if ((x = value_return_addr % 64) != 0)
-    value_return_addr = value_return_addr + 64 - x;
-
-  errno_return_addr = value_return_addr + 64;
-
-
-  /* set up stuff needed by __d_shl_get in buffer in end.o */
-
-  target_write_memory (endo_buff_addr, DEPRECATED_SYMBOL_NAME (function), namelen);
-
-  target_write_memory (value_return_addr, (char *) &tmp, 4);
-
-  target_write_memory (errno_return_addr, (char *) &tmp, 4);
-
-  target_write_memory (SYMBOL_VALUE_ADDRESS (msymbol),
-       (char *) &handle, 4);
-
-  /* now prepare the arguments for the call */
-
-  args[0] = value_from_longest (TYPE_FIELD_TYPE (ftype, 0), 12);
-  args[1] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 1), SYMBOL_VALUE_ADDRESS (msymbol));
-  args[2] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 2), endo_buff_addr);
-  args[3] = value_from_longest (TYPE_FIELD_TYPE (ftype, 3), 3 /* TYPE_PROCEDURE */);
-  args[4] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 4), value_return_addr);
-  args[5] = value_from_pointer (TYPE_FIELD_TYPE (ftype, 5), errno_return_addr);
-
-  /* now call the function */
-
-  val = call_function_by_hand (funcval, 6, args);
-
-  /* now get the results */
-
-  target_read_memory (errno_return_addr, (char *) &err_value, sizeof (err_value));
-
-  target_read_memory (value_return_addr, (char *) &stub_addr, sizeof (stub_addr));
-  if (stub_addr <= 0)
-    error (_("call to __d_shl_get failed, error code is %d"), err_value);
-
-  return (stub_addr);
-}
-
-/* Cover routine for find_stub_with_shl_get to pass to catch_errors */
-static int
-cover_find_stub_with_shl_get (void *args_untyped)
-{
-  args_for_find_stub *args = args_untyped;
-  args->return_val = find_stub_with_shl_get (args->msym, args->solib_handle);
-  return 0;
-}
-
-/* Initialize exception catchpoint support by looking for the
-   necessary hooks/callbacks in end.o, etc., and set the hook value
-   to point to the required debug function.
-
-   Return 0 => failure
-   1 => success          */
-
-static int
-initialize_hp_cxx_exception_support (void)
-{
-  struct symtabs_and_lines sals;
-  struct cleanup *old_chain;
-  struct cleanup *canonical_strings_chain = NULL;
-  int i;
-  char *addr_start;
-  char *addr_end = NULL;
-  char **canonical = (char **) NULL;
-  int thread = -1;
-  struct symbol *sym = NULL;
-  struct minimal_symbol *msym = NULL;
-  struct objfile *objfile;
-  asection *shlib_info;
-
-  /* Detect and disallow recursion.  On HP-UX with aCC, infinite
-     recursion is a possibility because finding the hook for exception
-     callbacks involves making a call in the inferior, which means
-     re-inserting breakpoints which can re-invoke this code.  */
-
-  static int recurse = 0;
-  if (recurse > 0)
-    {
-      hp_cxx_exception_support_initialized = 0;
-      deprecated_exception_support_initialized = 0;
-      return 0;
-    }
-
-  hp_cxx_exception_support = 0;
-
-  /* First check if we have seen any HP compiled objects; if not,
-     it is very unlikely that HP's idiosyncratic callback mechanism
-     for exception handling debug support will be available!
-     This will percolate back up to breakpoint.c, where our callers
-     will decide to try the g++ exception-handling support instead. */
-  if (!deprecated_hp_som_som_object_present)
-    return 0;
-
-  /* We have a SOM executable with SOM debug info; find the hooks.  */
-
-  /* First look for the notify hook provided by aCC runtime libs */
-  /* If we find this symbol, we conclude that the executable must
-     have HP aCC exception support built in.  If this symbol is not
-     found, even though we're a HP SOM-SOM file, we may have been
-     built with some other compiler (not aCC).  This results percolates
-     back up to our callers in breakpoint.c which can decide to
-     try the g++ style of exception support instead.
-     If this symbol is found but the other symbols we require are
-     not found, there is something weird going on, and g++ support
-     should *not* be tried as an alternative.
-
-     ASSUMPTION: Only HP aCC code will have __eh_notify_hook defined.  
-     ASSUMPTION: HP aCC and g++ modules cannot be linked together.  */
-
-  /* libCsup has this hook; it'll usually be non-debuggable */
-  msym = lookup_minimal_symbol (HP_ACC_EH_notify_hook, NULL, NULL);
-  if (msym)
-    {
-      eh_notify_hook_addr = SYMBOL_VALUE_ADDRESS (msym);
-      hp_cxx_exception_support = 1;
-    }
-  else
-    {
-      warning (_("\
-Unable to find exception callback hook (%s).\n\
-Executable may not have been compiled debuggable with HP aCC.\n\
-GDB will be unable to intercept exception events."),
-       HP_ACC_EH_notify_hook);
-      eh_notify_hook_addr = 0;
-      hp_cxx_exception_support = 0;
-      return 0;
-    }
-
-  /* Next look for the notify callback routine in end.o */
-  /* This is always available in the SOM symbol dictionary if end.o is
-     linked in. */
-  msym = lookup_minimal_symbol (HP_ACC_EH_notify_callback, NULL, NULL);
-  if (msym)
-    {
-      eh_notify_callback_addr = SYMBOL_VALUE_ADDRESS (msym);
-      hp_cxx_exception_support = 1;
-    }
-  else
-    {
-      warning (_("\
-Unable to find exception callback routine (%s).\n\
-Suggest linking executable with -g (links in /opt/langtools/lib/end.o).\n\
-GDB will be unable to intercept exception events."),
-       HP_ACC_EH_notify_callback);
-      eh_notify_callback_addr = 0;
-      return 0;
-    }
-
-  if (!gdbarch_tdep (current_gdbarch)->is_elf)
-    {
-    /* Check whether the executable is dynamically linked or archive bound */
-    /* With an archive-bound executable we can use the raw addresses we find
-       for the callback function, etc. without modification. For an executable
-       with shared libraries, we have to do more work to find the plabel, which
-       can be the target of a call through $$dyncall from the aCC runtime
-       support library (libCsup) which is linked shared by default by aCC. */
-    /* This test below was copied from somsolib.c/somread.c.  It may not be a very
-       reliable one to test that an executable is linked shared.
-       pai/1997-07-18 */
-    shlib_info = bfd_get_section_by_name (symfile_objfile->obfd, "$SHLIB_INFO$");
-    if (shlib_info && (bfd_section_size (symfile_objfile->obfd, shlib_info) != 0))
-      {
-        /* The minsym we have has the local code address, but that's not
-           the plabel that can be used by an inter-load-module call.  */
-        /* Find solib handle for main image (which has end.o), and use
-           that and the min sym as arguments to __d_shl_get() (which
-           does the equivalent of shl_findsym()) to find the plabel.  */
-
-        args_for_find_stub args;
-
-        args.solib_handle = gdbarch_tdep (current_gdbarch)->solib_get_solib_by_pc (eh_notify_callback_addr);
-        args.msym = msym;
-        args.return_val = 0;
-
-        recurse++;
-        catch_errors (cover_find_stub_with_shl_get, &args,
-      _("Error while finding exception callback hook:\n"),
-      RETURN_MASK_ALL);
-        eh_notify_callback_addr = args.return_val;
-        recurse--;
-
-        deprecated_exception_catchpoints_are_fragile = 1;
-
-        if (!eh_notify_callback_addr)
-  {
-    /* We can get here either if there is no plabel in the export list
-       for the main image, or if something strange happened (?) */
-    warning (_("\
-Couldn't find a plabel (indirect function label) for the exception callback.\n\
-GDB will not be able to intercept exception events."));
-    return 0;
-  }
-      }
-    else
-      deprecated_exception_catchpoints_are_fragile = 0;
-    }
-
-  /* Now, look for the breakpointable routine in end.o */
-  /* This should also be available in the SOM symbol dict. if end.o linked in */
-  msym = lookup_minimal_symbol (HP_ACC_EH_break, NULL, NULL);
-  if (msym)
-    {
-      eh_break_addr = SYMBOL_VALUE_ADDRESS (msym);
-      hp_cxx_exception_support = 1;
-    }
-  else
-    {
-      warning (_("\
-Unable to find exception callback routine to set breakpoint (%s).\n\
-Suggest linking executable with -g (link in /opt/langtools/lib/end.o).\n\
-GDB will be unable to intercept exception events."),
-       HP_ACC_EH_break);
-      eh_break_addr = 0;
-      return 0;
-    }
-
-  /* Next look for the catch enable flag provided in end.o */
-  sym = lookup_symbol (HP_ACC_EH_catch_catch, (struct block *) NULL,
-       VAR_DOMAIN, 0, (struct symtab **) NULL);
-  if (sym) /* sometimes present in debug info */
-    {
-      eh_catch_catch_addr = SYMBOL_VALUE_ADDRESS (sym);
-      hp_cxx_exception_support = 1;
-    }
-  else
-    /* otherwise look in SOM symbol dict. */
-    {
-      msym = lookup_minimal_symbol (HP_ACC_EH_catch_catch, NULL, NULL);
-      if (msym)
- {
-  eh_catch_catch_addr = SYMBOL_VALUE_ADDRESS (msym);
-  hp_cxx_exception_support = 1;
- }
-      else
- {
-  warning (_("\
-Unable to enable interception of exception catches.\n\
-Executable may not have been compiled debuggable with HP aCC.\n\
-Suggest linking executable with -g (link in /opt/langtools/lib/end.o)."));
-  return 0;
- }
-    }
-
-  /* Next look for the catch enable flag provided end.o */
-  sym = lookup_symbol (HP_ACC_EH_catch_catch, (struct block *) NULL,
-       VAR_DOMAIN, 0, (struct symtab **) NULL);
-  if (sym) /* sometimes present in debug info */
-    {
-      eh_catch_throw_addr = SYMBOL_VALUE_ADDRESS (sym);
-      hp_cxx_exception_support = 1;
-    }
-  else
-    /* otherwise look in SOM symbol dict. */
-    {
-      msym = lookup_minimal_symbol (HP_ACC_EH_catch_throw, NULL, NULL);
-      if (msym)
- {
-  eh_catch_throw_addr = SYMBOL_VALUE_ADDRESS (msym);
-  hp_cxx_exception_support = 1;
- }
-      else
- {
-  warning (_("\
-Unable to enable interception of exception throws.\n\
-Executable may not have been compiled debuggable with HP aCC.\n\
-Suggest linking executable with -g (link in /opt/langtools/lib/end.o)."));
-  return 0;
- }
-    }
-
-  /* Set the flags */
-  hp_cxx_exception_support = 2; /* everything worked so far */
-  hp_cxx_exception_support_initialized = 1;
-  deprecated_exception_support_initialized = 1;
-
-  return 1;
-}
-
-/* Target operation for enabling or disabling interception of
-   exception events.
-   KIND is either EX_EVENT_THROW or EX_EVENT_CATCH
-   ENABLE is either 0 (disable) or 1 (enable).
-   Return value is NULL if no support found;
-   -1 if something went wrong,
-   or a pointer to a symtab/line struct if the breakpointable
-   address was found. */
-
-struct symtab_and_line *
-child_enable_exception_callback (enum exception_event_kind kind, int enable)
-{
-  char buf[4];
-
-  if (!deprecated_exception_support_initialized
-      || !hp_cxx_exception_support_initialized)
-    if (!initialize_hp_cxx_exception_support ())
-      return NULL;
-
-  switch (hp_cxx_exception_support)
-    {
-    case 0:
-      /* Assuming no HP support at all */
-      return NULL;
-    case 1:
-      /* HP support should be present, but something went wrong */
-      return (struct symtab_and_line *) -1; /* yuck! */
-      /* there may be other cases in the future */
-    }
-
-  /* Set the EH hook to point to the callback routine.  */
-  store_unsigned_integer (buf, 4, enable ? eh_notify_callback_addr : 0); /* FIXME 32x64 problem */
-  /* pai: (temp) FIXME should there be a pack operation first? */
-  if (target_write_memory (eh_notify_hook_addr, buf, 4)) /* FIXME 32x64 problem */
-    {
-      warning (_("\
-Could not write to target memory for exception event callback.\n\
-Interception of exception events may not work."));
-      return (struct symtab_and_line *) -1;
-    }
-  if (enable)
-    {
-      /* Ensure that __d_pid is set up correctly -- end.c code checks this. :-( */
-      if (PIDGET (inferior_ptid) > 0)
- {
-  if (setup_d_pid_in_inferior ())
-    return (struct symtab_and_line *) -1;
- }
-      else
- {
-  warning (_("Internal error: Invalid inferior pid?  Cannot intercept exception events."));
-  return (struct symtab_and_line *) -1;
- }
-    }
-
-  switch (kind)
-    {
-    case EX_EVENT_THROW:
-      store_unsigned_integer (buf, 4, enable ? 1 : 0);
-      if (target_write_memory (eh_catch_throw_addr, buf, 4)) /* FIXME 32x64? */
- {
-  warning (_("Couldn't enable exception throw interception."));
-  return (struct symtab_and_line *) -1;
- }
-      break;
-    case EX_EVENT_CATCH:
-      store_unsigned_integer (buf, 4, enable ? 1 : 0);
-      if (target_write_memory (eh_catch_catch_addr, buf, 4)) /* FIXME 32x64? */
- {
-  warning (_("Couldn't enable exception catch interception."));
-  return (struct symtab_and_line *) -1;
- }
-      break;
-    default:
-      error (_("Request to enable unknown or unsupported exception event."));
-    }
-
-  /* Copy break address into new sal struct, malloc'ing if needed.  */
-  if (!break_callback_sal)
-    break_callback_sal = XMALLOC (struct symtab_and_line);
-  init_sal (break_callback_sal);
-  break_callback_sal->symtab = NULL;
-  break_callback_sal->pc = eh_break_addr;
-  break_callback_sal->line = 0;
-  break_callback_sal->end = eh_break_addr;
-
-  return break_callback_sal;
-}
-
-/* Record some information about the current exception event */
-static struct exception_event_record current_ex_event;
-
-/* Report current exception event.  Returns a pointer to a record
-   that describes the kind of the event, where it was thrown from,
-   and where it will be caught.  More information may be reported
-   in the future */
-struct exception_event_record *
-child_get_current_exception_event (void)
-{
-  CORE_ADDR event_kind;
-  CORE_ADDR throw_addr;
-  CORE_ADDR catch_addr;
-  struct frame_info *fi, *curr_frame;
-  int level = 1;
-
-  curr_frame = get_current_frame ();
-  if (!curr_frame)
-    return (struct exception_event_record *) NULL;
-
-  /* Go up one frame to __d_eh_notify_callback, because at the
-     point when this code is executed, there's garbage in the
-     arguments of __d_eh_break. */
-  fi = find_relative_frame (curr_frame, &level);
-  if (level != 0)
-    return (struct exception_event_record *) NULL;
-
-  select_frame (fi);
-
-  /* Read in the arguments */
-  /* __d_eh_notify_callback() is called with 3 arguments:
-     1. event kind catch or throw
-     2. the target address if known
-     3. a flag -- not sure what this is. pai/1997-07-17 */
-  event_kind = read_register (HPPA_ARG0_REGNUM);
-  catch_addr = read_register (HPPA_ARG1_REGNUM);
-
-  /* Now go down to a user frame */
-  /* For a throw, __d_eh_break is called by
-     __d_eh_notify_callback which is called by
-     __notify_throw which is called
-     from user code.
-     For a catch, __d_eh_break is called by
-     __d_eh_notify_callback which is called by
-     <stackwalking stuff> which is called by
-     __throw__<stuff> or __rethrow_<stuff> which is called
-     from user code. */
-  /* FIXME: Don't use such magic numbers; search for the frames */
-  level = (event_kind == EX_EVENT_THROW) ? 3 : 4;
-  fi = find_relative_frame (curr_frame, &level);
-  if (level != 0)
-    return (struct exception_event_record *) NULL;
-
-  select_frame (fi);
-  throw_addr = get_frame_pc (fi);
-
-  /* Go back to original (top) frame */
-  select_frame (curr_frame);
-
-  current_ex_event.kind = (enum exception_event_kind) event_kind;
-  current_ex_event.throw_sal = find_pc_line (throw_addr, 1);
-  current_ex_event.catch_sal = find_pc_line (catch_addr, 1);
-
-  return &current_ex_event;
-}
 
 /* Signal frames.  */
 struct hppa_hpux_sigtramp_unwind_cache
@@ -1967,15 +1403,6 @@ hppa_hpux_unwind_pc (struct gdbarch *gdb
 }
 
 
-static void
-hppa_hpux_inferior_created (struct target_ops *objfile, int from_tty)
-{
-  /* Some HP-UX related globals to clear when a new "main"
-     symbol file is loaded.  HP-specific.  */
-  deprecated_hp_som_som_object_present = 0;
-  hp_cxx_exception_support_initialized = 0;
-}
-
 /* Given the current value of the pc, check to see if it is inside a stub, and
    if so, change the value of the pc to point to the caller of the stub.
    NEXT_FRAME is the next frame in the current list of frames.
@@ -2043,8 +1470,6 @@ hppa_hpux_init_abi (struct gdbarch_info
     (gdbarch, hppa_hpux_regset_from_core_section);
 
   frame_unwind_append_sniffer (gdbarch, hppa_hpux_sigtramp_unwind_sniffer);
-
-  observer_attach_inferior_created (hppa_hpux_inferior_created);
 }
 
 static void
diff -urNp gdb-orig/gdb/parse.c gdb-head/gdb/parse.c
--- gdb-orig/gdb/parse.c 2007-05-31 19:21:41.000000000 +0200
+++ gdb-head/gdb/parse.c 2007-06-01 15:48:47.608356470 +0200
@@ -554,187 +554,6 @@ handle_register:
 }
 
 
-/* Parse a string that is possibly a namespace / nested class
-   specification, i.e., something of the form A::B::C::x.  Input
-   (NAME) is the entire string; LEN is the current valid length; the
-   output is a string, TOKEN, which points to the largest recognized
-   prefix which is a series of namespaces or classes.  CLASS_PREFIX is
-   another output, which records whether a nested class spec was
-   recognized (= 1) or a fully qualified variable name was found (=
-   0).  ARGPTR is side-effected (if non-NULL) to point to beyond the
-   string recognized and consumed by this routine.
-
-   The return value is a pointer to the symbol for the base class or
-   variable if found, or NULL if not found.  Callers must check this
-   first -- if NULL, the outputs may not be correct.
-
-   This function is used c-exp.y.  This is used specifically to get
-   around HP aCC (and possibly other compilers), which insists on
-   generating names with embedded colons for namespace or nested class
-   members.
-
-   (Argument LEN is currently unused. 1997-08-27)
-
-   Callers must free memory allocated for the output string TOKEN.  */
-
-static const char coloncolon[2] =
-{':', ':'};
-
-struct symbol *
-parse_nested_classes_for_hpacc (char *name, int len, char **token,
- int *class_prefix, char **argptr)
-{
-  /* Comment below comes from decode_line_1 which has very similar
-     code, which is called for "break" command parsing. */
-
-  /* We have what looks like a class or namespace
-     scope specification (A::B), possibly with many
-     levels of namespaces or classes (A::B::C::D).
-
-     Some versions of the HP ANSI C++ compiler (as also possibly
-     other compilers) generate class/function/member names with
-     embedded double-colons if they are inside namespaces. To
-     handle this, we loop a few times, considering larger and
-     larger prefixes of the string as though they were single
-     symbols.  So, if the initially supplied string is
-     A::B::C::D::foo, we have to look up "A", then "A::B",
-     then "A::B::C", then "A::B::C::D", and finally
-     "A::B::C::D::foo" as single, monolithic symbols, because
-     A, B, C or D may be namespaces.
-
-     Note that namespaces can nest only inside other
-     namespaces, and not inside classes.  So we need only
-     consider *prefixes* of the string; there is no need to look up
-     "B::C" separately as a symbol in the previous example. */
-
-  char *p;
-  char *start, *end;
-  char *prefix = NULL;
-  char *tmp;
-  struct symbol *sym_class = NULL;
-  struct symbol *sym_var = NULL;
-  struct type *t;
-  int prefix_len = 0;
-  int done = 0;
-  char *q;
-
-  /* Check for HP-compiled executable -- in other cases
-     return NULL, and caller must default to standard GDB
-     behaviour. */
-
-  if (!deprecated_hp_som_som_object_present)
-    return (struct symbol *) NULL;
-
-  p = name;
-
-  /* Skip over whitespace and possible global "::" */
-  while (*p && (*p == ' ' || *p == '\t'))
-    p++;
-  if (p[0] == ':' && p[1] == ':')
-    p += 2;
-  while (*p && (*p == ' ' || *p == '\t'))
-    p++;
-
-  while (1)
-    {
-      /* Get to the end of the next namespace or class spec. */
-      /* If we're looking at some non-token, fail immediately */
-      start = p;
-      if (!(isalpha (*p) || *p == '$' || *p == '_'))
- return (struct symbol *) NULL;
-      p++;
-      while (*p && (isalnum (*p) || *p == '$' || *p == '_'))
- p++;
-
-      if (*p == '<')
- {
-  /* If we have the start of a template specification,
-     scan right ahead to its end */
-  q = find_template_name_end (p);
-  if (q)
-    p = q;
- }
-
-      end = p;
-
-      /* Skip over "::" and whitespace for next time around */
-      while (*p && (*p == ' ' || *p == '\t'))
- p++;
-      if (p[0] == ':' && p[1] == ':')
- p += 2;
-      while (*p && (*p == ' ' || *p == '\t'))
- p++;
-
-      /* Done with tokens? */
-      if (!*p || !(isalpha (*p) || *p == '$' || *p == '_'))
- done = 1;
-
-      tmp = (char *) alloca (prefix_len + end - start + 3);
-      if (prefix)
- {
-  memcpy (tmp, prefix, prefix_len);
-  memcpy (tmp + prefix_len, coloncolon, 2);
-  memcpy (tmp + prefix_len + 2, start, end - start);
-  tmp[prefix_len + 2 + end - start] = '\000';
- }
-      else
- {
-  memcpy (tmp, start, end - start);
-  tmp[end - start] = '\000';
- }
-
-      prefix = tmp;
-      prefix_len = strlen (prefix);
-
-      /* See if the prefix we have now is something we know about */
-
-      if (!done)
- {
-  /* More tokens to process, so this must be a class/namespace */
-  sym_class = lookup_symbol (prefix, 0, STRUCT_DOMAIN,
-     0, (struct symtab **) NULL);
- }
-      else
- {
-  /* No more tokens, so try as a variable first */
-  sym_var = lookup_symbol (prefix, 0, VAR_DOMAIN,
-   0, (struct symtab **) NULL);
-  /* If failed, try as class/namespace */
-  if (!sym_var)
-    sym_class = lookup_symbol (prefix, 0, STRUCT_DOMAIN,
-       0, (struct symtab **) NULL);
- }
-
-      if (sym_var ||
-  (sym_class &&
-   (t = check_typedef (SYMBOL_TYPE (sym_class)),
-    (TYPE_CODE (t) == TYPE_CODE_STRUCT
-     || TYPE_CODE (t) == TYPE_CODE_UNION))))
- {
-  /* We found a valid token */
-  *token = (char *) xmalloc (prefix_len + 1);
-  memcpy (*token, prefix, prefix_len);
-  (*token)[prefix_len] = '\000';
-  break;
- }
-
-      /* No variable or class/namespace found, no more tokens */
-      if (done)
- return (struct symbol *) NULL;
-    }
-
-  /* Out of loop, so we must have found a valid token */
-  if (sym_var)
-    *class_prefix = 0;
-  else
-    *class_prefix = 1;
-
-  if (argptr)
-    *argptr = done ? p : end;
-
-  return sym_var ? sym_var : sym_class; /* found */
-}
-
 char *
 find_template_name_end (char *p)
 {
diff -urNp gdb-orig/gdb/parser-defs.h gdb-head/gdb/parser-defs.h
--- gdb-orig/gdb/parser-defs.h 2007-01-11 20:57:56.000000000 +0100
+++ gdb-head/gdb/parser-defs.h 2007-06-01 15:48:47.616355319 +0200
@@ -138,9 +138,6 @@ extern void write_exp_msymbol (struct mi
 
 extern void write_dollar_variable (struct stoken str);
 
-extern struct symbol *parse_nested_classes_for_hpacc (char *, int, char **,
-      int *, char **);
-
 extern char *find_template_name_end (char *);
 
 extern void start_arglist (void);
diff -urNp gdb-orig/gdb/symtab.c gdb-head/gdb/symtab.c
--- gdb-orig/gdb/symtab.c 2007-04-18 21:53:21.000000000 +0200
+++ gdb-head/gdb/symtab.c 2007-06-01 15:48:47.633352872 +0200
@@ -118,10 +118,6 @@ struct symbol *lookup_symbol_aux_minsyms
   struct symtab **symtab);
 #endif
 
-/* This flag is used in hppa-tdep.c, and set in hp-symtab-read.c.
-   Signals the presence of objects compiled by HP compilers.  */
-int deprecated_hp_som_som_object_present = 0;
-
 static void fixup_section (struct general_symbol_info *, struct objfile *);
 
 static int file_matches (char *, char **, int);
diff -urNp gdb-orig/gdb/symtab.h gdb-head/gdb/symtab.h
--- gdb-orig/gdb/symtab.h 2007-05-15 20:29:17.000000000 +0200
+++ gdb-head/gdb/symtab.h 2007-06-01 15:48:47.643351432 +0200
@@ -1398,9 +1398,4 @@ extern struct cleanup *make_cleanup_free
 extern void set_main_name (const char *name);
 extern /*const */ char *main_name (void);
 
-/* Global to indicate presence of HP-compiled objects,
-   in particular, SOM executable file with SOM debug info
-   Defined in symtab.c, used in hppa-tdep.c. */
-extern int deprecated_hp_som_som_object_present;
-
 #endif /* !defined(SYMTAB_H) */
diff -urNp gdb-orig/gdb/valops.c gdb-head/gdb/valops.c
--- gdb-orig/gdb/valops.c 2007-02-27 22:13:39.000000000 +0100
+++ gdb-head/gdb/valops.c 2007-06-01 15:48:47.655349705 +0200
@@ -373,21 +373,6 @@ value_cast (struct type *type, struct va
     {
       LONGEST longest;
 
-      /* If target compiled by HP aCC.  */
-      if (deprecated_hp_som_som_object_present
-  && code2 == TYPE_CODE_MEMBERPTR)
- {
-  unsigned int *ptr;
-  struct value *retvalp;
-
-  /* With HP aCC, pointers to data members have a bias.  */
-  retvalp = value_from_longest (type, value_as_long (arg2));
-  /* force evaluation */
-  ptr = (unsigned int *) value_contents (retvalp);
-  *ptr &= ~0x20000000; /* zap 29th bit to remove bias */
-  return retvalp;
- }
-
       /* When we cast pointers to integers, we mustn't use
          POINTER_TO_ADDRESS to find the address the pointer
          represents, as value_as_long would.  GDB should evaluate
--
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  [hidden email]