Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
AngheloAlf committed Sep 25, 2024
1 parent f791d0e commit fe97c35
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 18 deletions.
20 changes: 16 additions & 4 deletions src/rs/mapfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,10 @@ impl MapFile {
None
}

pub fn find_symbol_by_vram(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
pub fn find_symbol_by_vram(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
let mut possible_files = Vec::new();

for segment in &self.segments_list {
Expand All @@ -535,7 +538,10 @@ impl MapFile {
(None, possible_files)
}

pub fn find_symbol_by_vrom(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
pub fn find_symbol_by_vrom(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
let mut possible_files = Vec::new();

for segment in &self.segments_list {
Expand Down Expand Up @@ -907,12 +913,18 @@ pub(crate) mod python_bindings {
self.find_symbol_by_vram_or_vrom(address)
}

fn findSymbolByVram(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
fn findSymbolByVram(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
let (info, possible_files) = self.find_symbol_by_vram(address);
(info, possible_files.into_iter().cloned().collect())
}

fn findSymbolByVrom(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
fn findSymbolByVrom(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
let (info, possible_files) = self.find_symbol_by_vrom(address);
(info, possible_files.into_iter().cloned().collect())
}
Expand Down
46 changes: 32 additions & 14 deletions src/rs/segment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,21 @@ impl Segment {
None
}

pub fn find_symbol_by_vram(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
pub fn find_symbol_by_vram(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
let mut possible_files = Vec::new();
for file in &self.files_list {
if let Some((sym, offset)) = file.find_symbol_by_vram(address) {
return (Some(found_symbol_info::FoundSymbolInfo::new(
file.clone(),
sym.clone(),
offset,
)), Vec::new());
return (
Some(found_symbol_info::FoundSymbolInfo::new(
file.clone(),
sym.clone(),
offset,
)),
Vec::new(),
);
}
if address >= file.vram && address < file.vram + file.size {
possible_files.push(file);
Expand All @@ -122,15 +128,21 @@ impl Segment {
(None, possible_files)
}

pub fn find_symbol_by_vrom(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
pub fn find_symbol_by_vrom(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<&file::File>) {
let mut possible_files = Vec::new();
for file in &self.files_list {
if let Some((sym, offset)) = file.find_symbol_by_vrom(address) {
return (Some(found_symbol_info::FoundSymbolInfo::new(
file.clone(),
sym.clone(),
offset,
)), Vec::new());
return (
Some(found_symbol_info::FoundSymbolInfo::new(
file.clone(),
sym.clone(),
offset,
)),
Vec::new(),
);
}
if address >= file.vram && address < file.vram + file.size {
possible_files.push(file);
Expand Down Expand Up @@ -427,12 +439,18 @@ pub(crate) mod python_bindings {
self.find_symbol_by_vram_or_vrom(address)
}

fn findSymbolByVram(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
fn findSymbolByVram(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
let (info, possible_files) = self.find_symbol_by_vram(address);
(info, possible_files.into_iter().cloned().collect())
}

fn findSymbolByVrom(&self, address: u64) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
fn findSymbolByVrom(
&self,
address: u64,
) -> (Option<found_symbol_info::FoundSymbolInfo>, Vec<file::File>) {
let (info, possible_files) = self.find_symbol_by_vrom(address);
(info, possible_files.into_iter().cloned().collect())
}
Expand Down

0 comments on commit fe97c35

Please sign in to comment.