m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-29 10:17:38 +01:00
Code Issues Releases Activity

Merge dwarf_find_save_locs into dwarf_step.

Browse source
This commit is contained in:
Doug Moore 2017-05-08 21:38:14 -05:00
parent 1602987b5f
commit 06d230d732
4 changed files with 4 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -157,13 +157,13 @@ libunwind_la_SOURCES_os_qnx = os-qnx.c
libunwind_dwarf_common_la_SOURCES = dwarf/global.c libunwind_dwarf_common_la_SOURCES = dwarf/global.c
libunwind_dwarf_local_la_SOURCES = \ libunwind_dwarf_local_la_SOURCES = \
dwarf/Lexpr.c dwarf/Lfde.c dwarf/Lparser.c dwarf/Lpe.c dwarf/Lstep.c \ dwarf/Lexpr.c dwarf/Lfde.c dwarf/Lparser.c dwarf/Lpe.c \
dwarf/Lfind_proc_info-lsb.c \ dwarf/Lfind_proc_info-lsb.c \
dwarf/Lfind_unwind_table.c dwarf/Lfind_unwind_table.c
libunwind_dwarf_local_la_LIBADD = libunwind-dwarf-common.la libunwind_dwarf_local_la_LIBADD = libunwind-dwarf-common.la
libunwind_dwarf_generic_la_SOURCES = \ libunwind_dwarf_generic_la_SOURCES = \
dwarf/Gexpr.c dwarf/Gfde.c dwarf/Gparser.c dwarf/Gpe.c dwarf/Gstep.c \ dwarf/Gexpr.c dwarf/Gfde.c dwarf/Gparser.c dwarf/Gpe.c \
dwarf/Gfind_proc_info-lsb.c \ dwarf/Gfind_proc_info-lsb.c \
dwarf/Gfind_unwind_table.c dwarf/Gfind_unwind_table.c
libunwind_dwarf_generic_la_LIBADD = libunwind-dwarf-common.la libunwind_dwarf_generic_la_LIBADD = libunwind-dwarf-common.la

4
src/dwarf/Gparser.c
View file

@ -927,7 +927,7 @@ find_reg_state (struct dwarf_cursor *c, dwarf_state_record_t *sr)
/* The function finds the saved locations and applies the register /* The function finds the saved locations and applies the register
state as well. */ state as well. */
HIDDEN int HIDDEN int
dwarf_find_save_locs (struct dwarf_cursor *c) dwarf_step (struct dwarf_cursor *c)
{ {
int ret; int ret;
dwarf_state_record_t sr; dwarf_state_record_t sr;
@ -936,7 +936,7 @@ dwarf_find_save_locs (struct dwarf_cursor *c)
if ((ret = apply_reg_state (c, &sr.rs_current)) < 0) if ((ret = apply_reg_state (c, &sr.rs_current)) < 0)
return ret; return ret;
return 0; return 1;
} }
HIDDEN int HIDDEN int

41
src/dwarf/Gstep.c
View file

@ -1,41 +0,0 @@
/* libunwind - a platform-independent unwind library
Copyright (c) 2003-2005 Hewlett-Packard Development Company, L.P.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
This file is part of libunwind.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include "dwarf.h"
#include "libunwind_i.h"
HIDDEN int
dwarf_step (struct dwarf_cursor *c)
{
int ret;
if ((ret = dwarf_find_save_locs (c)) >= 0) {
c->pi_valid = 0;
ret = 1;
}
Debug (15, "returning %d\n", ret);
return ret;
}

5
src/dwarf/Lstep.c
View file

@ -1,5 +0,0 @@
#define UNW_LOCAL_ONLY
#include <libunwind.h>
#if defined(UNW_LOCAL_ONLY) && !defined(UNW_REMOTE_ONLY)
#include "Gstep.c"
#endif