Patch: Remove unused backtrace files and configury

[Bryce McKinlay <mckinlay at redhat dot com>]

This patch cleans up some unused backtrace machinery and its associated 
configure support. This code is no longer used with the new stack trace 
code in 4.1 and trunk, and in order to avoid confusion its best to 
remove it. I'm checking this in.

Bryce


2005-11-24  Bryce McKinlay  <mckinlay@redhat.com>

	* sysdep/ia64-frame.h: Removed.
	* sysdep/ia64.c: Removed.
	* sysdep/dwarf2-backtrace.cc: Removed.
	* configure.ac: Remove references to HAVE_BACKTRACE and
	SUPPLY_BACKTRACE.
	* Makefile.am: Remove SUPPLY_BACKTRACE support.
	* configure: Rebuilt.
	* Makefile.in: Rebuilt.

Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 107479)
+++ libjava/configure.ac	(working copy)
@@ -568,8 +568,6 @@
 TARGET_ECOS="$with_ecos"
 )
 
-supply_backtrace=no
-
 PLATFORM_INNER_NAT_HDRS=
 case "$TARGET_ECOS" in
    no) case "$host" in
@@ -902,33 +900,6 @@
 		   fork execvp pipe sigaction ftruncate])
    AC_CHECK_FUNCS(inet_aton inet_addr, break)
    AC_CHECK_HEADERS(execinfo.h unistd.h dlfcn.h) 
-   AC_CHECK_FUNC(backtrace, [
-     case "$host" in
-       ia64-*-linux*)
-	 # Has broken backtrace()
-	 ;;
-       mips*-*-linux*)
-         # Has broken backtrace(), but we supply our own.
-         if test -d sysdep; then true; else mkdir -p sysdep; fi
-	 supply_backtrace=yes
-         AC_DEFINE(HAVE_BACKTRACE, 1,
-           [Define if your platform has a working backtrace() function.])
-         ;;
-       *)
-         AC_DEFINE(HAVE_BACKTRACE, 1,
-           [Define if your platform has a working backtrace() function.])
-	 ;;
-     esac
-   ], [
-     case "$host" in
-       *mingw*)
-         # Has backtrace() defined in libgcj itself
-         AC_DEFINE(HAVE_BACKTRACE, 1,
-           [Define if your platform has a working backtrace() function.])
-         ;;
-     esac
-   ])
-
    AC_CHECK_LIB(dl, dladdr, [
      if test "x${disable_dladdr}" = "xyes"; then
        #Broken dladdr().
@@ -1162,7 +1133,6 @@
       AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
    fi
 fi
-AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes)
 
 # Use a semicolon as CLASSPATH separator for MinGW, otherwise a colon.
 case $build in
Index: libjava/sysdep/ia64-frame.h
===================================================================
--- libjava/sysdep/ia64-frame.h	(revision 107479)
+++ libjava/sysdep/ia64-frame.h	(working copy)
@@ -1,282 +0,0 @@
-/* Header file for unwinding stack frames for exception handling.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
-   Contributed by Jason Merrill <jason@cygnus.com>.
-
-This file is part of GNU CC.
-
-GNU CC 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, or (at your option)
-any later version.
-
-GNU CC 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.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* Number of hardware registers known to the compiler.  
-   We have 128 general registers, 128 floating point registers, 64 predicate
-   registers, 8 branch registers, and one frame pointer register.  */
-
-/* ??? Should add ar.lc, ar.ec and probably also ar.pfs.  */
-
-#define FIRST_PSEUDO_REGISTER 330
-
-#ifndef DWARF_FRAME_REGISTERS
-#define DWARF_FRAME_REGISTERS FIRST_PSEUDO_REGISTER
-#endif
-
-typedef struct frame_state
-{
-  void *cfa;
-  void *eh_ptr;
-  long cfa_offset;
-  long args_size;
-  long reg_or_offset[DWARF_FRAME_REGISTERS+1];
-  unsigned short cfa_reg;
-  unsigned short retaddr_column;
-  char saved[DWARF_FRAME_REGISTERS+1];
-} frame_state;
-
-/* Values for 'saved' above.  */
-#define REG_UNSAVED 0
-#define REG_SAVED_OFFSET 1
-#define REG_SAVED_REG 2
-
-/* The representation for an "object" to be searched for frame unwind info.
-   For targets with named sections, one object is an executable or shared
-   library; for other targets, one object is one translation unit.
-
-   A copy of this structure declaration is printed by collect2.c;
-   keep the copies synchronized!  */
-
-struct object {
-#ifdef IA64_UNWIND_INFO
-  void *pc_base;        /* This field will be set by __do_frame_setup. */
-#endif
-  void *pc_begin;
-  void *pc_end;
-  struct dwarf_fde *fde_begin;
-  struct dwarf_fde **fde_array;
-  size_t count;
-  struct object *next;
-};
-
-/* Called from __throw to find the registers to restore for a given
-   PC_TARGET.  The caller should allocate a local variable of `struct
-   frame_state' (declared in frame.h) and pass its address to STATE_IN.
-   Returns NULL on failure, otherwise returns STATE_IN.  */
-
-extern struct frame_state *__frame_state_for (void *, struct frame_state *);
-
-#ifdef IA64_UNWIND_INFO
-
-/* This is the information required for unwind records in an ia64
-   object file. This is required by GAS and the compiler runtime. */
-
-/* These are the starting point masks for the various types of
-   unwind records. To create a record of type R3 for instance, one
-   starts by using the value UNW_R3 and or-ing in any other required values. 
-   These values are also unique (in context), so they can be used to identify 
-   the various record types as well. UNW_Bx and some UNW_Px do have the
-   same value, but Px can only occur in a prologue context, and Bx in
-   a body context.  */
-
-#define UNW_R1	0x00
-#define UNW_R2	0x40
-#define UNW_R3	0x60
-#define UNW_P1	0x80
-#define UNW_P2	0xA0
-#define UNW_P3	0xB0
-#define UNW_P4	0xB8
-#define UNW_P5	0xB9
-#define UNW_P6	0xC0
-#define UNW_P7	0xE0
-#define UNW_P8	0xF0
-#define UNW_P9	0xF1
-#define UNW_P10	0xFF
-#define UNW_X1	0xF9
-#define UNW_X2	0xFA
-#define UNW_X3	0xFB
-#define UNW_X4	0xFC
-#define UNW_B1	0x80
-#define UNW_B2	0xC0
-#define UNW_B3	0xE0
-#define UNW_B4	0xF0
-
-/* These are all the various types of unwind records.  */
-
-typedef enum
-{
-  prologue, prologue_gr, body, mem_stack_f, mem_stack_v, psp_gr, psp_sprel,
-  rp_when, rp_gr, rp_br, rp_psprel, rp_sprel, pfs_when, pfs_gr, pfs_psprel,
-  pfs_sprel, preds_when, preds_gr, preds_psprel, preds_sprel,
-  fr_mem, frgr_mem, gr_gr, gr_mem, br_mem, br_gr, spill_base, spill_mask,
-  unat_when, unat_gr, unat_psprel, unat_sprel, lc_when, lc_gr, lc_psprel,
-  lc_sprel, fpsr_when, fpsr_gr, fpsr_psprel, fpsr_sprel, 
-  priunat_when_gr, priunat_when_mem, priunat_gr, priunat_psprel, 
-  priunat_sprel, bsp_when, bsp_gr, bsp_psprel, bsp_sprel, bspstore_when,
-  bspstore_gr, bspstore_psprel, bspstore_sprel, rnat_when, rnat_gr,
-  rnat_psprel, rnat_sprel, epilogue, label_state, copy_state,
-  spill_psprel, spill_sprel, spill_reg, spill_psprel_p, spill_sprel_p,
-  spill_reg_p
-} unw_record_type;
-
-
-/* These structures declare the fields that can be used in each of the 
-   4 record formats, R, P, B and X.  */
-
-typedef struct unw_r_record
-{
-  unsigned long rlen;
-  unsigned short mask;
-  unsigned short grsave;
-} unw_r_record;
-
-typedef struct unw_p_record
-{
-  void *imask;
-  unsigned long t;
-  unsigned long size;
-  unsigned long spoff;
-  unsigned long br;
-  unsigned long pspoff;
-  unsigned short gr;
-  unsigned short rmask;
-  unsigned short grmask;
-  unsigned long frmask;
-  unsigned short brmask;
-} unw_p_record;
-
-typedef struct unw_b_record
-{
-  unsigned long t;
-  unsigned long label;
-  unsigned short ecount;
-} unw_b_record;
-
-typedef struct unw_x_record
-{
-  unsigned long t;
-  unsigned long spoff;
-  unsigned long pspoff;
-  unsigned short reg;
-  unsigned short treg;
-  unsigned short qp;
-  unsigned short xy;   /* Value of the XY field..  */
-} unw_x_record;
-
-/* This structure is used to determine the specific record type and 
-   its fields.  */
-typedef struct unwind_record
-{
-  unw_record_type type;
-  union {
-    unw_r_record r;
-    unw_p_record p;
-    unw_b_record b;
-    unw_x_record x;
-  } record;
-} unwind_record;
-
-/* This structure represents the start of an unwind information pointer.  
-   'unwind_descriptors' is the beginninng of the unwind descriptors, which
-   use up 'length' bytes of storage.  */
-
-typedef struct unwind_info_ptr 
-{
-  unsigned short version;
-  unsigned short flags;
-  unsigned int length;
-  unsigned char unwind_descriptors[1];
-} unwind_info_ptr;
-
-
-#define IA64_UNW_LOC_TYPE_NONE		0
-#define IA64_UNW_LOC_TYPE_MEM		1
-#define IA64_UNW_LOC_TYPE_GR		2
-#define IA64_UNW_LOC_TYPE_FR		3
-#define IA64_UNW_LOC_TYPE_BR		4
-#define IA64_UNW_LOC_TYPE_SPOFF		5
-#define IA64_UNW_LOC_TYPE_PSPOFF	6
-#define IA64_UNW_LOC_TYPE_OFFSET	7
-#define IA64_UNW_LOC_TYPE_SPILLBASE	8
-
-typedef struct ia64_reg_loc 
-{
-  long when;		/* PC relative offset from start of function. */
-  union {		/* In memory or another register?  */
-    void *mem;
-    int regno;
-    int offset;
-  } l;
-  short loc_type;	/* Where to find value.  */
-  short reg_size;
-} ia64_reg_loc;
-
-/* Frame information record.  */
-
-typedef struct ia64_frame_state
-{
-  ia64_reg_loc gr[4];	/* gr4 to  gr7.  */
-  ia64_reg_loc fr[20];	/* fr2 to fr5, fr16 to fr31.  */
-  ia64_reg_loc br[5];	/* br1 to  br5.  */
-  ia64_reg_loc rp;
-  ia64_reg_loc fpsr;
-  ia64_reg_loc bsp;
-  ia64_reg_loc bspstore;
-  ia64_reg_loc rnat;
-  ia64_reg_loc pfs;
-  ia64_reg_loc unat;
-  ia64_reg_loc lc;
-  ia64_reg_loc pr;
-  ia64_reg_loc priunat;
-  ia64_reg_loc sp;
-  ia64_reg_loc psp;
-  ia64_reg_loc spill_base;
-  void *my_sp;
-  void *my_bsp;
-} ia64_frame_state;
-
-
-extern unwind_info_ptr *build_ia64_frame_state (unsigned char *, ia64_frame_state *, 
-						void *, void *);
-extern void *get_real_reg_value (ia64_reg_loc *);
-extern void *get_personality (unwind_info_ptr *);
-extern void *get_except_table (unwind_info_ptr *);
-extern void set_real_reg_value (ia64_reg_loc *, void *);
-void *calc_caller_bsp (long, unsigned char *);
-
-#endif   /* IA64_UNWIND_INFO  */
-
-/* Note the following routines are exported interfaces from libgcc; do not
-   change these interfaces.  Instead create new interfaces.  Also note
-   references to these functions may be made weak in files where they
-   are referenced.  */
-
-extern void __register_frame (void * );
-extern void __register_frame_table (void *);
-extern void __deregister_frame (void *);
-
-/* Called either from crtbegin.o or a static constructor to register the
-   unwind info for an object or translation unit, respectively.  */
-
-extern void __register_frame_info (void *, struct object *);
-
-/* Similar, but BEGIN is actually a pointer to a table of unwind entries
-   for different translation units.  Called from the file generated by
-   collect2.  */
-extern void __register_frame_info_table (void *, struct object *);
-
-/* Called from crtend.o to deregister the unwind info for an object.  */
-
-extern void *__deregister_frame_info (void *);
-
-
Index: libjava/sysdep/ia64.c
===================================================================
--- libjava/sysdep/ia64.c	(revision 107479)
+++ libjava/sysdep/ia64.c	(working copy)
@@ -1,81 +0,0 @@
-/* Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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, or (at your option)
-any later version.
-
-GNU CC 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.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#include <stddef.h>
-#include <memory.h>
-
-#define IA64_UNWIND_INFO
-#include "ia64-frame.h"
-
-static int 
-ia64_backtrace_helper (void **array, void *throw_pc, 
-		       ia64_frame_state *throw_frame,
-		       ia64_frame_state *frame, void *bsp, int size)
-{
-  void *pc = NULL;
-  int frame_count = 0;
-  unwind_info_ptr *info;
-
-  asm volatile ("flushrs");  /*  Make the local register stacks available.  */
-    
-  /* Start at our stack frame, get our state.  */
-  info = build_ia64_frame_state (throw_pc, throw_frame, bsp, NULL);
-
-  memcpy (frame, throw_frame, sizeof (*frame));
-
-  while (info && frame_count < size)
-    {
-      pc = array[frame_count++] = get_real_reg_value (&frame->rp);
-      --pc;
-      bsp = calc_caller_bsp 
-	((long)get_real_reg_value (&frame->pfs), frame->my_bsp);
-      info = build_ia64_frame_state (pc, frame, bsp, NULL);
-      if (frame->rp.loc_type == IA64_UNW_LOC_TYPE_NONE) /* We've finished. */
-	break;
-    }
-
-  return frame_count;
-}
-  
-int
-_Jv_ia64_backtrace (void **array, int size)
-{
-  ia64_frame_state my_frame;
-  ia64_frame_state originator;	/* For the context handler is in.  */
-  void *bsp;
- 
-  /* Do any necessary initialization to access arbitrary stack frames.
-     This forces gcc to save memory in our stack frame for saved
-     registers. */
-  __builtin_unwind_init ();
-
-label_ia64:
-  bsp = __builtin_ia64_bsp ();
-  
-  return ia64_backtrace_helper (array, &&label_ia64, &my_frame, 
-				&originator, bsp, size);
-}
Index: libjava/sysdep/dwarf2-backtrace.cc
===================================================================
--- libjava/sysdep/dwarf2-backtrace.cc	(revision 107479)
+++ libjava/sysdep/dwarf2-backtrace.cc	(working copy)
@@ -1,86 +0,0 @@
-/* dwarf2-backtrac.cc - backtrace implementation driven by the dwarf2
- exception unwinder.  */
-
-/* Copyright (C) 2003  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-/* Written by David Daney <ddaney@avtrex.com> */
-
-/*
-  Although this in theory could be 'C' instead of C++, saying that it
-  is C++ and including jvm.h makes it easier to insure that the proper
-  compiler options are used.  There must be unwind tables for
-  backtrace because it is on the stack when _Unwind_Backtrace is
-  called.  Compiling as C++ insures this.
-
-*/
-
-#include <config.h>
-
-#include <unwind.h>
-
-#include <jvm.h>
-
-
-extern "C"
-{
-  int backtrace (void **, int);
-}
-
-struct backtrace_state
-{
-  int skip_count;
-  int current_level;
-  int max_level;
-  void **locations;
-};
-
-static _Unwind_Reason_Code
-my_trace_fn (struct _Unwind_Context *uc, void *arg)
-{
-
-  struct backtrace_state *bs = (struct backtrace_state *) arg;
-
-  if (bs->skip_count)
-    {
-      bs->skip_count--;
-      return _URC_NO_REASON;
-    }
-
-  _Unwind_Ptr loc = _Unwind_GetIP (uc);
-
-  if (bs->current_level < bs->max_level)
-    bs->locations[bs->current_level++] = (void *) loc;
-
-  if (bs->current_level >= bs->max_level)
-    return _URC_END_OF_STACK;
-  else
-    return _URC_NO_REASON;
-}
-
-/*
- * backtrace is defined in (some versions of) libc.  This definition
- * must match so that it can replace the libc version at link time.
- *
- * Fill the locations array with at most len back trace locations.
- *
- * Returns the number of locations actually filled in.
- *
- */
-int
-backtrace (void **locations, int len)
-{
-  struct backtrace_state bs;
-  bs.skip_count = 1;		/* Don't log the call to backtrace itself. */
-  bs.current_level = 0;
-  bs.max_level = len;
-  bs.locations = locations;
-
-  _Unwind_Backtrace (my_trace_fn, &bs);
-  return bs.current_level;
-}
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am	(revision 107479)
+++ libjava/Makefile.am	(working copy)
@@ -190,10 +190,6 @@
 libgcj_la_SOURCES += nogc.cc
 endif
 
-if SUPPLY_BACKTRACE
-libgcj_la_SOURCES += sysdep/dwarf2-backtrace.cc
-endif
-
 if USING_POSIX_PLATFORM
 libgcj_la_SOURCES += posix.cc
 endif