From cc8aa65aecbab42c11773f4c033cb29f10d66b9a Mon Sep 17 00:00:00 2001 From: Maurice Heumann Date: Sun, 13 Jul 2025 12:07:46 +0200 Subject: [PATCH 1/3] Fix icicle deprecation warning --- src/backends/icicle-emulator/icicle-bridge/src/registers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs index 390d6cc5..1cfcec72 100644 --- a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs +++ b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs @@ -476,7 +476,7 @@ pub(crate) struct X86RegisterNodes { impl X86RegisterNodes { pub fn new(arch: &icicle_cpu::Arch) -> Self { - let r = |name: &str| arch.sleigh.get_reg(name).unwrap().var; + let r = |name: &str| arch.sleigh.get_varnode(name).unwrap(); let nodes = [ "CF", "F1", "PF", "F3", "AF", "F5", "ZF", "SF", "TF", "IF", "DF", "OF", "IOPL", "NT", "F15", "RF", "VM", "AC", "VIF", "VIP", "ID", From 24ed6db02e7abbded2f057509fb8674e45d2a0a8 Mon Sep 17 00:00:00 2001 From: Maurice Heumann Date: Sun, 13 Jul 2025 12:25:20 +0200 Subject: [PATCH 2/3] Try different fix --- src/backends/icicle-emulator/icicle-bridge/src/registers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs index 1cfcec72..cd21350e 100644 --- a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs +++ b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs @@ -476,7 +476,7 @@ pub(crate) struct X86RegisterNodes { impl X86RegisterNodes { pub fn new(arch: &icicle_cpu::Arch) -> Self { - let r = |name: &str| arch.sleigh.get_varnode(name).unwrap(); + let r = |name: &str| arch.sleigh.get_reg(name).unwrap().get_var().unwrap(); let nodes = [ "CF", "F1", "PF", "F3", "AF", "F5", "ZF", "SF", "TF", "IF", "DF", "OF", "IOPL", "NT", "F15", "RF", "VM", "AC", "VIF", "VIP", "ID", From 7632a77c3619beb4bac6d1ad1c13ef2d95af3717 Mon Sep 17 00:00:00 2001 From: Maurice Heumann Date: Sun, 13 Jul 2025 12:37:16 +0200 Subject: [PATCH 3/3] Ah fuck it --- src/backends/icicle-emulator/icicle-bridge/src/registers.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs index cd21350e..d093d356 100644 --- a/src/backends/icicle-emulator/icicle-bridge/src/registers.rs +++ b/src/backends/icicle-emulator/icicle-bridge/src/registers.rs @@ -476,7 +476,7 @@ pub(crate) struct X86RegisterNodes { impl X86RegisterNodes { pub fn new(arch: &icicle_cpu::Arch) -> Self { - let r = |name: &str| arch.sleigh.get_reg(name).unwrap().get_var().unwrap(); + let r = |name: &str| arch.sleigh.get_reg(name).unwrap().get_raw_var(); let nodes = [ "CF", "F1", "PF", "F3", "AF", "F5", "ZF", "SF", "TF", "IF", "DF", "OF", "IOPL", "NT", "F15", "RF", "VM", "AC", "VIF", "VIP", "ID",