Skip to content

Commit e10f722

Browse files
committed
CpuVendor: use enum instead of bitflags
1 parent fda3010 commit e10f722

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/enc_dec_builder/cpu.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33

44
use crate::error::ensure_ptok;
55
use crate::error::PtError;
6-
use bitflags::bitflags;
76
use libipt_sys::{
87
pt_cpu, pt_cpu_errata, pt_cpu_vendor, pt_cpu_vendor_pcv_intel, pt_cpu_vendor_pcv_unknown,
98
pt_errata,
109
};
1110
use std::mem::MaybeUninit;
1211

13-
bitflags! {
14-
/// i suppose this is relevant when/if amd finally gets intelpt support?
15-
#[derive(Debug)]
16-
pub struct CpuVendor: u32 {
17-
const INTEL = pt_cpu_vendor_pcv_intel as u32;
18-
const UNKNOWN = pt_cpu_vendor_pcv_unknown as u32;
19-
}
12+
#[derive(Debug, Clone, Copy)]
13+
#[repr(u32)]
14+
pub enum CpuVendor {
15+
INTEL = pt_cpu_vendor_pcv_intel as u32,
16+
UNKNOWN = pt_cpu_vendor_pcv_unknown as u32,
2017
}
2118

2219
/// A Cpu identifier
@@ -26,7 +23,7 @@ pub struct Cpu(pub(super) pt_cpu);
2623
impl Cpu {
2724
pub const fn new(vendor: CpuVendor, family: u16, model: u8, stepping: u8) -> Self {
2825
Cpu(pt_cpu {
29-
vendor: vendor.bits() as pt_cpu_vendor,
26+
vendor: vendor as pt_cpu_vendor,
3027
family,
3128
model,
3229
stepping,

0 commit comments

Comments
 (0)