[hppa64-hpux] Cleanup TM_FILE usage

[hppa64-hpux] Cleanup TM_FILE usage

[Randolph Chung]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

tm-hppa64.h defines a GDB_TARGET_IS_HPPA_20W flag that needs to go. Most 
of the uses of this flag have been cleaned up already; there's only one 
left in hppa-hpux-tdep.c that is cleaned up by this patch. Once that is 
done, we can get rid of tm-hppa64.h

Thoughts? Comments?

randolph

[-- Attachment #2: hpux-cleanup.diff --]
[-- Type: text/x-patch, Size: 6009 bytes --]

2006-02-25  Randolph Chung  <tausq@debian.org>

	* hppa-hpux-tdep.c (initialize_hp_cxx_exception_support): Use
	TDEP->is_elf to determine if we are working with a SOM binary.
	(null_symtab_and_line): Remove unused variable.
	* config/pa/hppa64.mt: Use tm-hppa.h.
	* config/pa/tm-hppa64.h: Remove file.

Index: hppa-hpux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
retrieving revision 1.50
diff -u -p -r1.50 hppa-hpux-tdep.c
--- hppa-hpux-tdep.c	24 Feb 2006 23:52:04 -0000	1.50
+++ hppa-hpux-tdep.c	24 Feb 2006 23:57:31 -0000
@@ -844,52 +844,54 @@ GDB will be unable to intercept exceptio
       return 0;
     }
 
-#ifndef GDB_TARGET_IS_HPPA_20W
-  /* 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;
-      static char message[] = "Error while finding exception callback hook:\n";
-
-      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, message,
-		    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 (_("\
+  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;
+        static char message[] = "Error while finding exception callback hook:\n";
+
+        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, message,
+		      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;
-	}
+	    return 0;
+	  }
+      }
+    else
+      deprecated_exception_catchpoints_are_fragile = 0;
     }
-  else
-    deprecated_exception_catchpoints_are_fragile = 0;
-#endif
 
   /* Now, look for the breakpointable routine in end.o */
   /* This should also be available in the SOM symbol dict. if end.o linked in */
@@ -1063,9 +1065,6 @@ Interception of exception events may not
 
 /* Record some information about the current exception event */
 static struct exception_event_record current_ex_event;
-/* Convenience struct */
-static struct symtab_and_line null_symtab_and_line =
-{NULL, 0, 0, 0};
 
 /* Report current exception event.  Returns a pointer to a record
    that describes the kind of the event, where it was thrown from,

Index: config/pa/hppa64.mt
===================================================================
RCS file: /cvs/src/src/gdb/config/pa/hppa64.mt,v
retrieving revision 1.6
diff -u -p -r1.6 hppa64.mt
--- config/pa/hppa64.mt	13 Dec 2004 04:06:16 -0000	1.6
+++ config/pa/hppa64.mt	24 Feb 2006 23:57:32 -0000
@@ -1,3 +1,3 @@
 # Target: HP PA-RISC 2.0 running HPUX 11.00 in wide mode
 TDEPFILES= hppa-tdep.o hppa-hpux-tdep.o solib-som.o solib-pa64.o somread.o hpread.o solib.o
-DEPRECATED_TM_FILE= tm-hppa64.h
+DEPRECATED_TM_FILE= tm-hppa.h

Re: [hppa64-hpux] Cleanup TM_FILE usage

[Eli Zaretskii]

> Date: Sat, 25 Feb 2006 08:11:53 +0800
> From: Randolph Chung <randolph@tausq.org>
> 
> +        static char message[] = "Error while finding exception callback hook:\n";

Shouldn't this string be translated?  If so, this need to be changed
to allow translation.

Re: [hppa64-hpux] Cleanup TM_FILE usage

[Randolph Chung]

>>
>>+        static char message[] = "Error while finding exception callback hook:\n";
> 
> 
> Shouldn't this string be translated?  If so, this need to be changed
> to allow translation.

this is not a new message, just reindented. but i will fix this before i 
commit..

thanks for catching it.

randolph

Re: [hppa64-hpux] Cleanup TM_FILE usage

[Randolph Chung]

> this is not a new message, just reindented. but i will fix this before i
> commit..
> 
> thanks for catching it.

This is checked in now.

2006-03-01  Randolph Chung  <tausq@debian.org>

        * hppa-hpux-tdep.c (initialize_hp_cxx_exception_support): Use
        TDEP->is_elf to determine if we are working with a SOM binary.
        (null_symtab_and_line): Remove unused variable.
        * config/pa/hppa64.mt: Use tm-hppa.h.
        * config/pa/tm-hppa64.h: Remove file.

randolph