From d04838fe4efcf6069b9b075d0d1b1bb47dc29ddc Mon Sep 17 00:00:00 2001 From: Luke Street Date: Mon, 10 Oct 2022 17:54:52 -0400 Subject: [PATCH] Update ppc750cl crate for more improved mnemonics & branch prediction bits --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/obj/ppc.rs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fb0b4c..0ff3269 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1723,7 +1723,7 @@ dependencies = [ [[package]] name = "ppc750cl" version = "0.2.0" -source = "git+https://github.com/encounter/ppc750cl?rev=20abce13e43f8d4ff4840732f9c92dda26ebe2ce#20abce13e43f8d4ff4840732f9c92dda26ebe2ce" +source = "git+https://github.com/encounter/ppc750cl?rev=4d8e4733319312abf47cde193d7386e55744bdf8#4d8e4733319312abf47cde193d7386e55744bdf8" dependencies = [ "num-traits", "serde", diff --git a/Cargo.toml b/Cargo.toml index 743eae2..f00f412 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ cwdemangle = { git = "https://github.com/encounter/cwdemangle", rev = "ba448f403 log = "0.4.17" rfd = { version = "0.10.0" } # , default-features = false, features = ['xdg-portal'] egui_extras = "0.19.0" -ppc750cl = { git = "https://github.com/encounter/ppc750cl", rev = "20abce13e43f8d4ff4840732f9c92dda26ebe2ce" } +ppc750cl = { git = "https://github.com/encounter/ppc750cl", rev = "4d8e4733319312abf47cde193d7386e55744bdf8" } rabbitizer = { git = "https://github.com/encounter/rabbitizer-rs", rev = "10c279b2ef251c62885b1dcdcfe740b0db8e9956" } time = { version = "0.3.14", features = ["formatting", "local-offset"] } diff --git a/src/obj/ppc.rs b/src/obj/ppc.rs index 55c32d0..094ec38 100644 --- a/src/obj/ppc.rs +++ b/src/obj/ppc.rs @@ -74,11 +74,10 @@ pub fn process_code( } } ops.push(simplified.ins.op as u8); - let suffix = simplified.ins.suffix(); insts.push(ObjIns { address: simplified.ins.addr, code: simplified.ins.code, - mnemonic: format!("{}{}", simplified.mnemonic, suffix), + mnemonic: format!("{}{}", simplified.mnemonic, simplified.suffix), args, reloc: reloc.cloned(), op: 0,