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.

diff --git a/libsframe/testsuite/libsframe.decode/be-flipping.c b/libsframe/testsuite/libsframe.decode/be-flipping.c
index 5002524e75d525561c60ec4977d48d45c976179f..41fa486b62c2f7453ca6ffea550e66923ec1ed56 100644 (file)
--- a/libsframe/testsuite/libsframe.decode/be-flipping.c
+++ b/libsframe/testsuite/libsframe.decode/be-flipping.c
@@ -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);
 

diff --git a/libsframe/testsuite/libsframe.decode/frecnt-1.c b/libsframe/testsuite/libsframe.decode/frecnt-1.c
index 77b0440870242298b838408c7d7b30d5d09266d0..8d6c27eebcbe7a5304e62b02288ced725eb916c6 100644 (file)
--- a/libsframe/testsuite/libsframe.decode/frecnt-1.c
+++ b/libsframe/testsuite/libsframe.decode/frecnt-1.c
@@ -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);
 

diff --git a/libsframe/testsuite/libsframe.decode/frecnt-2.c b/libsframe/testsuite/libsframe.decode/frecnt-2.c
index 912fdbd0f999d4c230cc50cc97b80a5d392bb5b9..74e48bf44e027e33b9d82ac704b4ff677fb80032 100644 (file)
--- a/libsframe/testsuite/libsframe.decode/frecnt-2.c
+++ b/libsframe/testsuite/libsframe.decode/frecnt-2.c
@@ -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);
     }

diff --git a/libsframe/testsuite/libsframe.encode/encode-1.c b/libsframe/testsuite/libsframe.encode/encode-1.c
index 3673672e578be182e9ea8953d6430891a882d00b..62640c3b70f7c5faf4fbde3bb9dc355f4c272921 100644 (file)
--- a/libsframe/testsuite/libsframe.encode/encode-1.c
+++ b/libsframe/testsuite/libsframe.encode/encode-1.c
@@ -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;
 

diff --git a/libsframe/testsuite/libsframe.find/findfre-1.c b/libsframe/testsuite/libsframe.find/findfre-1.c
index 7c7c94799bf59577ab9028811231e714a31d4318..384ad4847a3f5e84b5ce3d7ae76397318ba47916 100644 (file)
--- a/libsframe/testsuite/libsframe.find/findfre-1.c
+++ b/libsframe/testsuite/libsframe.find/findfre-1.c
@@ -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;
 

diff --git a/libsframe/testsuite/libsframe.find/findfunc-1.c b/libsframe/testsuite/libsframe.find/findfunc-1.c
index 00b9e8db91947ca102242721578dcc4e22a32d78..5c4d86710eecbaf1f290e8a02150ffce7df5157f 100644 (file)
--- a/libsframe/testsuite/libsframe.find/findfunc-1.c
+++ b/libsframe/testsuite/libsframe.find/findfunc-1.c
@@ -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;