Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually update extab stuff #110

Merged
merged 5 commits into from
Sep 24, 2024
Merged

Actually update extab stuff #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d27ea2
Update cwextab
CelestialAmber Sep 24, 2024
7201178
Merge remote-tracking branch 'upstream/main' into patch-1
CelestialAmber Sep 24, 2024
5ec8989
Update
CelestialAmber Sep 24, 2024
61a8dbf
Update ppc.rs
CelestialAmber Sep 24, 2024
4f885f4
Make fmt shut up
CelestialAmber Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion objdiff-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ gimli = { version = "0.31", default-features = false, features = ["read-all"], o

# ppc
cwdemangle = { version = "1.0", optional = true }
cwextab = { version = "0.2", optional = true }
cwextab = { version = "0.3.1", optional = true }
ppc750cl = { version = "0.3", optional = true }

# mips
Expand Down
10 changes: 7 additions & 3 deletions objdiff-core/src/arch/ppc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,13 @@ fn decode_exception_info(file: &File<'_>) -> Result<Option<BTreeMap<usize, Excep
continue;
};
let data = match decode_extab(extab_data) {
Some(decoded_data) => decoded_data,
None => {
log::warn!("Exception table decoding failed for function {}", extab_func_name);
Ok(decoded_data) => decoded_data,
Err(e) => {
log::warn!(
"Exception table decoding failed for function {}, reason: {}",
extab_func_name,
e.to_string()
);
return Ok(None);
}
};
Expand Down
2 changes: 1 addition & 1 deletion objdiff-gui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ bytes = "1.7"
cfg-if = "1.0"
const_format = "0.2"
cwdemangle = "1.0"
cwextab = "0.3"
cwextab = "0.3.1"
dirs = "5.0"
egui = "0.28"
egui_extras = "0.28"
Expand Down