remove unused variables

Author: mjain-jump

src/ballet/sbpf/fd_sbpf_loader.c

@@ -840,8 +840,6 @@ fd_sbpf_lenient_elf_parse( fd_sbpf_elf_info_t * info,
   /* This documents the values that will be set in this function */
   info->rodata_sz        = (uint)bin_sz; // FIXME
   info->rodata_footprint = (uint)bin_sz;
-  info->dynstr_off       = 0U;
-  info->dynstr_sz        = 0U;
   info->phndx_dyn        = -1;
   info->shndx_dyn        = -1;
   info->shndx_symtab     = -1;
@@ -853,13 +851,6 @@ fd_sbpf_lenient_elf_parse( fd_sbpf_elf_info_t * info,
   if( FD_UNLIKELY( bin_sz<sizeof(fd_elf64_ehdr) ) ) {
     return FD_SBPF_ELF_PARSER_ERR_OUT_OF_BOUNDS;
   }
-  /* TODO: decide whether we want to enforce that bin is aligned,
-           in which case we can simply cast pointers to the various
-           table entries, or if we want to allow misaligned bin,
-           in which case we have to keep the FD_LOAD calls. */
-  if( FD_UNLIKELY( !fd_ulong_is_aligned( (ulong)bin, 8UL ) ) ) {
-    return FD_SBPF_ELF_PARSER_ERR_INVALID_ALIGNMENT;
-  }
 
   fd_elf64_ehdr ehdr = FD_LOAD( fd_elf64_ehdr, bin );
   ulong ehdr_start = 0;
@@ -1071,8 +1062,6 @@ fd_sbpf_lenient_elf_parse( fd_sbpf_elf_info_t * info,
           return FD_SBPF_ELF_PARSER_ERR_INVALID_SECTION_HEADER;
         }
         info->shndx_dynstr = (int)i;
-        info->dynstr_off   = (uint)shdr.sh_offset;
-        info->dynstr_sz    = (uint)shdr.sh_size;
       }
     }
   }
@@ -1102,7 +1091,7 @@ fd_sbpf_lenient_elf_parse( fd_sbpf_elf_info_t * info,
       if( FD_UNLIKELY( dynamic_table_end<dynamic_table_start ||
                        dynamic_table_end>bin_sz ||
                        dyn_ph.p_filesz%sizeof(fd_elf64_dyn)!=0UL ||
-                       ((ulong)bin+dynamic_table_start)%8UL!=0UL ) ) {
+                       !fd_ulong_is_aligned( dynamic_table_start, 8UL ) ) ) {
         /* skip - try SHT_DYNAMIC instead */
         dynamic_table_start = ULONG_MAX;
         dynamic_table_end = ULONG_MAX;
@@ -1432,8 +1421,6 @@ fd_sbpf_elf_peek( fd_sbpf_elf_info_t *            info,
     .text_off         = 0U,
     .text_cnt         = 0U,
     .text_sz          = 0UL,
-    .dynstr_off       = 0U,
-    .dynstr_sz        = 0U,
     .rodata_sz        = 0U,
     .rodata_footprint = 0U,
     .shndx_text       = -1,

src/ballet/sbpf/fd_sbpf_loader.h

@@ -149,9 +149,6 @@ struct fd_sbpf_elf_info {
   uint text_cnt;    /* Instruction count */
   ulong text_sz;    /* Length of text segment */
 
-  uint dynstr_off;  /* File offset of .dynstr section (0=missing) */
-  uint dynstr_sz;   /* Dynstr char count */
-
   uint rodata_sz;         /* size of rodata segment */
   uint rodata_footprint;  /* size of ELF binary */
 
@@ -174,9 +171,6 @@ struct fd_sbpf_elf_info {
   uint entry_pc;  /* Program counter of entry point
                      NOTE: MIGHT BE OUT OF BOUNDS! */
 
-  /* Bitmap of sections to be loaded (LSB => MSB) */
-  ulong loaded_sections[ 1024UL ];
-
   /* SBPF version, SIMD-0161 */
   ulong sbpf_version;
 };

src/flamenco/runtime/tests/fd_elf_harness.c

@@ -94,9 +94,8 @@ fd_solfuzz_elf_loader_run( fd_solfuzz_runner_t * runner,
     elf_effects->text_off = prog->text_off;
     elf_effects->entry_pc = prog->entry_pc;
 
-    pb_size_t calldests_sz = (pb_size_t) fd_sbpf_calldests_cnt( prog->calldests)+1UL;
-    elf_effects->calldests_count = calldests_sz;
-    elf_effects->calldests = FD_SCRATCH_ALLOC_APPEND(l, 8UL, calldests_sz * sizeof(uint64_t));
+    pb_size_t max_calldests_sz = (pb_size_t) fd_sbpf_calldests_cnt( prog->calldests)+1UL;
+    elf_effects->calldests = FD_SCRATCH_ALLOC_APPEND(l, 8UL, max_calldests_sz * sizeof(uint64_t));
     if( FD_UNLIKELY( _l > output_end ) ) {
       return 0UL;
     }
@@ -106,12 +105,10 @@ fd_solfuzz_elf_loader_run( fd_solfuzz_runner_t * runner,
       fd_sbpf_calldests_insert( prog->calldests, entrypoint );
     }
 
-    ulong i = 0;
     for( ulong target_pc=fd_sbpf_calldests_const_iter_init(prog->calldests);
                         !fd_sbpf_calldests_const_iter_done(target_pc);
                target_pc=fd_sbpf_calldests_const_iter_next(prog->calldests, target_pc) ) {
-      elf_effects->calldests[i] = target_pc;
-      ++i;
+      elf_effects->calldests[elf_effects->calldests_count++] = target_pc;
     }
   } while(0);