Ignore float state for now

Author: Jake-Shadle

.github/workflows/rust-ci.yml

@@ -47,9 +47,9 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - run: cargo fetch
       - name: cargo test build
-        run: cargo build --tests
+        run: cargo build --tests --all-features
       - name: cargo test
-        run: cargo test
+        run: cargo test --all-features
 
   build-android:
     name: Build sources

Cargo.lock

@@ -13,7 +13,7 @@ debug = 2
 
 [workspace.dependencies]
 cfg-if = "1.0"
-crash-context = "0.6"
+crash-context = { version = "0.6", path = "crash-context" }
 libc = "0.2"
 mach2 = "0.4"
 parking_lot = "0.12"

Cargo.toml

@@ -9,7 +9,7 @@ pub use error::Error;
 #[macro_export]
 macro_rules! debug_print {
     ($s:literal) => {
-        let cstr = concat!($s, "\n");
+        let cstr = concat!(file!(), ":", line!(), " ", $s, "\n");
         $crate::write_stderr(cstr);
     };
 }

crash-handler/src/lib.rs

@@ -430,31 +430,37 @@ impl HandlerInner {
             // that we require
             let nix_info = &*((info as *const libc::siginfo_t).cast::<libc::signalfd_siginfo>());
 
+            debug_print!("acquired siginfo");
+
             // Allow ourselves to be dumped, if that is what the user handler wishes to do
             let _set_dumpable = SetDumpable::new(self.dump_process);
+            debug_print!("set dumpable");
             let mut crash_ctx = CRASH_CONTEXT.lock();
 
             {
                 *crash_ctx = mem::MaybeUninit::zeroed();
+                debug_print!("zeroed crashctx");
                 let cc = &mut *crash_ctx.as_mut_ptr();
 
                 ptr::copy_nonoverlapping(nix_info, &mut cc.siginfo, 1);
+                debug_print!("copied siginfo");
 
                 let uc_ptr = &*(uc as *const libc::c_void).cast::<crash_context::ucontext_t>();
                 ptr::copy_nonoverlapping(uc_ptr, &mut cc.context, 1);
+                debug_print!("copied context");
 
                 cfg_if::cfg_if! {
                     if #[cfg(target_arch = "aarch64")] {
-                        let fp_ptr = uc_ptr.uc_mcontext.__reserved.as_ptr().cast::<crash_context::fpsimd_context>();
+                        // let fp_ptr = uc_ptr.uc_mcontext.__reserved.as_ptr().cast::<crash_context::fpsimd_context>();
 
-                        if (*fp_ptr).head.magic == crash_context::FPSIMD_MAGIC {
-                            ptr::copy_nonoverlapping(fp_ptr, &mut cc.float_state, 1);
-                        }
+                        // if (*fp_ptr).head.magic == crash_context::FPSIMD_MAGIC {
+                        //     ptr::copy_nonoverlapping(fp_ptr, &mut cc.float_state, 1);
+                        // }
                     } else if #[cfg(not(target_arch = "arm"))] {
-                        if !uc_ptr.uc_mcontext.fpregs.is_null() {
-                            ptr::copy_nonoverlapping(uc_ptr.uc_mcontext.fpregs, ((&mut cc.float_state) as *mut crash_context::fpregset_t).cast(), 1);
+                        // if !uc_ptr.uc_mcontext.fpregs.is_null() {
+                        //     ptr::copy_nonoverlapping(uc_ptr.uc_mcontext.fpregs, ((&mut cc.float_state) as *mut crash_context::fpregset_t).cast(), 1);
 
-                        }
+                        // }
                     }
                 }
 

crash-handler/src/linux/state.rs

@@ -453,11 +453,17 @@ impl Server {
     ) -> Result<LoopAction, Error> {
         let (mut minidump_file, minidump_path) = handler.create_minidump_file()?;
 
+        #[allow(unsafe_code)]
+        let crash_context = minidump_writer::crash_context::CrashContext {
+            inner: unsafe { std::mem::transmute_copy(&crash_context) },
+        };
+
         cfg_if::cfg_if! {
             if #[cfg(any(target_os = "linux", target_os = "android"))] {
                 let mut writer =
-                    minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.pid, crash_context.tid);
-                writer.set_crash_context(minidump_writer::crash_context::CrashContext { inner: crash_context });
+                    minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.inner.pid, crash_context.inner.tid);
+
+                writer.set_crash_context(crash_context);
             } else if #[cfg(target_os = "windows")] {
                 // SAFETY: Unfortunately this is a bit dangerous since we are relying on the crashing process
                 // to still be alive and still have the interior pointers in the crash context still at the