Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mach/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub mod load_command;
pub mod relocation;
pub mod segment;
pub mod symbols;
pub mod version;

pub use self::constants::cputype;

Expand Down
138 changes: 138 additions & 0 deletions src/mach/version.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
/*-
* Copyright: see LICENSE file
*/

use crate::mach::MachO;
use crate::mach::load_command::CommandVariant;

if_std! {

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think you can remove this entire block once you get rid of the allocations

use crate::mach::{Mach, SingleArch};
use crate::error::Error;
use crate::mach::cputype::{CPU_TYPE_ARM64, CPU_TYPE_X86_64};
use std::cmp::Ordering;
use std::collections::VecDeque;
use std::str::FromStr;
use std::{env, fmt};
}

#[derive(Eq, Debug)]
pub struct Version {
pub major: u32,
pub minor: u32,
pub patch: u32,
Comment on lines +19 to +22

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please document all of this, public things, especially new ones, should be doc'd

}

impl From<u32> for Version {
fn from(packed: u32) -> Self {
// X.Y.Z is encoded in nibbles xxxx.yy.zz
// 12.6 = 0b0000_0000_0000_1100_0000_0110_0000_0000
let major = (packed & 0b1111_1111_1111_1111_0000_0000_0000_0000u32) >> 16;
let minor = (packed & 0b0000_0000_0000_0000_1111_1111_0000_0000u32) >> 8;
let patch = (packed & 0b0000_0000_0000_0000_0000_0000_1111_1111u32) >> 0;
Self {
major,
minor,
patch,
}
}
}

impl From<MachO<'_>> for Version {
fn from(b: MachO) -> Self {
let packed = b
.load_commands
.iter()
.find_map(|c| match c.command {
CommandVariant::VersionMinMacosx(v) => Some(v.version),
CommandVariant::BuildVersion(v) => Some(v.minos),
_ => None,
})
.unwrap();
Comment thread
CamJN marked this conversation as resolved.
Outdated
Self::from(packed)
}
}

impl PartialEq for Version {
fn eq(&self, other: &Self) -> bool {

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should be able to just #[derive(PartialEq)

self.major == other.major && self.minor == other.minor && self.patch == other.patch
}
}

if_std! {
impl fmt::Display for Version {
// This trait requires `fmt` with this exact signature.
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// Write strictly the first element into the supplied output
// stream: `f`. Returns `fmt::Result` which indicates whether the
// operation succeeded or failed. Note that `write!` uses syntax which
// is very similar to `println!`.
write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
}
}

impl Ord for Version {
fn cmp(&self, other: &Self) -> Ordering {
let mao = self.major.cmp(&other.major);
let mio = self.minor.cmp(&other.minor);
let pao = self.patch.cmp(&other.patch);
if mao == Ordering::Equal && mio == Ordering::Equal {
pao
} else if mao == Ordering::Equal {
mio
} else {
mao
}
}
}

impl PartialOrd for Version {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}
Comment on lines +68 to +87

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto, you should be able to derive this (and it also doesn't require std)


impl FromStr for Version {
type Err = Error;

fn from_str(s: &str) -> Result<Self, Self::Err> {
Comment thread
CamJN marked this conversation as resolved.
let mut parts = s
.trim()
.split('.')
.map(|p| p.parse::<u32>().unwrap())
.take(3)
.collect::<VecDeque<u32>>();

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this allocates a VecDequeu here just to pop the front; i think you can rewrite this to not allocate, and please do that. thank you for updating with fallible methods though.


Ok(Self {
major: parts.pop_front().unwrap(),
minor: parts.pop_front().unwrap_or(0),
patch: parts.pop_front().unwrap_or(0),
})
}
}

impl From<Mach<'_>> for Version {
fn from(b: Mach) -> Self {
Comment thread
CamJN marked this conversation as resolved.
Outdated
match b {
Mach::Binary(b) => Version::from(b),
Mach::Fat(f) => {
match f
.find(|r| {
r.unwrap().cputype
Comment thread
CamJN marked this conversation as resolved.
Outdated
== match env::var("CARGO_CFG_TARGET_ARCH").as_deref() {
Ok("x86_64") => CPU_TYPE_X86_64,
Ok("aarch64") => CPU_TYPE_ARM64,
_ => panic!("unknown arch"),
Comment thread
CamJN marked this conversation as resolved.
Outdated
}
})
.unwrap()
.ok()
.unwrap()
{
SingleArch::MachO(b) => Version::from(b),
SingleArch::Archive(_) => panic!("lib is an archive?"),
}
}
}
}
}
}
10 changes: 10 additions & 0 deletions tests/macho.rs
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,16 @@ fn parse_sections() {
}
}

#[test]
fn version() {
let bytes = &DEADBEEF_MACH_64;
let mach = Mach::parse(&bytes[..]).unwrap();
let actual: version::Version = mach.into();
let expected = "10.10.0".parse::<version::Version>();
assert!(expected.is_ok()); // Test parsing strings
assert_eq!(actual, expected.unwrap()); // Test parsing binaries
}

#[test]
fn iter_symbols() {
let bytes = &DEADBEEF_MACH_64;
Expand Down
Loading