diff options
Diffstat (limited to 'libsframe')
| -rw-r--r-- | libsframe/doc/sframe-spec.texi | 2 | ||||
| -rw-r--r-- | libsframe/sframe.c | 67 | ||||
| -rw-r--r-- | libsframe/testsuite/libsframe.find/findfre-1.c | 111 | ||||
| -rw-r--r-- | libsframe/testsuite/libsframe.find/findfunc-1.c | 141 | ||||
| -rw-r--r-- | libsframe/testsuite/libsframe.find/plt-findfre-1.c | 83 |
5 files changed, 252 insertions, 152 deletions
diff --git a/libsframe/doc/sframe-spec.texi b/libsframe/doc/sframe-spec.texi index ae11570..6b8dfa8 100644 --- a/libsframe/doc/sframe-spec.texi +++ b/libsframe/doc/sframe-spec.texi @@ -21,6 +21,8 @@ License''. @titlepage @title The SFrame Format @subtitle Version 2 +@sp 15 +@center @today{} @author Indu Bhagat @page diff --git a/libsframe/sframe.c b/libsframe/sframe.c index c2693b9..d38a61d 100644 --- a/libsframe/sframe.c +++ b/libsframe/sframe.c @@ -369,43 +369,34 @@ sframe_decoder_get_funcdesc_at_index (sframe_decoder_ctx *ctx, static bool sframe_fre_check_range_p (sframe_func_desc_entry *fdep, - int32_t start_ip_offset, int32_t end_ip_offset, + uint32_t start_ip_offset, uint32_t end_ip_offset, int32_t pc) { - int32_t start_ip, end_ip; int32_t func_start_addr; uint8_t rep_block_size; uint32_t fde_type; - int32_t masked_pc; + uint32_t pc_offset; bool mask_p; - bool ret; - - ret = false; if (!fdep) - return ret; + return false; func_start_addr = fdep->sfde_func_start_address; fde_type = sframe_get_fde_type (fdep); mask_p = (fde_type == SFRAME_FDE_TYPE_PCMASK); rep_block_size = fdep->sfde_func_rep_size; - if (!mask_p) - { - start_ip = start_ip_offset + func_start_addr; - end_ip = end_ip_offset + func_start_addr; - ret = ((start_ip <= pc) && (end_ip >= pc)); - } - else - { - /* For FDEs for repetitive pattern of insns, we need to return the FRE - where pc % rep_block_size is between start_ip_offset and - end_ip_offset. */ - masked_pc = pc % rep_block_size; - ret = ((start_ip_offset <= masked_pc) && (end_ip_offset >= masked_pc)); - } + if (func_start_addr > pc) + return false; + + /* Given func_start_addr <= pc, pc - func_start_addr must be positive. */ + pc_offset = pc - func_start_addr; + /* For SFrame FDEs encoding information for repetitive pattern of insns, + masking with the rep_block_size is necessary to find the matching FRE. */ + if (mask_p) + pc_offset = pc_offset % rep_block_size; - return ret; + return (start_ip_offset <= pc_offset) && (end_ip_offset >= pc_offset); } static int @@ -1036,7 +1027,7 @@ sframe_get_funcdesc_with_addr_internal (sframe_decoder_ctx *ctx, int32_t addr, { sframe_header *dhp; sframe_func_desc_entry *fdp; - int low, high, cnt; + int low, high; if (ctx == NULL) return sframe_ret_set_errno (errp, SFRAME_ERR_INVAL); @@ -1053,23 +1044,20 @@ sframe_get_funcdesc_with_addr_internal (sframe_decoder_ctx *ctx, int32_t addr, /* Do the binary search. */ fdp = (sframe_func_desc_entry *) ctx->sfd_funcdesc; low = 0; - high = dhp->sfh_num_fdes; - cnt = high; + high = dhp->sfh_num_fdes - 1; while (low <= high) { int mid = low + (high - low) / 2; - if (fdp[mid].sfde_func_start_address == addr) + /* Given sfde_func_start_address <= addr, + addr - sfde_func_start_address must be positive. */ + if (fdp[mid].sfde_func_start_address <= addr + && ((uint32_t)(addr - fdp[mid].sfde_func_start_address) + < fdp[mid].sfde_func_size)) return fdp + mid; if (fdp[mid].sfde_func_start_address < addr) - { - if (mid == (cnt - 1)) /* Check if it's the last one. */ - return fdp + (cnt - 1); - else if (fdp[mid+1].sfde_func_start_address > addr) - return fdp + mid; - low = mid + 1; - } + low = mid + 1; else high = mid - 1; } @@ -1112,14 +1100,12 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, { sframe_frame_row_entry cur_fre; sframe_func_desc_entry *fdep; - uint32_t fre_type, fde_type, i; - int32_t start_ip_offset; + uint32_t fre_type, i; int32_t func_start_addr; - int32_t end_ip_offset; + uint32_t start_ip_offset, end_ip_offset; const char *fres; size_t size = 0; int err = 0; - bool mask_p; if ((ctx == NULL) || (frep == NULL)) return sframe_set_errno (&err, SFRAME_ERR_INVAL); @@ -1130,8 +1116,6 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, return sframe_set_errno (&err, SFRAME_ERR_DCTX_INVAL); fre_type = sframe_get_fre_type (fdep); - fde_type = sframe_get_fde_type (fdep); - mask_p = (fde_type == SFRAME_FDE_TYPE_PCMASK); fres = ctx->sfd_fres + fdep->sfde_func_start_fre_off; func_start_addr = fdep->sfde_func_start_address; @@ -1145,8 +1129,9 @@ sframe_find_fre (sframe_decoder_ctx *ctx, int32_t pc, start_ip_offset = cur_fre.fre_start_addr; end_ip_offset = sframe_fre_get_end_ip_offset (fdep, i, fres + size); - /* First FRE's start_ip must be more than pc for regular SFrame FDEs. */ - if (i == 0 && !mask_p && (start_ip_offset + func_start_addr) > pc) + /* Stop search if FRE's start_ip is greater than pc. Given + func_start_addr <= pc, pc - func_start_addr must be positive. */ + if (start_ip_offset > (uint32_t)(pc - func_start_addr)) return sframe_set_errno (&err, SFRAME_ERR_FRE_INVAL); if (sframe_fre_check_range_p (fdep, start_ip_offset, end_ip_offset, pc)) diff --git a/libsframe/testsuite/libsframe.find/findfre-1.c b/libsframe/testsuite/libsframe.find/findfre-1.c index 5b1da05..94fe2e9 100644 --- a/libsframe/testsuite/libsframe.find/findfre-1.c +++ b/libsframe/testsuite/libsframe.find/findfre-1.c @@ -28,64 +28,82 @@ #include <dejagnu.h> static int -add_fde1 (sframe_encoder_ctx *encode, int idx) +add_fde1 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr, + uint32_t sframe_vaddr, int idx, uint32_t *func_size) { - int i, err; /* A contiguous block containing 4 FREs. */ - sframe_frame_row_entry fres[] +#define FDE1_NUM_FRES 4 + sframe_frame_row_entry fres[FDE1_NUM_FRES] = { {0x0, {0x1, 0, 0}, 0x3}, {0x1, {0x2, 0xf0, 0}, 0x5}, {0x10, {0x3, 0xf0, 0}, 0x4}, {0x38, {0x8, 0xf0, 0}, 0x5} }; + /* Function size in bytes. P.S. Must be a value greater than the + fre_start_addr of the last FRE above (0x38). */ + *func_size = 0x40; + int32_t func1_start_addr = start_pc_vaddr - sframe_vaddr; unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCINC); - err = sframe_encoder_add_funcdesc (encode, 0xfffff03e, 0x40, finfo, 4); + int err = sframe_encoder_add_funcdesc (encode, func1_start_addr, *func_size, + finfo, FDE1_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 4; i++) - if (sframe_encoder_add_fre (encode, idx,fres+i) == SFRAME_ERR) + for (unsigned int i = 0; i < FDE1_NUM_FRES; i++) + if (sframe_encoder_add_fre (encode, idx, fres + i) == SFRAME_ERR) return -1; return 0; } static int -add_fde2 (sframe_encoder_ctx *encode, int idx) +add_fde2 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr, + uint32_t sframe_vaddr, int idx, uint32_t *func_size) { - int i, err; /* A contiguous block containing 4 FREs. */ - sframe_frame_row_entry fres[] +#define FDE2_NUM_FRES 4 + sframe_frame_row_entry fres[FDE2_NUM_FRES] = { {0x0, {0x10, 0, 0}, 0x3}, {0x10, {0x12, 0xf0, 0}, 0x5}, {0x14, {0x14, 0xf0, 0}, 0x4}, {0x20, {0x15, 0xf0, 0}, 0x5} }; + /* Function size in bytes. P.S. Must be a value greater than the + fre_start_addr of the last FRE above (0x20). */ + *func_size = 0x60; + int32_t func2_start_addr = start_pc_vaddr - sframe_vaddr; unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCINC); - err = sframe_encoder_add_funcdesc (encode, 0xfffff08e, 0x60, finfo, 4); + int err = sframe_encoder_add_funcdesc (encode, func2_start_addr, *func_size, + finfo, FDE2_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 4; i++) - if (sframe_encoder_add_fre (encode, idx, fres+i) == SFRAME_ERR) + for (unsigned int i = 0; i < FDE2_NUM_FRES; i++) + if (sframe_encoder_add_fre (encode, idx, fres + i) == SFRAME_ERR) return -1; return 0; } -int main (void) +static +void test_text_findfre (uint32_t text_vaddr, uint32_t sframe_vaddr) { sframe_encoder_ctx *encode; sframe_decoder_ctx *dctx; sframe_frame_row_entry frep; + uint32_t func1_start_vaddr; + uint32_t func2_start_vaddr; + uint32_t func1_size = 0; + uint32_t func2_size = 0; + uint32_t fde_cnt = 0; + int32_t lookup_pc; char *sframe_buf; size_t sf_size; int err = 0; - unsigned int fde_cnt = 0; #define TEST(name, cond) \ do \ @@ -103,10 +121,13 @@ int main (void) -8, /* Fixed RA offset for AMD64. */ &err); - err = add_fde1 (encode, 0); + func1_start_vaddr = text_vaddr; + err = add_fde1 (encode, func1_start_vaddr, sframe_vaddr, 0, &func1_size); TEST ("findfre-1: Adding FDE1", err == 0); - err = add_fde2 (encode, 1); + /* Function 2 is placed after 0x10 bytes from the end of Function 1. */ + func2_start_vaddr = func1_start_vaddr + func1_size + 0x10; + err = add_fde2 (encode, func2_start_vaddr, sframe_vaddr, 1, &func2_size); TEST ("findfre-1: Adding FDE2", err == 0); fde_cnt = sframe_encoder_get_num_fidx (encode); @@ -116,40 +137,58 @@ int main (void) TEST ("findfre-1: Encoder write", err == 0); dctx = sframe_decode (sframe_buf, sf_size, &err); - TEST("findfre-1: Decoder setup", dctx != NULL); + TEST ("findfre-1: Decoder setup", dctx != NULL); /* Find the third FRE in first FDE. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x15), &frep); - TEST("findfre-1: Find third FRE", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x3))); + lookup_pc = func1_start_vaddr + 0x15 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find third FRE", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x3)); /* Find an FRE for PC at the end of range covered by FRE. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x9), &frep); - TEST("findfre-1: Find FRE for last PC covered by FRE", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x2))); + lookup_pc = func1_start_vaddr + 0x9 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find FRE for last PC covered by FRE", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2)); /* Find the last FRE in first FDE. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x39), &frep); - TEST("findfre-1: Find last FRE", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x8))); + lookup_pc = func1_start_vaddr + 0x39 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find last FRE", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x8)); /* Find the second FRE in second FDE. */ - err = sframe_find_fre (dctx, (0xfffff08e + 0x11), &frep); - TEST("findfre-1: Find second FRE", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x12))); + lookup_pc = func2_start_vaddr + 0x11 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find second FRE", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x12)); /* Find the first FRE in second FDE. */ - err = sframe_find_fre (dctx, (0xfffff08e + 0x0), &frep); - TEST("findfre-1: Find first FRE", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x10))); + lookup_pc = func2_start_vaddr + 0x0 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find first FRE", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x10)); /* Find FRE for PC out of range. Expect error code. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x40), &frep); - TEST("findfre-1: Find FRE for out of range PC", - (err == SFRAME_ERR)); + lookup_pc = func1_start_vaddr + func1_size - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfre-1: Find FRE for out of range PC", err == SFRAME_ERR); sframe_encoder_free (&encode); sframe_decoder_free (&dctx); +} - return 0; +int main (void) +{ + uint32_t sframe_vaddr = 0x402220; + uint32_t text_vaddr = 0x401020; + printf ("Testing with text_vaddr = %#x; sframe_vaddr = %#x\n", text_vaddr, + sframe_vaddr); + test_text_findfre (text_vaddr, sframe_vaddr); + + sframe_vaddr = 0x401020; + text_vaddr = 0x402220; + printf ("Testing with text_vaddr = %#x; sframe_vaddr = %#x\n", text_vaddr, + sframe_vaddr); + test_text_findfre (text_vaddr, sframe_vaddr); } diff --git a/libsframe/testsuite/libsframe.find/findfunc-1.c b/libsframe/testsuite/libsframe.find/findfunc-1.c index 8671f5d..3cdcdb6 100644 --- a/libsframe/testsuite/libsframe.find/findfunc-1.c +++ b/libsframe/testsuite/libsframe.find/findfunc-1.c @@ -35,89 +35,115 @@ #include <dejagnu.h> static int -add_fde1 (sframe_encoder_ctx *encode, int idx) +add_fde1 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr, + uint32_t sframe_vaddr, int idx, uint32_t *func_size) { - int i, err; /* A contiguous block containing 4 FREs. */ - sframe_frame_row_entry fres[] +#define FDE1_NUM_FRES 4 + sframe_frame_row_entry fres[FDE1_NUM_FRES] = { {0x0, {0x1, 0, 0}, 0x3}, {0x1, {0x2, 0xf0, 0}, 0x5}, {0x10, {0x3, 0xf0, 0}, 0x4}, {0x38, {0x8, 0xf0, 0}, 0x5} }; + /* Function size in bytes. P.S. Must be a value greater than the + fre_start_addr of the last FRE above (0x38). */ + *func_size = 0x40; + int32_t func1_start_addr = start_pc_vaddr - sframe_vaddr; unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCINC); - err = sframe_encoder_add_funcdesc (encode, 0xfffff03e, 0x40, finfo, 4); + int err = sframe_encoder_add_funcdesc (encode, func1_start_addr, *func_size, + finfo, FDE1_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 4; i++) - if (sframe_encoder_add_fre (encode, idx,fres+i) == SFRAME_ERR) + for (unsigned int i = 0; i < FDE1_NUM_FRES; i++) + if (sframe_encoder_add_fre (encode, idx, fres + i) == SFRAME_ERR) return -1; return 0; } static int -add_fde2 (sframe_encoder_ctx *encode, int idx) +add_fde2 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr, + uint32_t sframe_vaddr, int idx, uint32_t *func_size) { - int i, err; /* A contiguous block containing 4 FREs. */ - sframe_frame_row_entry fres[] +#define FDE2_NUM_FRES 4 + sframe_frame_row_entry fres[FDE2_NUM_FRES] = { {0x0, {0x10, 0, 0}, 0x3}, {0x10, {0x12, 0xf0, 0}, 0x5}, {0x14, {0x14, 0xf0, 0}, 0x4}, {0x20, {0x15, 0xf0, 0}, 0x5} }; + /* Function size in bytes. P.S. Must be a value greater than the + fre_start_addr of the last FRE above (0x20). */ + *func_size = 0x60; + int32_t func2_start_addr = start_pc_vaddr - sframe_vaddr; unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCINC); - err = sframe_encoder_add_funcdesc (encode, 0xfffff08e, 0x60, finfo, 4); + int err = sframe_encoder_add_funcdesc (encode, func2_start_addr, *func_size, + finfo, FDE2_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 4; i++) - if (sframe_encoder_add_fre (encode, idx, fres+i) == SFRAME_ERR) + for (unsigned int i = 0; i < FDE2_NUM_FRES; i++) + if (sframe_encoder_add_fre (encode, idx, fres + i) == SFRAME_ERR) return -1; return 0; } static int -add_fde3 (sframe_encoder_ctx *encode, int idx) +add_fde3 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr, + uint32_t sframe_vaddr, int idx, uint32_t *func_size) { - int i, err; /* A contiguous block containing 4 FREs. */ - sframe_frame_row_entry fres[] +#define FDE3_NUM_FRES 4 + sframe_frame_row_entry fres[FDE3_NUM_FRES] = { {0x0, {0x16, 0, 0}, 0x3}, {0x1, {0x17, 0xf0, 0}, 0x5}, {0x10, {0x18, 0xf0, 0}, 0x4}, {0x38, {0x19, 0xf0, 0}, 0x5} }; + /* Function size in bytes. P.S. Must be a value greater than the + fre_start_addr of the last FRE above (0x38). */ + *func_size = 0x40; + int32_t func3_start_addr = start_pc_vaddr - sframe_vaddr; unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCINC); - err = sframe_encoder_add_funcdesc (encode, 0xfffff10e, 0x40, finfo, 4); + int err = sframe_encoder_add_funcdesc (encode, func3_start_addr, *func_size, + finfo, FDE3_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 4; i++) - if (sframe_encoder_add_fre (encode, idx,fres+i) == SFRAME_ERR) + for (unsigned int i = 0; i < FDE3_NUM_FRES; i++) + if (sframe_encoder_add_fre (encode, idx, fres + i) == SFRAME_ERR) return -1; return 0; } -int main (void) +static +void test_text_findfre (uint32_t text_vaddr, uint32_t sframe_vaddr) { sframe_encoder_ctx *encode; sframe_decoder_ctx *dctx; sframe_frame_row_entry frep; + uint32_t func1_start_vaddr; + uint32_t func2_start_vaddr; + uint32_t func3_start_vaddr; + uint32_t func1_size = 0; + uint32_t func2_size = 0; + uint32_t func3_size = 0; + uint32_t fde_cnt = 0; + int32_t lookup_pc = 0; char *sframe_buf; size_t sf_size; int err = 0; - unsigned int fde_cnt = 0; #define TEST(name, cond) \ do \ @@ -136,15 +162,18 @@ int main (void) &err); /* Add FDE at index 0. */ - err = add_fde1 (encode, 0); + func1_start_vaddr = text_vaddr; + err = add_fde1 (encode, func1_start_vaddr, sframe_vaddr, 0, &func1_size); TEST ("findfunc-1: Adding FDE1", err == 0); /* Add FDE at index 1. */ - err = add_fde2 (encode, 1); + func2_start_vaddr = func1_start_vaddr + func1_size + 0x10; + err = add_fde2 (encode, func2_start_vaddr, sframe_vaddr, 1, &func2_size); TEST ("findfunc-1: Adding FDE2", err == 0); /* Add FDE at index 2. */ - err = add_fde3 (encode, 2); + func3_start_vaddr = func2_start_vaddr + func2_size + 0x10; + err = add_fde3 (encode, func3_start_vaddr, sframe_vaddr, 2, &func3_size); TEST ("findfunc-1: Adding FDE3", err == 0); fde_cnt = sframe_encoder_get_num_fidx (encode); @@ -154,51 +183,71 @@ int main (void) TEST ("findfunc-1: Encoder write", err == 0); dctx = sframe_decode (sframe_buf, sf_size, &err); - TEST("findfunc-1: Decoder setup", dctx != NULL); + TEST ("findfunc-1: Decoder setup", dctx != NULL); /* Following negative tests check that libsframe APIs (sframe_get_funcdesc_with_addr, sframe_find_fre) work well for PCs not covered by the FDEs. */ /* Search with PC less than the first FDE's start addr. */ - err = sframe_find_fre (dctx, (0xfffff03e - 0x15), &frep); - TEST("findfunc-1: test-1: Find FRE for PC not in range", - (err == SFRAME_ERR)); + lookup_pc = func1_start_vaddr - 0x15 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: test-1: Find FRE for PC not in range", + err == SFRAME_ERR); /* Search with a PC between func1's last PC and func2's first PC. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x40 + 0x1), &frep); - TEST("findfunc-1: test-2: Find FRE for PC not in range", - (err == SFRAME_ERR)); + lookup_pc = func1_start_vaddr + func1_size + 0x1 - sframe_vaddr, + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: test-2: Find FRE for PC not in range", + err == SFRAME_ERR); /* Search for a PC between func2's last PC and func3's first PC. */ - err = sframe_find_fre (dctx, (0xfffff08e + 0x60 + 0x3), &frep); - TEST("findfunc-1: test-3: Find FRE for PC not in range", - (err == SFRAME_ERR)); + lookup_pc = func2_start_vaddr + func2_size + 0x3 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: test-3: Find FRE for PC not in range", + err == SFRAME_ERR); /* Search for a PC beyond the last func, i.e., > func3's last PC. */ - err = sframe_find_fre (dctx, (0xfffff10e + 0x40 + 0x10), &frep); - TEST("findfunc-1: test-4: Find FRE for PC not in range", - (err == SFRAME_ERR)); + lookup_pc = func3_start_vaddr + func3_size + 0x10 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: test-4: Find FRE for PC not in range", + err == SFRAME_ERR); /* And some positive tests... */ /* Find an FRE for PC in FDE1. */ - err = sframe_find_fre (dctx, (0xfffff03e + 0x9), &frep); - TEST("findfunc-1: Find FRE in FDE1", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x2))); + lookup_pc = func1_start_vaddr + 0x9 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: Find FRE in FDE1", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2)); /* Find an FRE for PC in FDE2. */ - err = sframe_find_fre (dctx, (0xfffff08e + 0x11), &frep); - TEST("findfunc-1: Find FRE in FDE2", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x12))); + lookup_pc = func2_start_vaddr + 0x11 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: Find FRE in FDE2", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x12)); /* Find an FRE for PC in FDE3. */ - err = sframe_find_fre (dctx, (0xfffff10e + 0x10), &frep); - TEST("findfunc-1: Find FRE in FDE3", - ((err == 0) && (sframe_fre_get_cfa_offset(dctx, &frep, &err) == 0x18))); + lookup_pc = func3_start_vaddr + 0x10 - sframe_vaddr; + err = sframe_find_fre (dctx, lookup_pc, &frep); + TEST ("findfunc-1: Find FRE in FDE3", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x18)); sframe_encoder_free (&encode); sframe_decoder_free (&dctx); +} - return 0; +int main (void) +{ + uint32_t sframe_vaddr = 0x4b5620; + uint32_t text_vaddr = 0x4038b0; + printf ("Testing with text_vaddr = %#x; sframe_vaddr = %#x\n", text_vaddr, + sframe_vaddr); + test_text_findfre (text_vaddr, sframe_vaddr); + + sframe_vaddr = 0x4038b0; + text_vaddr = 0x4b5620; + printf ("Testing with text_vaddr = %#x; sframe_vaddr = %#x\n", text_vaddr, + sframe_vaddr); + test_text_findfre (text_vaddr, sframe_vaddr); } diff --git a/libsframe/testsuite/libsframe.find/plt-findfre-1.c b/libsframe/testsuite/libsframe.find/plt-findfre-1.c index c84b46f..89ca466 100644 --- a/libsframe/testsuite/libsframe.find/plt-findfre-1.c +++ b/libsframe/testsuite/libsframe.find/plt-findfre-1.c @@ -28,12 +28,13 @@ #include <dejagnu.h> static int -add_plt_fde1 (sframe_encoder_ctx *ectx, int idx) +add_plt_fde1 (sframe_encoder_ctx *ectx, uint32_t plt_vaddr, + uint32_t sframe_vaddr, int idx) { - int i, err; /* A contiguous block containing 3 FREs. The start_ip_offset must remain less than 16 bytes. */ - sframe_frame_row_entry fres[] +#define PLT1_NUM_FRES 3 + sframe_frame_row_entry fres[PLT1_NUM_FRES] = { {0x0, {0x1, 0, 0}, 0x3}, {0x6, {0x2, 0xf0, 0}, 0x5}, {0xc, {0x3, 0xf0, 0}, 0x4} @@ -41,19 +42,26 @@ add_plt_fde1 (sframe_encoder_ctx *ectx, int idx) unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1, SFRAME_FDE_TYPE_PCMASK); + int32_t func_start_addr = plt_vaddr - sframe_vaddr; + /* 5 pltN entries of 16 bytes each. */ - err = sframe_encoder_add_funcdesc_v2 (ectx, 0x1000, 16*5, finfo, 16, 3); + int err = sframe_encoder_add_funcdesc_v2 (ectx, func_start_addr, + 16 * 5 /* func size in bytes. */, + finfo, + 16 /* rep block size in bytes. */, + PLT1_NUM_FRES); if (err == -1) return err; - for (i = 0; i < 3; i++) - if (sframe_encoder_add_fre (ectx, idx, fres+i) == SFRAME_ERR) + for (unsigned i = 0; i < PLT1_NUM_FRES; i++) + if (sframe_encoder_add_fre (ectx, idx, fres + i) == SFRAME_ERR) return -1; return 0; } -int main (void) +static +void test_plt_findfre (uint32_t plt_vaddr, uint32_t sframe_vaddr) { sframe_encoder_ctx *ectx; sframe_decoder_ctx *dctx; @@ -61,7 +69,7 @@ int main (void) char *sframe_buf; size_t sf_size; int err = 0; - unsigned int fde_cnt = 0; + uint32_t fde_cnt = 0; #define TEST(name, cond) \ do \ @@ -78,7 +86,7 @@ int main (void) -8, /* Fixed RA offset for AMD64. */ &err); - err = add_plt_fde1 (ectx, 0); + err = add_plt_fde1 (ectx, plt_vaddr, sframe_vaddr, 0); TEST ("plt-findfre-1: Adding FDE1 for plt", err == 0); fde_cnt = sframe_encoder_get_num_fidx (ectx); @@ -88,40 +96,57 @@ int main (void) TEST ("plt-findfre-1: Encoder write", err == 0); dctx = sframe_decode (sframe_buf, sf_size, &err); - TEST("plt-findfre-1: Decoder setup", dctx != NULL); + TEST ("plt-findfre-1: Decoder setup", dctx != NULL); /* Find the first FRE in PLT1. */ - err = sframe_find_fre (dctx, (0x1000 + 0x0), &frep); - TEST("plt-findfre-1: Find first FRE in PLT1", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x1))); + err = sframe_find_fre (dctx, (plt_vaddr + 0x0 - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find first FRE in PLT1", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x1)); /* Find the second FRE. */ - err = sframe_find_fre (dctx, (0x1000 + 0x6), &frep); - TEST("plt-findfre-1: Find second FRE in PLT1", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2))); + err = sframe_find_fre (dctx, (plt_vaddr + 0x6 - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find second FRE in PLT1", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2)); /* Find the last FRE. */ - err = sframe_find_fre (dctx, (0x1000 + 0xc), &frep); - TEST("plt-findfre-1: Find last FRE in PLT1", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x3))); + err = sframe_find_fre (dctx, (plt_vaddr + 0xc - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find last FRE in PLT1", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x3)); /* Find the first FRE in PLT4. */ - err = sframe_find_fre (dctx, (0x1000 + 16*3 + 0x0), &frep); - TEST("plt-findfre-1: Find first FRE in PLT4", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x1))); + err = sframe_find_fre (dctx, (plt_vaddr + 16*3 + 0x0 - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find first FRE in PLT4", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x1)); /* Find the second FRE in PLT4. */ - err = sframe_find_fre (dctx, (0x1000 + 16*3 + 0x6), &frep); - TEST("plt-findfre-1: Find second FRE in PLT4", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2))); + err = sframe_find_fre (dctx, (plt_vaddr + 16*3 + 0x6 - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find second FRE in PLT4", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x2)); /* Find the last FRE in PLT4. */ - err = sframe_find_fre (dctx, (0x1000 + 16*3 + 0xc), &frep); - TEST("plt-findfre-1: Find last FRE in PLT4", - ((err == 0) && (sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x3))); + err = sframe_find_fre (dctx, (plt_vaddr + 16*3 + 0xc - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find last FRE in PLT4", + (err == 0 && sframe_fre_get_cfa_offset (dctx, &frep, &err) == 0x3)); + + /* Find no FRE for out of range PLT6. */ + err = sframe_find_fre (dctx, (plt_vaddr + 16*5 + 0x0 - sframe_vaddr), &frep); + TEST ("plt-findfre-1: Find no FRE for out of range PLT6", err != 0); sframe_encoder_free (&ectx); sframe_decoder_free (&dctx); +} - return 0; +int main (void) +{ + uint32_t sframe_vaddr = 0x402220; + uint32_t plt_vaddr = 0x401020; + printf ("Testing with plt_vaddr = %#x; sframe_vaddr = %#x\n", plt_vaddr, + sframe_vaddr); + test_plt_findfre (plt_vaddr, sframe_vaddr); + + sframe_vaddr = 0x401020; + plt_vaddr = 0x402220; + printf ("Testing with plt_vaddr = %#x; sframe_vaddr = %#x\n", plt_vaddr, + sframe_vaddr); + test_plt_findfre (plt_vaddr, sframe_vaddr); } |