Restructure std::sys::personality

Move `dwarf` into `gcc`, since it's only needed there and will need to
make GCC-specific assumptions in the next commit.

Author: Noratrieb

library/std/src/sys/personality/gcc.rs

@@ -37,9 +37,12 @@
 //! and the last personality routine transfers control to the catch block.
 #![forbid(unsafe_op_in_unsafe_fn)]
 
+mod dwarf;
+mod eh;
+
 use unwind as uw;
 
-use super::dwarf::eh::{self, EHAction, EHContext};
+use self::eh::{EHAction, EHContext};
 use crate::ffi::c_int;
 
 // Register ids were lifted from LLVM's TargetLowering::getExceptionPointerRegister()

library/std/src/sys/personality/dwarf/mod.rs renamed to library/std/src/sys/personality/gcc/dwarf.rs

@@ -10,8 +10,6 @@
 #[cfg(test)]
 mod tests;
 
-pub mod eh;
-
 pub struct DwarfReader {
     pub ptr: *const u8,
 }
@@ -67,3 +65,24 @@ impl DwarfReader {
         result as i64
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn dwarf_reader() {
+        let encoded: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 0xE5, 0x8E, 0x26, 0x9B, 0xF1, 0x59, 0xFF, 0xFF];
+
+        let mut reader = DwarfReader::new(encoded.as_ptr());
+
+        unsafe {
+            assert!(reader.read::<u8>() == u8::to_be(1u8));
+            assert!(reader.read::<u16>() == u16::to_be(0x0203));
+            assert!(reader.read::<u32>() == u32::to_be(0x04050607));
+
+            assert!(reader.read_uleb128() == 624485);
+            assert!(reader.read_sleb128() == -624485);
+
+            assert!(reader.read::<i8>() == i8::to_be(-1));
+        }
+    }
+}

library/std/src/sys/personality/dwarf/tests.rs renamed to library/std/src/sys/personality/gcc/dwarf/tests.rs

@@ -14,7 +14,7 @@
 
 use core::ptr;
 
-use super::DwarfReader;
+use super::dwarf::DwarfReader;
 
 pub const DW_EH_PE_omit: u8 = 0xFF;
 pub const DW_EH_PE_absptr: u8 = 0x00;

library/std/src/sys/personality/dwarf/eh.rs renamed to library/std/src/sys/personality/gcc/eh.rs

@@ -10,8 +10,6 @@
 //! Additionally, ARM EHABI uses the personality function when generating
 //! backtraces.
 
-mod dwarf;
-
 #[cfg(not(any(test, doctest)))]
 cfg_select! {
     target_os = "emscripten" => {