Bump libipt to 2.1.1

Marcondiro · Marcondiro · commit d5affa68acb2 · 2024-11-04T16:00:10.000+01:00
diff --git a/src/block/block.rs b/src/block/block.rs
@@ -23,6 +23,7 @@ mod test {
             ninsn: 4,
             raw: data,
             size: 8,
+            _bitfield_align_1: [],
             _bitfield_1: pt_block::new_bitfield_1(0, 1),
             __bindgen_padding_0: Default::default()
        });
@@ -50,6 +51,7 @@ mod test {
             ninsn: 4,
             raw: data,
             size: 8,
+            _bitfield_align_1: [],
             _bitfield_1: pt_block::new_bitfield_1(0, 0),
             __bindgen_padding_0: Default::default()
        });
diff --git a/src/config/cpu.rs b/src/config/cpu.rs
@@ -42,7 +42,7 @@ mod test {
 
 bitflags! {
     /// i suppose this is relevant when/if amd finally gets intelpt support?
-    pub struct CpuVendor: i32 {
+    pub struct CpuVendor: u32 {
         const INTEL = pt_cpu_vendor_pcv_intel;
         const UNKNOWN = pt_cpu_vendor_pcv_unknown;
     }
@@ -64,6 +64,7 @@ impl Cpu {
     /// determines processor specific workarounds
     pub(super) fn determine_errata(self) -> pt_errata {
         let mut errata = pt_errata {
+            _bitfield_align_1: [],
             _bitfield_1: Default::default(),
             reserved: Default::default()
         };
diff --git a/src/config/flags.rs b/src/config/flags.rs
@@ -106,9 +106,10 @@ bitflags! {
 
 impl From<BlockFlags> for pt_conf_flags {
     fn from(flags: BlockFlags) -> Self {
-        pt_conf_flags {
+        Self {
             variant: pt_conf_flags__bindgen_ty_1 {
                 block: pt_conf_flags__bindgen_ty_1__bindgen_ty_1 {
+                    _bitfield_align_1: [],
                     _bitfield_1: __BindgenBitfieldUnit::new([flags.bits()]),
                     __bindgen_padding_0: Default::default() }}}
     }
@@ -119,6 +120,7 @@ impl From<InsnFlags> for pt_conf_flags {
         pt_conf_flags {
             variant: pt_conf_flags__bindgen_ty_1 {
                 insn: pt_conf_flags__bindgen_ty_1__bindgen_ty_2 {
+                    _bitfield_align_1: [],
                     _bitfield_1: __BindgenBitfieldUnit::new([flags.bits()]),
                     __bindgen_padding_0: Default::default() }}}
     }
@@ -129,6 +131,7 @@ impl From<QueryFlags> for pt_conf_flags {
         pt_conf_flags {
             variant: pt_conf_flags__bindgen_ty_1 {
                 query: pt_conf_flags__bindgen_ty_1__bindgen_ty_3 {
+                    _bitfield_align_1: [],
                     _bitfield_1: __BindgenBitfieldUnit::new([flags.bits()]),
                     __bindgen_padding_0: Default::default() }}}
     }
diff --git a/src/error.rs b/src/error.rs
@@ -4,7 +4,7 @@ use std::ffi::CStr;
 use std::fmt::{Display, Formatter};
 use std::error::Error;
 
-use libipt_sys::pt_errstr;
+use libipt_sys::{pt_error_code, pt_errstr};
 use libipt_sys::{
     pt_error_code_pte_ok,
     pt_error_code_pte_internal,
@@ -40,61 +40,61 @@ use libipt_sys::{
 #[repr(i32)]
 pub enum PtErrorCode {
     /// No error. Everything is OK
-    Ok = pt_error_code_pte_ok,
+    Ok = pt_error_code_pte_ok as i32,
     /// Internal decoder error
-    Internal = pt_error_code_pte_internal,
+    Internal = pt_error_code_pte_internal as i32,
     /// Invalid argument
-    Invalid = pt_error_code_pte_invalid,
+    Invalid = pt_error_code_pte_invalid as i32,
     /// Decoder out of sync
-    Nosync = pt_error_code_pte_nosync,
+    Nosync = pt_error_code_pte_nosync as i32,
     /// Unknown opcode
-    BadOpc = pt_error_code_pte_bad_opc,
+    BadOpc = pt_error_code_pte_bad_opc as i32,
     /// Unknown payload
-    BadPacket = pt_error_code_pte_bad_packet,
+    BadPacket = pt_error_code_pte_bad_packet as i32,
     /// Unexpected packet context
-    BadContext = pt_error_code_pte_bad_context,
+    BadContext = pt_error_code_pte_bad_context as i32,
     /// Decoder reached end of trace stream
-    Eos = pt_error_code_pte_eos,
+    Eos = pt_error_code_pte_eos as i32,
     /// No packet matching the query to be found
-    BadQuery = pt_error_code_pte_bad_query,
+    BadQuery = pt_error_code_pte_bad_query as i32,
     /// Decoder out of memory
-    Nomem = pt_error_code_pte_nomem,
+    Nomem = pt_error_code_pte_nomem as i32,
     /// Bad configuration
-    BadConfig = pt_error_code_pte_bad_config,
+    BadConfig = pt_error_code_pte_bad_config as i32,
     /// There is no IP
-    Noip = pt_error_code_pte_noip,
+    Noip = pt_error_code_pte_noip as i32,
     /// The IP has been suppressed
-    IpSuppressed = pt_error_code_pte_ip_suppressed,
+    IpSuppressed = pt_error_code_pte_ip_suppressed as i32,
     /// There is no memory mapped at the requested address
-    Nomap = pt_error_code_pte_nomap,
+    Nomap = pt_error_code_pte_nomap as i32,
     /// An instruction could not be decoded
-    BadInsn = pt_error_code_pte_bad_insn,
+    BadInsn = pt_error_code_pte_bad_insn as i32,
     /// No wall-clock time is available
-    NoTime = pt_error_code_pte_no_time,
+    NoTime = pt_error_code_pte_no_time as i32,
     /// No core:bus ratio available
-    NoCbr = pt_error_code_pte_no_cbr,
+    NoCbr = pt_error_code_pte_no_cbr as i32,
     /// Bad traced image
-    BadImage = pt_error_code_pte_bad_image,
+    BadImage = pt_error_code_pte_bad_image as i32,
     /// A locking error
-    BadLock = pt_error_code_pte_bad_lock,
+    BadLock = pt_error_code_pte_bad_lock as i32,
     /// The requested feature is not supported
-    NotSupported = pt_error_code_pte_not_supported,
+    NotSupported = pt_error_code_pte_not_supported as i32,
     /// The return address stack is empty
-    RetstackEmpty = pt_error_code_pte_retstack_empty,
+    RetstackEmpty = pt_error_code_pte_retstack_empty as i32,
     /// A compressed return is not indicated correctly by a taken branch
-    BadRetcomp = pt_error_code_pte_bad_retcomp,
+    BadRetcomp = pt_error_code_pte_bad_retcomp as i32,
     /// The current decoder state does not match the state in the trace
-    BadStatusUpdate = pt_error_code_pte_bad_status_update,
+    BadStatusUpdate = pt_error_code_pte_bad_status_update as i32,
     /// The trace did not contain an expected enabled event
-    NoEnable = pt_error_code_pte_no_enable,
+    NoEnable = pt_error_code_pte_no_enable as i32,
     /// An event was ignored
-    EventIgnored = pt_error_code_pte_event_ignored,
+    EventIgnored = pt_error_code_pte_event_ignored as i32,
     /// Something overflowed
-    Overflow = pt_error_code_pte_overflow,
+    Overflow = pt_error_code_pte_overflow as i32,
     /// A file handling error
-    BadFile = pt_error_code_pte_bad_file,
+    BadFile = pt_error_code_pte_bad_file as i32,
     /// Unknown cpu
-    BadCpu = pt_error_code_pte_bad_cpu,
+    BadCpu = pt_error_code_pte_bad_cpu as i32,
 
     /// No Error Information available
     NoInfo = -1
@@ -118,12 +118,12 @@ impl PtError {
     /// *error codes not included in the pt_error enum will panic!*
     #[inline]
     pub(crate) fn from_code(code: i32) -> Self {
-        // panicing here is fine since this should only be called
+        // panicking here is fine since this should only be called
         // for return values of libipt functions
         // so invalid returns = bug in libipt or the bindings
         PtError::new(
             PtErrorCode::try_from(-code).unwrap(),
-            unsafe { CStr::from_ptr(pt_errstr(-code)).to_str().unwrap() }
+            unsafe { CStr::from_ptr(pt_errstr(-code as pt_error_code)).to_str().unwrap() }
         )
     }
 
diff --git a/src/event/enabled.rs b/src/event/enabled.rs
@@ -13,6 +13,7 @@ mod test {
         evt.type_ = pt_event_type_ptev_enabled;
         evt.variant.enabled = pt_event__bindgen_ty_1__bindgen_ty_1 {
             ip: 11,
+            _bitfield_align_1: [],
             _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_1::new_bitfield_1(1),
             __bindgen_padding_0: Default::default()
         };
diff --git a/src/event/exec_mode.rs b/src/event/exec_mode.rs
@@ -37,7 +37,7 @@ mod test {
 }
 
 #[derive(Clone, Copy, TryFromPrimitive, Debug, PartialEq)]
-#[repr(i32)]
+#[repr(u32)]
 pub enum ExecModeType {
     Bit16 = pt_exec_mode_ptem_16bit,
     Bit32 = pt_exec_mode_ptem_32bit,
diff --git a/src/event/mod.rs b/src/event/mod.rs
@@ -73,7 +73,8 @@ mod test {
             lost_cyc: 3,
             _bitfield_1: pt_event::new_bitfield_1(1, 0, 1),
             variant: unsafe { mem::zeroed() },
-            reserved: [0; 2]
+            reserved: [0; 2],
+            _bitfield_align_1: [],
         };
 
         let evt = Event(evt);
diff --git a/src/event/paging.rs b/src/event/paging.rs
@@ -20,6 +20,7 @@ mod test {
         evt.type_ = pt_event_type_ptev_paging;
         evt.variant.paging = pt_event__bindgen_ty_1__bindgen_ty_5 {
             cr3: 11,
+            _bitfield_align_1: [],
             _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_5::new_bitfield_1(1),
             __bindgen_padding_0: Default::default()
         };
@@ -41,7 +42,8 @@ mod test {
         evt.variant.async_paging = pt_event__bindgen_ty_1__bindgen_ty_6 {
             cr3: 11,
             ip: 12,
-            _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_6::new_bitfield_1(1)
+            _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_6::new_bitfield_1(1),
+            _bitfield_align_1: [],
         };
 
         let payload: Payload = evt.into();
diff --git a/src/event/pwre.rs b/src/event/pwre.rs
@@ -14,6 +14,7 @@ mod test {
         evt.variant.pwre = pt_event__bindgen_ty_1__bindgen_ty_14 {
             state: 11,
             sub_state: 22,
+            _bitfield_align_1: [],
             _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_14::new_bitfield_1(1),
             __bindgen_padding_0: Default::default()
         };
diff --git a/src/event/pwrx.rs b/src/event/pwrx.rs
@@ -14,6 +14,7 @@ mod test {
         evt.variant.pwrx = pt_event__bindgen_ty_1__bindgen_ty_15 {
             last: 11,
             deepest: 22,
+            _bitfield_align_1: [],
             _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_15::new_bitfield_1(1, 0, 1),
             __bindgen_padding_0: Default::default()
         };
diff --git a/src/event/tsx.rs b/src/event/tsx.rs
@@ -13,6 +13,7 @@ mod test {
         evt.type_ = pt_event_type_ptev_tsx;
         evt.variant.tsx = pt_event__bindgen_ty_1__bindgen_ty_9 {
             ip: 11,
+            _bitfield_align_1: [],
             _bitfield_1: pt_event__bindgen_ty_1__bindgen_ty_9::new_bitfield_1(1, 0),
             __bindgen_padding_0: Default::default()
         };
diff --git a/src/flags.rs b/src/flags.rs
@@ -19,9 +19,9 @@ bitflags! {
 
 impl Status {
     /// There is no more trace data available.
-    pub fn eos(self) -> bool { self.contains(Status::EOS) }
+    pub fn eos(&self) -> bool { self.contains(Status::EOS) }
     /// There is an event pending.
-    pub fn event_pending(self) -> bool { self.contains(Status::EVENT_PENDING) }
+    pub fn event_pending(&self) -> bool { self.contains(Status::EVENT_PENDING) }
     /// The address has been suppressed.
-    pub fn ip_supressed(self) -> bool { self.contains(Status::IP_SUPRESSED) }
+    pub fn ip_supressed(&self) -> bool { self.contains(Status::IP_SUPRESSED) }
 }
diff --git a/src/insn/class.rs b/src/insn/class.rs
@@ -17,7 +17,7 @@ use libipt_sys::{
 /// We provide only a very coarse classification suitable for reconstructing
 /// the execution flow.
 #[derive(Clone, Copy, Debug, TryFromPrimitive, PartialEq)]
-#[repr(i32)]
+#[repr(u32)]
 pub enum Class {
     /// The instruction is a near (function) call.
     Call = pt_insn_class_ptic_call,
diff --git a/src/insn/insn.rs b/src/insn/insn.rs
@@ -21,6 +21,7 @@ mod test {
             iclass: pt_insn_class_ptic_call,
             raw: data,
             size: 8,
+            _bitfield_align_1: [],
             _bitfield_1: pt_insn::new_bitfield_1(0, 1),
             __bindgen_padding_0: Default::default()
        });
diff --git a/src/packet/exstop.rs b/src/packet/exstop.rs
@@ -12,6 +12,7 @@ impl Exstop {
     #[inline]
     pub fn new(ip: bool) -> Self {
         Exstop(pt_packet_exstop {
+            _bitfield_align_1: [],
             _bitfield_1: __BindgenBitfieldUnit::new([ip as u8]),
             __bindgen_padding_0: Default::default()
         })
diff --git a/src/packet/ip.rs b/src/packet/ip.rs
@@ -16,7 +16,7 @@ use libipt_sys::{
 
 /// The IP compression
 #[derive(Clone, Copy, Debug, TryFromPrimitive, IntoPrimitive)]
-#[repr(i32)]
+#[repr(u32)]
 pub enum Compression {
     /// No payload. The IP has been suppressed
     Suppressed = pt_ip_compression_pt_ipc_suppressed,
diff --git a/src/packet/mode.rs b/src/packet/mode.rs
@@ -32,6 +32,7 @@ impl Into<pt_packet_mode__bindgen_ty_1> for Exec {
     fn into(self) -> pt_packet_mode__bindgen_ty_1 {
         pt_packet_mode__bindgen_ty_1 {
             exec: pt_packet_mode_exec {
+                _bitfield_align_1: [],
                 _bitfield_1: __BindgenBitfieldUnit::new([self.bits() as u8]),
                 __bindgen_padding_0: Default::default(),
             },
@@ -43,6 +44,7 @@ impl Into<pt_packet_mode__bindgen_ty_1> for Tsx {
     fn into(self) -> pt_packet_mode__bindgen_ty_1 {
         pt_packet_mode__bindgen_ty_1 {
             tsx: pt_packet_mode_tsx {
+                _bitfield_align_1: [],
                 _bitfield_1: __BindgenBitfieldUnit::new([self.bits() as u8]),
                 __bindgen_padding_0: Default::default(),
             },
diff --git a/src/packet/pip.rs b/src/packet/pip.rs
@@ -13,6 +13,7 @@ impl Pip {
     pub fn new(cr3: u64, nr: bool) -> Self {
         Pip(pt_packet_pip {
             cr3,
+            _bitfield_align_1: [],
             _bitfield_1: __BindgenBitfieldUnit::new([nr as u8]),
             __bindgen_padding_0: Default::default()
         })
diff --git a/src/packet/ptw.rs b/src/packet/ptw.rs
@@ -13,6 +13,7 @@ impl Ptw {
     pub fn new(payload: u64, plc: u8, ip: bool) -> Self {
         Ptw(pt_packet_ptw {
             payload, plc,
+            _bitfield_align_1: [],
             _bitfield_1: __BindgenBitfieldUnit::new([ip as u8]),
             __bindgen_padding_0: Default::default()
         })
diff --git a/src/packet/pwre.rs b/src/packet/pwre.rs
@@ -13,6 +13,7 @@ impl Pwre {
     pub fn new(state: u8, substate: u8, hw: bool) -> Self {
         Pwre(pt_packet_pwre{
             state, sub_state: substate,
+            _bitfield_align_1: [],
             _bitfield_1: __BindgenBitfieldUnit::new([hw as u8]),
             __bindgen_padding_0: Default::default()
         })
diff --git a/src/packet/pwrx.rs b/src/packet/pwrx.rs
@@ -18,7 +18,8 @@ impl Pwrx {
                 interrupt as u32,
                 store as u32,
                 autonomous as u32
-            )
+            ),
+            _bitfield_align_1: [],
         })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ mod test {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`#[derive(Clone, Copy, TryFromPrimitive, Debug, PartialEq)]`
`40`		`-#[repr(i32)]`
	`40`	`+#[repr(u32)]`
`41`	`41`	`pub enum ExecModeType {`
`42`	`42`	`Bit16 = pt_exec_mode_ptem_16bit,`
`43`	`43`	`Bit32 = pt_exec_mode_ptem_32bit,`