libsframe: testsuite: use SFrame V2 specific APIs

Use sframe_encoder_add_funcdesc_v2 instead of sframe_encoder_add_funcdesc.
Similarly, use sframe_decoder_get_funcdesc_v2 instead of
sframe_decoder_get_funcdesc.

sframe_encoder_add_funcdesc, and sframe_decoder_get_funcdesc were first
added for SFrame V1.  For the purpose of these testcases, the two V2
APIs are (almost) functionally equivalent.  In future, we may want to
make sframe_encoder_add_funcdesc and sframe_decoder_get_funcdesc
internal to libsframe only.  Using the V2 named APIs is better for
clarity as well.

libsframe/testsuite/
	* libsframe.encode/encode-1.c: Use V2 named APIs instead.
	* libsframe.find/findfre-1.c: Likewise.
	* libsframe.find/findfunc-1.c: Likewise.
	* libsframe.decode/be-flipping.c: Likewise.
	* libsframe.decode/frecnt-1.c: Likewise.
	* libsframe.decode/frecnt-2.c: Likewise.
This commit is contained in:
Indu Bhagat
2025-08-17 15:29:44 -07:00
parent fb2d8601c6
commit 0004c4efea
6 changed files with 30 additions and 18 deletions

View File

@@ -55,6 +55,7 @@ main (void)
struct stat st;
char *sf_buf;
size_t sf_size;
uint8_t rep_block_size;
#define TEST(name, cond) \
do \
@@ -101,7 +102,8 @@ main (void)
unsigned int fde_cnt = sframe_decoder_get_num_fidx (dctx);
TEST ("be-flipping: Decoder FDE count", fde_cnt == 1);
err = sframe_decoder_get_funcdesc (dctx, 0, &nfres, &fsize, &fstart, &finfo);
err = sframe_decoder_get_funcdesc_v2 (dctx, 0, &nfres, &fsize, &fstart,
&finfo, &rep_block_size);
TEST ("be-flipping: Decoder get FDE", err == 0);
TEST ("be-flipping: Decoder FRE count", nfres == 5);

View File

@@ -46,6 +46,7 @@ main (void)
struct stat st;
char *sf_buf;
size_t sf_size;
uint8_t rep_block_size;
#define TEST(name, cond) \
do \
@@ -85,7 +86,8 @@ main (void)
unsigned int fde_cnt = sframe_decoder_get_num_fidx (dctx);
TEST ("frecnt-1: Decoder FDE count", fde_cnt == 1);
err = sframe_decoder_get_funcdesc (dctx, 0, &nfres, &fsize, &fstart, &finfo);
err = sframe_decoder_get_funcdesc_v2 (dctx, 0, &nfres, &fsize, &fstart,
&finfo, &rep_block_size);
TEST ("frecnt-1: Decoder get FDE", err == 0);
TEST ("frecnt-1: Decoder FRE count", nfres == 4);

View File

@@ -48,6 +48,7 @@ main (void)
struct stat st;
char *sf_buf;
size_t sf_size;
uint8_t rep_block_size;
#define TEST(name, cond) \
do \
@@ -88,8 +89,8 @@ main (void)
for (i = 0; i < fde_cnt; ++i)
{
err = sframe_decoder_get_funcdesc (dctx, i, &nfres, &fsize, &fstart,
&finfo);
err = sframe_decoder_get_funcdesc_v2 (dctx, i, &nfres, &fsize, &fstart,
&finfo, &rep_block_size);
TEST ("frecnt-2: Decode get FDE", err == 0);
TEST ("frecnt-2: Decode get FRE", nfres == 4);
}

View File

@@ -49,8 +49,9 @@ add_fde1 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func1_start_addr,
*func_size, finfo, FDE1_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func1_start_addr,
*func_size, finfo, 0,
FDE1_NUM_FRES);
if (err == -1)
return err;
@@ -84,8 +85,9 @@ add_fde2 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func1_start_addr,
*func_size, finfo, FDE1_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func1_start_addr,
*func_size, finfo, 0,
FDE1_NUM_FRES);
if (err == -1)
return err;

View File

@@ -49,8 +49,9 @@ add_fde1 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func1_start_addr, *func_size,
finfo, FDE1_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func1_start_addr,
*func_size, finfo, 0,
FDE1_NUM_FRES);
if (err == -1)
return err;
@@ -83,8 +84,9 @@ add_fde2 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func2_start_addr, *func_size,
finfo, FDE2_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func2_start_addr,
*func_size, finfo, 0,
FDE2_NUM_FRES);
if (err == -1)
return err;

View File

@@ -56,8 +56,9 @@ add_fde1 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func1_start_addr, *func_size,
finfo, FDE1_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func1_start_addr,
*func_size, finfo, 0,
FDE1_NUM_FRES);
if (err == -1)
return err;
@@ -90,8 +91,9 @@ add_fde2 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func2_start_addr, *func_size,
finfo, FDE2_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func2_start_addr,
*func_size, finfo, 0,
FDE2_NUM_FRES);
if (err == -1)
return err;
@@ -124,8 +126,9 @@ add_fde3 (sframe_encoder_ctx *encode, uint32_t start_pc_vaddr,
- (sframe_vaddr + offsetof_fde_in_sec));
unsigned char finfo = sframe_fde_create_func_info (SFRAME_FRE_TYPE_ADDR1,
SFRAME_FDE_TYPE_PCINC);
int err = sframe_encoder_add_funcdesc (encode, func3_start_addr, *func_size,
finfo, FDE3_NUM_FRES);
int err = sframe_encoder_add_funcdesc_v2 (encode, func3_start_addr,
*func_size, finfo, 0,
FDE3_NUM_FRES);
if (err == -1)
return err;