Skip to content

Commit

Permalink
Bump cwextab (#113)
Browse files Browse the repository at this point in the history
* Bump cwextab

* Updated cwextab to not error on null actions
  • Loading branch information
CelestialAmber authored Oct 2, 2024
1 parent 08cd768 commit fab9c62
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

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
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.3", optional = true }
cwextab = { version = "1.0.1", optional = true }
ppc750cl = { version = "0.3", optional = true }

# mips
Expand Down
2 changes: 1 addition & 1 deletion objdiff-gui/Cargo.toml
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.1"
cwextab = "1.0.1"
dirs = "5.0"
egui = "0.29"
egui_extras = "0.29"
Expand Down
12 changes: 6 additions & 6 deletions objdiff-gui/src/views/extab_diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ fn find_symbol(obj: &ObjInfo, selected_symbol: &SymbolRefByName) -> Option<Symbo
fn decode_extab(extab: &ExceptionInfo) -> String {
let mut text = String::from("");

let mut dtor_names: Vec<&str> = vec![];
let mut dtor_names: Vec<String> = vec![];
for dtor in &extab.dtors {
//For each function name, use the demangled name by default,
//and if not available fallback to the original name
let name = match &dtor.demangled_name {
Some(demangled_name) => demangled_name,
None => &dtor.name,
let name: String = match &dtor.demangled_name {
Some(demangled_name) => demangled_name.to_string(),
None => dtor.name.clone(),
};
dtor_names.push(name.as_str());
dtor_names.push(name);
}
if let Some(decoded) = extab.data.to_string(&dtor_names) {
if let Some(decoded) = extab.data.to_string(dtor_names) {
text += decoded.as_str();
}

Expand Down

0 comments on commit fab9c62

Please sign in to comment.