MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add epilog unwind for x86_64 pe/coff

Browse Source 
include/coff/
2013-12-06  Tristan Gingold  <gingold@adacore.com>

	* pe.h (UWOP_EPILOG, UWOP_PARE): Define.

bfd/
2013-12-06  Tristan Gingold  <gingold@adacore.com>

	* pei-x86_64.c (pex64_xdata_print_uwd_codes): Add argument rf.
	Display epilog opcode.
	(pex64_dump_xdata): Add argument rf; make addr a local variable.
	Adjust call to pex64_xdata_print_uwd_codes.
	(pex64_bfd_print_pdata): Display code range, adjust call to
	pex64_dump_xdata.
This commit is contained in:
Tristan Gingold 2013-12-04 14:53:12 +01:00
parent f84bc21877
commit 2b597f540f
4 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2013-12-06 Tristan Gingold <gingold@adacore.com>
* pei-x86_64.c (pex64_xdata_print_uwd_codes): Add argument rf.
Display epilog opcode.
(pex64_dump_xdata): Add argument rf; make addr a local variable.
Adjust call to pex64_xdata_print_uwd_codes.
(pex64_bfd_print_pdata): Display code range, adjust call to
2013-12-05 Tristan Gingold <gingold@adacore.com> 2013-12-05 Tristan Gingold <gingold@adacore.com>
* mach-o.c (bfd_mach_o_mkobject_init): Use bfd_zalloc. * mach-o.c (bfd_mach_o_mkobject_init): Use bfd_zalloc.

47
bfd/pei-x86_64.c
View File

@ -139,7 +139,8 @@ pex64_get_unwind_info (bfd *abfd, struct pex64_unwind_info *ui, void *data)
static void static void
pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd, pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd,
struct pex64_unwind_info *ui) struct pex64_unwind_info *ui,
struct pex64_runtime_function *rf)
{ {
unsigned int i; unsigned int i;
unsigned int tmp; /* At least 32 bits. */ unsigned int tmp; /* At least 32 bits. */
@ -156,17 +157,31 @@ pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd,
i = 0; i = 0;
if (ui->Version == 2 && PEX64_UNWCODE_CODE (ui->rawUnwindCodes[1]) == 6) if (ui->Version == 2
&& PEX64_UNWCODE_CODE (ui->rawUnwindCodes[1]) == UWOP_EPILOG)
{ {
/* Display opcodes 6 (whose meaning is not documented). */ /* Display epilog opcode (whose docoding is not fully documented).
fprintf (file, "\tv2 opcode6:"); Looks to be designed to speed-up unwinding, as there is no need
to decode instruction flow if outside an epilog. */
unsigned int func_size = rf->rva_EndAddress - rf->rva_BeginAddress;
fprintf (file, "\tv2 epilog (length: %02x) at pc+:",
ui->rawUnwindCodes[0]);
if (PEX64_UNWCODE_INFO (ui->rawUnwindCodes[1]))
fprintf (file, " 0x%x", func_size - ui->rawUnwindCodes[0]);
i++;
for (; i < ui->CountOfCodes; i++) for (; i < ui->CountOfCodes; i++)
{ {
const bfd_byte *dta = ui->rawUnwindCodes + 2 * i; const bfd_byte *dta = ui->rawUnwindCodes + 2 * i;
unsigned int off;
if (PEX64_UNWCODE_CODE (dta[1]) != 6) if (PEX64_UNWCODE_CODE (dta[1]) != UWOP_EPILOG)
break; break;
fprintf (file, " %02x %01x", dta[0], PEX64_UNWCODE_INFO (dta[1])); off = dta[0] | (PEX64_UNWCODE_INFO (dta[1]) << 8);
if (off == 0)
fprintf (file, " [pad]");
else
fprintf (file, " 0x%x", func_size - off);
} }
fputc ('\n', file); fputc ('\n', file);
} }
@ -229,7 +244,7 @@ pex64_xdata_print_uwd_codes (FILE *file, bfd *abfd,
} }
else if (ui->Version == 2) else if (ui->Version == 2)
{ {
fprintf (file, "v2-opc6 %02x %01x", dta[0], info); fprintf (file, "epilog %02x %01x", dta[0], info);
unexpected = TRUE; unexpected = TRUE;
} }
break; break;
@ -290,15 +305,18 @@ pex64_get_section_by_rva (bfd *abfd, bfd_vma addr, const char *sec_name)
return section; return section;
} }
/* Dump xdata at rva ADDR to FILE for ABFD. */ /* Dump xdata at for function RF to FILE. The argument XDATA_SECTION
designate the bfd section containing the xdata, XDATA is its content,
and ENDX the size if known (or NULL). */
static void static void
pex64_dump_xdata (FILE *file, bfd *abfd, pex64_dump_xdata (FILE *file, bfd *abfd,
asection *xdata_section, bfd_byte *xdata, asection *xdata_section, bfd_byte *xdata, bfd_vma *endx,
bfd_vma addr, bfd_vma *endx) struct pex64_runtime_function *rf)
{ {
bfd_vma vaddr; bfd_vma vaddr;
bfd_vma end_addr; bfd_vma end_addr;
bfd_vma addr = rf->rva_UnwindData;
struct pex64_unwind_info ui; struct pex64_unwind_info ui;
vaddr = xdata_section->vma - pe_data (abfd)->pe_opthdr.ImageBase; vaddr = xdata_section->vma - pe_data (abfd)->pe_opthdr.ImageBase;
@ -362,7 +380,7 @@ pex64_dump_xdata (FILE *file, bfd *abfd,
ui.FrameRegister == 0 ? "none" ui.FrameRegister == 0 ? "none"
: pex_regs[(unsigned int) ui.FrameRegister]); : pex_regs[(unsigned int) ui.FrameRegister]);
pex64_xdata_print_uwd_codes (file, abfd, &ui); pex64_xdata_print_uwd_codes (file, abfd, &ui, rf);
switch (ui.Flags) switch (ui.Flags)
{ {
@ -571,9 +589,11 @@ pex64_bfd_print_pdata (bfd *abfd, void *vfile)
else else
prev_unwinddata_rva = rf.rva_UnwindData; prev_unwinddata_rva = rf.rva_UnwindData;
fprintf (file, " (rva: %08x): for function at ", fprintf (file, " (rva: %08x): ",
(unsigned int) rf.rva_UnwindData); (unsigned int) rf.rva_UnwindData);
fprintf_vma (file, rf.rva_BeginAddress + imagebase); fprintf_vma (file, rf.rva_BeginAddress + imagebase);
fprintf (file, " - ");
fprintf_vma (file, rf.rva_EndAddress + imagebase);
fputc ('\n', file); fputc ('\n', file);
if (rf.rva_UnwindData != 0) if (rf.rva_UnwindData != 0)
@ -618,8 +638,7 @@ pex64_bfd_print_pdata (bfd *abfd, void *vfile)
if (p[0] == ~((bfd_vma) 0)) if (p[0] == ~((bfd_vma) 0))
p = NULL; p = NULL;
pex64_dump_xdata (file, abfd, xdata_section, xdata, pex64_dump_xdata (file, abfd, xdata_section, xdata, p, &rf);
rf.rva_UnwindData, p);
} }
} }
} }

4
include/coff/ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-06 Tristan Gingold <gingold@adacore.com>
* pe.h (UWOP_EPILOG, UWOP_PARE): Define.
2013-07-10 Tristan Gingold <gingold@adacore.com> 2013-07-10 Tristan Gingold <gingold@adacore.com>
* rs6000.h (external_core_dumpx): New structure. * rs6000.h (external_core_dumpx): New structure.

6
include/coff/pe.h
View File

@ -392,8 +392,10 @@ struct external_pex64_runtime_function
#define UWOP_SET_FPREG 3 #define UWOP_SET_FPREG 3
#define UWOP_SAVE_NONVOL 4 #define UWOP_SAVE_NONVOL 4
#define UWOP_SAVE_NONVOL_FAR 5 #define UWOP_SAVE_NONVOL_FAR 5
#define UWOP_SAVE_XMM 6 /* Deprecated, redefined in version 2. */ #define UWOP_SAVE_XMM 6 /* For version 1. */
#define UWOP_SAVE_XMM_FAR 7 /* Deprecated. */ #define UWOP_EPILOG 6 /* For version 2. */
#define UWOP_SAVE_XMM_FAR 7 /* For version 1 (deprecated). */
#define UWOP_SPARE 7 /* For version 2. */
#define UWOP_SAVE_XMM128 8 #define UWOP_SAVE_XMM128 8
#define UWOP_SAVE_XMM128_FAR 9 #define UWOP_SAVE_XMM128_FAR 9
#define UWOP_PUSH_MACHFRAME 10 #define UWOP_PUSH_MACHFRAME 10