From d2b4f3d1a454c7bbcc487ddfb2839b01dc1c9c9e Mon Sep 17 00:00:00 2001 From: iximeow Date: Sat, 27 Aug 2022 17:08:29 -0700 Subject: remove a few duplicate impls, add stubs for geneirc translations generate_opcode.py has quickly grown into generating much more than just opcode definitions, and now handles a few duplicate impls across the different decode modes as well. some of the added impl generation conflicts with still-existing hand-written impls from yore, so they needed a bit of removing. next will be the addition of a generic module for "probably what you want" disassembly of x86, avoiding the 64-/32-/16-bitness of the architecture family with an attempt to decode "probably what you wanted" from a byte sequence. it needs a little more work still, but TODO stubs added here support that new module. --- src/generated/imp.rs | 6 +++--- src/generated/opcode.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/generated') diff --git a/src/generated/imp.rs b/src/generated/imp.rs index 86ff91e..123950d 100644 --- a/src/generated/imp.rs +++ b/src/generated/imp.rs @@ -1800,7 +1800,7 @@ pub(crate) mod real_mode { } } impl Opcode { - pub(crate) fn name(&self) -> &'static str { + pub fn name(&self) -> &'static str { self.to_generic().name() } } @@ -4227,7 +4227,7 @@ pub(crate) mod protected_mode { } } impl Opcode { - pub(crate) fn name(&self) -> &'static str { + pub fn name(&self) -> &'static str { self.to_generic().name() } } @@ -6660,7 +6660,7 @@ pub(crate) mod long_mode { } } impl Opcode { - pub(crate) fn name(&self) -> &'static str { + pub fn name(&self) -> &'static str { self.to_generic().name() } } diff --git a/src/generated/opcode.rs b/src/generated/opcode.rs index 5fa5892..0d920cd 100644 --- a/src/generated/opcode.rs +++ b/src/generated/opcode.rs @@ -2877,7 +2877,7 @@ pub(crate) const MNEMONICS: &'static [&'static str] = &[ ]; impl Opcode { - pub(crate) fn name(&self) -> &'static str { + pub fn name(&self) -> &'static str { // safety: `MNEMONICS` and `Opcode` are generated together, where every entry in `Opcode` guarantees // a corresponding entry in `MNEMONICS`. unsafe { @@ -4332,7 +4332,7 @@ pub(crate) mod real_mode { unsafe { core::mem::transmute::(*self) } } - fn nane(&self) -> &'static str { + pub fn nane(&self) -> &'static str { self.to_generic().name() } } @@ -5784,7 +5784,7 @@ pub(crate) mod protected_mode { unsafe { core::mem::transmute::(*self) } } - fn nane(&self) -> &'static str { + pub fn nane(&self) -> &'static str { self.to_generic().name() } } @@ -7226,7 +7226,7 @@ pub(crate) mod long_mode { unsafe { core::mem::transmute::(*self) } } - fn nane(&self) -> &'static str { + pub fn nane(&self) -> &'static str { self.to_generic().name() } } -- cgit v1.1