diff options
| -rw-r--r-- | bfd/elfxx-x86.c | 6 | ||||
| -rw-r--r-- | include/sframe-api.h | 4 | ||||
| -rw-r--r-- | libsframe/sframe.c | 6 | ||||
| -rw-r--r-- | libsframe/testsuite/libsframe.encode/encode-1.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index bbf8688..88c34d3 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -1857,8 +1857,7 @@ _bfd_x86_elf_create_sframe_plt (bfd *output_bfd, /* FRE type is dependent on the size of the function. */ fre_type = sframe_calc_fre_type (dpltsec->size); - func_info = sframe_fde_func_info (fre_type, - SFRAME_FDE_TYPE_PCINC); + func_info = sframe_fde_create_func_info (fre_type, SFRAME_FDE_TYPE_PCINC); /* Add SFrame FDE and the associated FREs for plt0 if plt0 has been generated. */ @@ -1888,7 +1887,8 @@ _bfd_x86_elf_create_sframe_plt (bfd *output_bfd, pattern of the instructions in these entries. Using this SFrame FDE type helps in keeping the unwind information for pltn entries compact. */ - func_info = sframe_fde_func_info (fre_type, SFRAME_FDE_TYPE_PCMASK); + func_info = sframe_fde_create_func_info (fre_type, + SFRAME_FDE_TYPE_PCMASK); /* Add the SFrame FDE for all PCs starting at the first pltn entry (hence, function start address = plt0_entry_size. As usual, this will be updated later at _bfd_elf_merge_section_sframe, by when the diff --git a/include/sframe-api.h b/include/sframe-api.h index c658474..0a86389 100644 --- a/include/sframe-api.h +++ b/include/sframe-api.h @@ -83,10 +83,10 @@ _SFRAME_ERRORS extern const char * sframe_errmsg (int error); -/* Get FDE function info given a FRE_TYPE. */ +/* Create an FDE function info bye given an FRE_TYPE and an FDE_TYPE. */ extern unsigned char -sframe_fde_func_info (unsigned int fre_type, unsigned int fde_type); +sframe_fde_create_func_info (unsigned int fre_type, unsigned int fde_type); /* Gather the FRE type given the function size. */ diff --git a/libsframe/sframe.c b/libsframe/sframe.c index 64fa907..d4eaaee 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -548,12 +548,12 @@ sframe_decoder_free (sframe_decoder_ctx **decoder) } } -/* Create a FDE function info byte given an FRE_TYPE and an FDE_TYPE. */ +/* Create an FDE function info byte given an FRE_TYPE and an FDE_TYPE. */ /* FIXME API for linker. Revisit if its better placed somewhere else? */ unsigned char -sframe_fde_func_info (unsigned int fre_type, - unsigned int fde_type) +sframe_fde_create_func_info (unsigned int fre_type, + unsigned int fde_type) { unsigned char func_info; sframe_assert (fre_type == SFRAME_FRE_TYPE_ADDR1 diff --git a/libsframe/testsuite/libsframe.encode/encode-1.c b/libsframe/testsuite/libsframe.encode/encode-1.c index 4075591..0148110 100644 --- a/libsframe/testsuite/libsframe.encode/encode-1.c +++ b/libsframe/testsuite/libsframe.encode/encode-1.c @@ -39,8 +39,8 @@ add_fde1 (sframe_encoder_ctx *encode, int idx) {0x1a, 0x5, {0x8, 0xf0, 0}} }; - unsigned char finfo = sframe_fde_func_info (SFRAME_FRE_TYPE_ADDR1, - SFRAME_FDE_TYPE_PCINC); + unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, + SFRAME_FDE_TYPE_PCINC); err = sframe_encoder_add_funcdesc (encode, 0xfffff03e, 0x1b, finfo, 4); if (err == -1) return err; @@ -64,8 +64,8 @@ add_fde2 (sframe_encoder_ctx *encode, int idx) {0xf, 0x5, {0x8, 0xf0, 0}} }; - unsigned char finfo = sframe_fde_func_info (SFRAME_FRE_TYPE_ADDR1, - SFRAME_FDE_TYPE_PCINC); + unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, + SFRAME_FDE_TYPE_PCINC); err = sframe_encoder_add_funcdesc (encode, 0xfffff059, 0x10, finfo, 4); if (err == -1) return err; |