added sum status bit-vectors

Author: sum-catnip

src/block/block.rs

@@ -130,4 +130,4 @@ impl Block {
     /// The raw bytes for the last instruction are provided in \@raw and
     /// its size in \@size in this case.
     pub fn truncated(&self) -> bool { self.0.truncated() > 0 }
-}
+}

src/block/decoder.rs

@@ -169,15 +169,15 @@ impl<'a, T> BlockDecoder<'a, T> {
     /// Returns Eos if decoding reached the end of the Intel PT buffer.
     /// Returns Nomap if the memory at the instruction address can't be read.
     /// Returns Nosync if the decoder is out of sync.
-    pub fn next(&mut self) -> Result<Block, PtError> {
+    pub fn next(&mut self) -> Result<(Block, Status), PtError> {
         let mut blk: pt_block = unsafe { mem::zeroed() };
-        ensure_ptok(
+        extract_pterr(
             unsafe {
                 pt_blk_next(self.0,
                             &mut blk,
                             mem::size_of::<pt_block>())
             }
-        ).map(|_| Block(blk))
+        ).map(|s| (Block(blk), Status::from_bits(s).unwrap()))
     }
 
     /// Set the traced image.
@@ -252,9 +252,9 @@ impl<'a, T> BlockDecoder<'a, T> {
 }
 
 impl<'a, T> Iterator for BlockDecoder<'a, T> {
-    type Item = Result<Block, PtError>;
+    type Item = Result<(Block, Status), PtError>;
 
-    fn next(&mut self) -> Option<Result<Block, PtError>> {
+    fn next(&mut self) -> Option<Result<(Block, Status), PtError>> {
         match self.next() {
             // eos to stop iterating
             Err(x) if x.code() == PtErrorCode::Eos => None,

src/config/config.rs

@@ -172,8 +172,6 @@ unsafe extern "C" fn decode_callback<'a, F, C>(ukn: *mut pt_packet_unknown,
     let c = &mut *c;
 
     let (res, bytes) = c(&(&*cfg).into(), pos);
-    // TODO
-    // REMEMBER TO CATCH THE BOX FROM THE DECODER
     (*ukn).priv_ = match res.0 {
         Some(r) => Box::into_raw(r) as *mut _,
         None => std::ptr::null_mut()
@@ -186,7 +184,7 @@ unsafe extern "C" fn decode_callback<'a, F, C>(ukn: *mut pt_packet_unknown,
 pub struct ConfigBuilder<'a, T> (pt_config, PhantomData<&'a mut T>);
 impl<'a, T> ConfigBuilder<'a, T> {
     /// Initializes a Config instance with a buffer and decoder callback
-    pub fn with_callback<F>(buf: &'a mut [u8], mut cb: F) -> Self
+    pub fn with_callback<F>(buf: &'a mut [u8], mut cb: F) -> Result<Self, PtError>
         where F: FnMut(&Config<T>, &[u8]) -> (Unknown<T>, u32),
               F: 'a {
         let mut cfg: pt_config = unsafe { mem::zeroed() };
@@ -267,4 +265,4 @@ impl<'a, C> From<&'a pt_config> for Config<'a, C> {
     fn from(cfg: &'a pt_config) -> Self {
         Config(Cow::Borrowed(cfg), PhantomData)
     }
-}
+}

src/event/qry.rs

@@ -162,10 +162,10 @@ impl<'a, T> QueryDecoder<'a, T> {
     /// Returns BadQuery if no indirect branch is found.
     /// Returns Eos if decoding reached the end of the Intel PT buffer.
     /// Returns Nosync if decoder is out of sync.
-    pub fn indirect_branch(&mut self) -> Result<u64, PtError> {
+    pub fn indirect_branch(&mut self) -> Result<(u64, Status), PtError> {
         let mut ip: u64 = 0;
-        ensure_ptok(unsafe { pt_qry_indirect_branch(self.0, &mut ip) })
-            .map(|_| ip)
+        extract_pterr(unsafe { pt_qry_indirect_branch(self.0, &mut ip) })
+            .map(|s| (ip, Status::from_bits(s).unwrap()))
     }
 
     /// Synchronize an Intel PT query decoder.
@@ -255,4 +255,4 @@ impl<'a, T> Iterator for QueryDecoder<'a, T> {
 
 impl<'a, T> Drop for QueryDecoder<'a, T> {
     fn drop(&mut self) { unsafe { pt_qry_free_decoder(self.0) }}
-}
+}

src/packet/decoder.rs

@@ -139,4 +139,4 @@ impl<'a, T> Iterator for PacketDecoder<'a, T> {
 
 impl<'a, T> Drop for PacketDecoder<'a, T> {
     fn drop(&mut self) { unsafe { pt_pkt_free_decoder(self.0) }}
-}
+}