diff options
| author | iximeow <me@iximeow.net> | 2021-07-03 16:13:48 -0700 |
|---|---|---|
| committer | iximeow <me@iximeow.net> | 2021-07-03 16:13:48 -0700 |
| commit | 282645e18ac920b2c1051a0bdf3e3236ee5839d6 (patch) | |
| tree | 46b054c118063c66d422c27bfcd8b7dc199d0b24 /src/protected_mode/mod.rs | |
| parent | 7e154da8e2bd7b8892bdefe2f71c111c2135b0a3 (diff) | |
add tests for MemoryAccessSize, consistentify style on docs
Diffstat (limited to 'src/protected_mode/mod.rs')
| -rw-r--r-- | src/protected_mode/mod.rs | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/protected_mode/mod.rs b/src/protected_mode/mod.rs index 589d7a3..a088ad6 100644 --- a/src/protected_mode/mod.rs +++ b/src/protected_mode/mod.rs @@ -2684,9 +2684,9 @@ pub struct InstDecoder { } impl InstDecoder { - /// Instantiates an x86 decoder that decodes the bare minimum of protected-mode x86. + /// instantiates an x86 decoder that decodes the bare minimum of protected-mode x86. /// - /// Pedantic and only decodes what the spec says is well-defined, rejecting undefined sequences + /// pedantic and only decodes what the spec says is well-defined, rejecting undefined sequences /// and any instructions defined by extensions. pub fn minimal() -> Self { InstDecoder { @@ -2694,6 +2694,15 @@ impl InstDecoder { } } + /// helper to decode an instruction directly from a byte slice. + /// + /// this lets callers avoid the work of setting up a [`yaxpeax_arch::U8Reader`] for the slice + /// to decode. + pub fn decode_slice(&self, data: &[u8]) -> Result<Instruction, DecodeError> { + let mut reader = yaxpeax_arch::U8Reader::new(data); + self.decode(&mut reader) + } + pub fn sse3(&self) -> bool { self.flags & (1 << 0) != 0 } @@ -4103,6 +4112,17 @@ impl Default for Instruction { } } +const MEM_SIZE_STRINGS: [&'static str; 64] = [ + "byte", "word", "BUG", "dword", "far", "ptr", "BUG", "qword", + "BUG", "mword", "BUG", "BUG", "BUG", "BUG", "BUG", "xmmword", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "ymmword", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", + "BUG", "BUG", "BUG", "BUG", "BUG", "BUG", "ptr", "zmmword", +]; + pub struct MemoryAccessSize { size: u8, } @@ -4116,7 +4136,7 @@ impl MemoryAccessSize { } pub fn size_name(&self) -> &'static str { - "name_strings" + MEM_SIZE_STRINGS[self.size as usize - 1] } } |