`4919d68`

Cache reloc symbol lookups

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 weeks ago

SHA: 4919d68901327a871a34a6e5423fb589476d1afe
Parents: 9dbf0eb
Tree: 35f8e1c

1 changed file

Status	File	+	-
M	`src/reloc/arm64.rs`	38	26

src/reloc/arm64.rsmodified

  struct ResolveView<'a> {
      sym_table: &'a SymbolTable,
 +    symbol_name_index: &'a HashMap<String, SymbolId>,
      atom_table: &'a AtomTable,
      atom_addrs: &'a HashMap<crate::resolve::AtomId, u64>,
      atoms_by_input_section: &'a HashMap<(InputId, u8), Vec<crate::resolve::AtomId>>,
      let atoms_by_input_section = atoms.by_input_section();
      let section_addrs = input_section_address_map(layout, atoms);
      let synth_addrs = synthetic_address_maps(layout, plan.synthetic_plan);
 +    let symbol_name_index = build_symbol_name_index(sym_table);
      let resolve = ResolveView {
          sym_table,
 +        symbol_name_index: &symbol_name_index,
          atom_table: atoms,
          atom_addrs: &atom_addrs,
          atoms_by_input_section: &atoms_by_input_section,
      let atoms_by_input_section = atoms.by_input_section();
      let section_addrs = input_section_address_map(layout, atoms);
      let synth_addrs = synthetic_address_maps(layout, synthetic_plan);
 +    let symbol_name_index = build_symbol_name_index(sym_table);
      let resolve = ResolveView {
          sym_table,
 +        symbol_name_index: &symbol_name_index,
          atom_table: atoms,
          atom_addrs: &atom_addrs,
          atoms_by_input_section: &atoms_by_input_section,
      })? + local_offset as u64;
      match reloc.kind {
          RelocKind::Unsigned => {
 -            if dylib_import_symbol_id(obj, reloc.referent, resolve.sym_table).is_some() {
 +            if dylib_import_symbol_id(obj, reloc.referent, resolve).is_some() {
                  if direct_import_bind_supported(reloc) {
                      clear_direct_import_slot(bytes, atom, obj, local_offset, reloc)
                  } else {
          ),
          RelocKind::TlvpLoadPageOff12 => {
              let target = resolve_tlvp_pageoff_target(obj, atom, reloc, resolve)?;
 -            if dylib_import_symbol_id(obj, reloc.referent, resolve.sym_table).is_some() {
 +            if dylib_import_symbol_id(obj, reloc.referent, resolve).is_some() {
                  patch_pageoff12(bytes, atom, obj, local_offset, reloc, target)
              } else {
                  patch_tlvp_pageoff12(bytes, atom, obj, local_offset, reloc, target)
      reloc: Reloc,
      resolve: &ResolveView<'_>,
  ) -> Result<BranchTargetKey, RelocError> {
 -    if let Some(symbol_id) = dylib_import_symbol_id(obj, reloc.referent, resolve.sym_table) {
 +    if let Some(symbol_id) = dylib_import_symbol_id(obj, reloc.referent, resolve) {
          return Ok(BranchTargetKey::Stub(symbol_id));
+     }
      match reloc.referent {
+                 )
              })?;
              if let Ok(name) = obj.symbol_name(input_sym) {
 -                if let Some((symbol_id, _)) = resolve
 -                    .sym_table
 -                    .iter()
 -                    .find(|(_, symbol)| resolve.sym_table.interner.resolve(symbol.name()) == name)
 -                {
 +                if let Some(symbol_id) = resolve.symbol_name_index.get(name).copied() {
                      return Ok(BranchTargetKey::Symbol(symbol_id));
+                 }
+             }
      reloc: Reloc,
      resolve: &ResolveView<'_>,
  ) -> Result<u64, RelocError> {
 -    let Some(symbol_id) = symbol_referent_id(obj, reloc.referent, resolve.sym_table) else {
 +    let Some(symbol_id) = symbol_referent_id(obj, reloc.referent, resolve) else {
          return Err(reloc_error(
              atom,
              &obj.path,
+ }
  fn got_reloc_relaxes_locally(obj: &ObjectFile, reloc: Reloc, resolve: &ResolveView<'_>) -> bool {
 -    match symbol_referent_id(obj, reloc.referent, resolve.sym_table) {
 +    match symbol_referent_id(obj, reloc.referent, resolve) {
          Some(symbol_id) => match resolve.sym_table.get(symbol_id) {
              Symbol::DylibImport { .. } => false,
              Symbol::Defined { .. } => true,
      reloc: Reloc,
      resolve: &ResolveView<'_>,
  ) -> Result<u64, RelocError> {
 -    if dylib_import_symbol_id(obj, reloc.referent, resolve.sym_table).is_some() {
 +    if dylib_import_symbol_id(obj, reloc.referent, resolve).is_some() {
          return resolve_got_target(obj, atom, reloc, resolve);
+     }
      resolve_referent(obj, atom, reloc.kind, reloc.referent, resolve)
      reloc: Reloc,
      resolve: &ResolveView<'_>,
  ) -> Result<u64, RelocError> {
 -    if dylib_import_symbol_id(obj, reloc.referent, resolve.sym_table).is_some() {
 +    if dylib_import_symbol_id(obj, reloc.referent, resolve).is_some() {
          return resolve_got_target(obj, atom, reloc, resolve);
+     }
      resolve_referent(obj, atom, reloc.kind, reloc.referent, resolve)
      })?;
      if let Ok(name) = obj.symbol_name(input_sym) {
 -        if let Some((_, symbol)) = resolve
 -            .sym_table
 -            .iter()
 -            .find(|(_, symbol)| resolve.sym_table.interner.resolve(symbol.name()) == name)
 -        {
 -            return resolve_global_symbol(obj, atom, kind, name, symbol, resolve);
 +        if let Some(symbol_id) = resolve.symbol_name_index.get(name).copied() {
 +            return resolve_global_symbol(
 +                obj,
 +                atom,
 +                kind,
 +                name,
 +                resolve.sym_table.get(symbol_id),
 +                resolve,
 +            );
+         }
+     }
  fn dylib_import_symbol_id(
      obj: &ObjectFile,
      referent: Referent,
 -    sym_table: &SymbolTable,
 +    resolve: &ResolveView<'_>,
  ) -> Option<SymbolId> {
 -    let symbol_id = symbol_referent_id(obj, referent, sym_table)?;
 -    matches!(sym_table.get(symbol_id), Symbol::DylibImport { .. }).then_some(symbol_id)
 +    let symbol_id = symbol_referent_id(obj, referent, resolve)?;
 +    matches!(resolve.sym_table.get(symbol_id), Symbol::DylibImport { .. }).then_some(symbol_id)
+ }
  fn symbol_referent_id(
      obj: &ObjectFile,
      referent: Referent,
 -    sym_table: &SymbolTable,
 +    resolve: &ResolveView<'_>,
  ) -> Option<SymbolId> {
      let Referent::Symbol(sym_idx) = referent else {
          return None;
      };
      let input_sym = obj.symbols.get(sym_idx as usize)?;
      let name = obj.symbol_name(input_sym).ok()?;
 -    let (symbol_id, symbol) = sym_table
 +    resolve.symbol_name_index.get(name).copied()
 +}
++
 +fn build_symbol_name_index(sym_table: &SymbolTable) -> HashMap<String, SymbolId> {
 +    sym_table
          .iter()
 -        .find(|(_, symbol)| sym_table.interner.resolve(symbol.name()) == name)?;
 -    let _ = symbol;
 -    Some(symbol_id)
 +        .map(|(symbol_id, symbol)| {
 +            (
 +                sym_table.interner.resolve(symbol.name()).to_string(),
 +                symbol_id,
 +            )
 +        })
 +        .collect()
+ }
  fn resolve_global_symbol(