Remove non-x86* EBL hooks.

diff --git a/libdwfl/dwfl_frame_state_pc.c b/libdwfl/dwfl_frame_state_pc.c
index 4d6fc8bd3b1830cc5290d76fdec5835f5291d6d7..6e9928b5c8277cbf6d03edefe01a033bda34c1a6 100644 (file)
--- a/libdwfl/dwfl_frame_state_pc.c
+++ b/libdwfl/dwfl_frame_state_pc.c
@@ -37,7 +37,6 @@ dwfl_frame_state_pc (Dwfl_Frame_State *state, Dwarf_Addr *pc, bool *minusone)
 {
   assert (state->pc_state == DWFL_FRAME_STATE_PC_SET);
   *pc = state->pc;
-  ebl_normalize_pc (state->thread->process->ebl, pc);
   if (minusone)
     {
       /* Bottom frame?  */

diff --git a/libdwfl/dwfl_frame_unwind.c b/libdwfl/dwfl_frame_unwind.c
index e35ccb5d6133851ba94e3ef757b46a1debf9fb32..5705f515a04a4d4c560d7b38999eb454bf0a9a38 100644 (file)
--- a/libdwfl/dwfl_frame_unwind.c
+++ b/libdwfl/dwfl_frame_unwind.c
@@ -410,7 +410,7 @@ handle_cfi (Dwfl_Frame_State **statep, Dwarf_Addr pc, Dwfl_Module *mod,
            {
              /* REGNO is undefined.  */
              unsigned ra = frame->fde->cie->return_address_register;
-             if (ebl_frame_dwarf_to_regno (ebl, &ra) && regno == ra)
+             if (regno == ra)
                unwound->pc_state = DWFL_FRAME_STATE_PC_UNDEFINED;
              continue;
            }
@@ -494,14 +494,6 @@ dwfl_frame_unwind (Dwfl_Frame_State **statep)
            }
        }
     }
-  *statep = state;
-  if (ebl_frame_unwind (state->thread->process->ebl, statep, pc))
-    return true;
-  if (state->unwound)
-    {
-      assert (state->unwound->pc_state == DWFL_FRAME_STATE_ERROR);
-      return false;
-    }
   __libdwfl_seterrno (DWFL_E_NO_DWARF);
   return false;
 }

diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h
index fb2f839b275ad0d3482f97af6d517074c9eb1cdf..3999d666766aae3c0ffbf2dfd4be5a2298f99fdc 100644 (file)
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
@@ -265,9 +265,6 @@ dwfl_frame_state_reg_get (Dwfl_Frame_State *state, unsigned regno,
                          Dwarf_Addr *val)
 {
   Ebl *ebl = state->thread->process->ebl;
-  if (ebl->frame_dwarf_to_regno != NULL
-      && ! ebl->frame_dwarf_to_regno (ebl, &regno))
-    return false;
   if (regno >= ebl->frame_state_nregs)
     return false;
   if ((state->regs_set[regno / sizeof (*state->regs_set) / 8]
@@ -286,9 +283,6 @@ dwfl_frame_state_reg_set (Dwfl_Frame_State *state, unsigned regno,
                          Dwarf_Addr val)
 {
   Ebl *ebl = state->thread->process->ebl;
-  if (ebl->frame_dwarf_to_regno != NULL
-      && ! ebl->frame_dwarf_to_regno (ebl, &regno))
-    return false;
   if (regno >= ebl->frame_state_nregs)
     return false;
   /* For example i386 user_regs_struct has signed fields.  */

diff --git a/libebl/Makefile.am b/libebl/Makefile.am
index 92497c3d8ae0652b984267260c5db52f45f37f93..1e396896c97cae3306499b414368fb3ed295843d 100644 (file)
--- a/libebl/Makefile.am
+++ b/libebl/Makefile.am
@@ -55,8 +55,7 @@ gen_SOURCES = eblopenbackend.c eblclosebackend.c eblstrtab.c \
              eblreginfo.c eblnonerelocp.c eblrelativerelocp.c \
              eblsysvhashentrysize.c eblauxvinfo.c eblcheckobjattr.c \
              ebl_check_special_section.c ebl_syscall_abi.c eblabicfi.c \
-             eblstother.c eblgetfuncpc.c eblframestate.c eblnormalizepc.c \
-             eblframeunwind.c eblframedwarftoregno.c
+             eblstother.c eblgetfuncpc.c eblframestate.c
 
 libebl_a_SOURCES = $(gen_SOURCES)
 

diff --git a/libebl/ebl-hooks.h b/libebl/ebl-hooks.h
index 72f1aadcd92ff9794a3a677bcdd771dfb484114d..5b77f921a0996947b08793c5a98ff6468ffde6b7 100644 (file)
--- a/libebl/ebl-hooks.h
+++ b/libebl/ebl-hooks.h
@@ -168,18 +168,5 @@ bool EBLHOOK(frame_state) (struct Dwfl_Frame_State *state);
    above.  */
 size_t EBLHOOKVAR(frame_state_nregs);
 
-/* Convert *REGNO as is in DWARF to a lower range suitable for
-   Dwarf_Frame_State->REGS indexing.  RETURN_ADDRESS_REGISTER should not change
-   on second call; other registers may map to numbers invalid on input.  */
-bool EBLHOOK(frame_dwarf_to_regno) (Ebl *ebl, unsigned *regno);
-
-/* Optionally modify *PC as fetched from inferior data into valid PC
-   instruction pointer.  */
-void EBLHOOK(normalize_pc) (Ebl *ebl, Dwarf_Addr *pc);
-
-/* See dwfl_frame_unwind.  */
-bool EBLHOOK(frame_unwind) (Ebl *ebl, struct Dwfl_Frame_State **statep,
-                           Dwarf_Addr pc);
-
 /* Destructor for ELF backend handle.  */
 void EBLHOOK(destr) (struct ebl *);

diff --git a/libebl/eblframedwarftoregno.c b/libebl/eblframedwarftoregno.c
deleted file mode 100644 (file)
index 4cfbd46..0000000
--- a/libebl/eblframedwarftoregno.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Convert *REGNO as is in DWARF to a lower range.
-   Copyright (C) 2012 Red Hat, Inc.
-   This file is part of elfutils.
-
-   This file is free software; you can redistribute it and/or modify
-   it under the terms of either
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at
-       your option) any later version
-
-   or
-
-     * 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
-
-   or both in parallel, as here.
-
-   elfutils 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 copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <libeblP.h>
-
-bool
-ebl_frame_dwarf_to_regno (Ebl *ebl, unsigned *regno)
-{
-  if (ebl == NULL)
-    return false;
-  return (ebl->frame_dwarf_to_regno == NULL
-         ? true : ebl->frame_dwarf_to_regno (ebl, regno));
-}

diff --git a/libebl/eblframeunwind.c b/libebl/eblframeunwind.c
deleted file mode 100644 (file)
index adc658b..0000000
--- a/libebl/eblframeunwind.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Get previous frame state for an existing frame state.
-   Copyright (C) 2012 Red Hat, Inc.
-   This file is part of elfutils.
-
-   This file is free software; you can redistribute it and/or modify
-   it under the terms of either
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at
-       your option) any later version
-
-   or
-
-     * 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
-
-   or both in parallel, as here.
-
-   elfutils 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 copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <libeblP.h>
-
-bool
-ebl_frame_unwind (Ebl *ebl, struct Dwfl_Frame_State **statep, Dwarf_Addr pc)
-{
-  if (ebl == NULL || ebl->frame_unwind == NULL)
-    return false;
-  return ebl->frame_unwind (ebl, statep, pc);
-}

diff --git a/libebl/eblnormalizepc.c b/libebl/eblnormalizepc.c
deleted file mode 100644 (file)
index abe6352..0000000
--- a/libebl/eblnormalizepc.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Modify PC as fetched from inferior data into valid PC.
-   Copyright (C) 2012 Red Hat, Inc.
-   This file is part of elfutils.
-
-   This file is free software; you can redistribute it and/or modify
-   it under the terms of either
-
-     * the GNU Lesser General Public License as published by the Free
-       Software Foundation; either version 3 of the License, or (at
-       your option) any later version
-
-   or
-
-     * 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
-
-   or both in parallel, as here.
-
-   elfutils 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 copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <libeblP.h>
-
-void
-ebl_normalize_pc (Ebl *ebl, Dwarf_Addr *pc)
-{
-  if (ebl != NULL && ebl->normalize_pc != NULL)
-    ebl->normalize_pc (ebl, pc);
-}

diff --git a/libebl/libebl.h b/libebl/libebl.h
index 967980e57564c05d89edeca940fd3219b66c7c0f..09b7bfb29d5ffdbc33316c9dfec59bfb41bcc476 100644 (file)
--- a/libebl/libebl.h
+++ b/libebl/libebl.h
@@ -393,20 +393,6 @@ extern bool ebl_frame_state (struct Dwfl_Frame_State *state)
 extern size_t ebl_frame_state_nregs (Ebl *ebl)
   __nonnull_attribute__ (1);
 
-/* Modify PC as fetched from inferior data into valid PC.  */
-extern void ebl_normalize_pc (Ebl *ebl, Dwarf_Addr *pc)
-  __nonnull_attribute__ (1, 2);
-
-/* Get previous frame state for an existing frame state.  */
-struct Dwfl_Frame_State_Process;
-extern bool
-  ebl_frame_unwind (Ebl *ebl, struct Dwfl_Frame_State **statep, Dwarf_Addr pc)
-  __nonnull_attribute__ (1, 2);
-
-/* Convert *REGNO as is in DWARF to a lower range.  */
-extern bool ebl_frame_dwarf_to_regno (Ebl *ebl, unsigned *regno)
-  __nonnull_attribute__ (1, 2);
-
 #ifdef __cplusplus
 }
 #endif