[binutils-gdb] libsframe: testsuite: improve findfre-1 testcase
Indu Bhagat
ibhagat@sourceware.org
Mon May 26 18:08:59 GMT 2025
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0d15aea98bd6d9c92713463e64564a2c04e7122b
commit 0d15aea98bd6d9c92713463e64564a2c04e7122b
Author: Indu Bhagat <indu.bhagat@oracle.com>
Date: Mon May 26 10:54:35 2025 -0700
libsframe: testsuite: improve findfre-1 testcase
The testcase had usages of some magic numbers, making it difficult to
keep up when format changes come along.
libsframe/testsuite/
* libsframe.find/findfre-1.c: Restructure a bit. Run test for two
ways of placement of .sframe and .text.
Diff:
---
libsframe/testsuite/libsframe.find/findfre-1.c | 111 +++++++++++++++++--------
1 file changed, 75 insertions(+), 36 deletions(-)
diff --git a/libsframe/testsuite/libsframe.find/findfre-1.c b/libsframe/testsuite/libsframe.find/findfre-1.c
index 5b1da05bf6d..94fe2e9493f 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);
}
More information about the Binutils-cvs
mailing list