Merge pull request #32 from hermit-os/hermit-offset

feat(frontend): add binary offset for hermit
hermit-os · Mar 25, 2024 · a8ee6bc · a8ee6bc
2 parents 6e30a47 + 0ef0191
commit a8ee6bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/rftrace-frontend/Cargo.toml b/rftrace-frontend/Cargo.toml
@@ -15,4 +15,5 @@ repository = "https://github.com/tlambertz/rftrace"
 crate-type = ['rlib']
 
 [dependencies]
-byteorder = "~1.3.2"
+byteorder = "~1.3.2"
+cfg-if = "1"
diff --git a/rftrace-frontend/src/frontend.rs b/rftrace-frontend/src/frontend.rs
@@ -165,27 +165,31 @@ pub fn dump_full_uftrace(events: &mut Events, out_dir: &str, binary_name: &str)
 
     let mapfilename = format!("{}/sid-{}.map", out_dir, sid);
     let mut mapfile = File::create(mapfilename)?;
-    if cfg!(target_os = "linux") {
-        // see uftrace's record_proc_maps(..)
-        // TODO: implement section-merging
-        println!(
-            "  Creating (incorrect) ./sid-{}.map by copying /proc/self/maps",
-            sid
-        );
-        let mut procfile = File::open("/proc/self/maps")?;
-        io::copy(&mut procfile, &mut mapfile)?;
-    } else {
-        println!("  Creating ./sid-{}.map fake memory map file", sid);
-
-        writeln!(
-            mapfile,
-            "000000000000-ffffffffffff r-xp 00000000 00:00 0                          {}",
-            binary_name
-        )?;
-        writeln!(
-            mapfile,
-            "ffffffffffff-ffffffffffff rw-p 00000000 00:00 0                          [stack]"
-        )?;
+    cfg_if::cfg_if! {
+        if #[cfg(target_os = "linux")] {
+            // see uftrace's record_proc_maps(..)
+            // TODO: implement section-merging
+            println!(
+                "  Creating (incorrect) ./sid-{}.map by copying /proc/self/maps",
+                sid
+            );
+            let mut procfile = File::open("/proc/self/maps")?;
+            io::copy(&mut procfile, &mut mapfile)?;
+        } else if #[cfg(target_os = "hermit")] {
+            extern "C" {
+                fn sys_image_start_addr() -> usize;
+            }
+
+            let addr = unsafe { sys_image_start_addr() };
+
+            writeln!(mapfile, "{addr:0>12x}-ffffffffffff r-xp 00000000 00:00 0                          {binary_name}")?;
+            writeln!(mapfile, "ffffffffffff-ffffffffffff rw-p 00000000 00:00 0                          [stack]")?;
+        } else {
+            println!("  Creating ./sid-{sid}.map fake memory map file");
+
+            writeln!(mapfile, "000000000000-ffffffffffff r-xp 00000000 00:00 0                          {binary_name}")?;
+            writeln!(mapfile, "ffffffffffff-ffffffffffff rw-p 00000000 00:00 0                          [stack]")?;
+        }
     }
 
     if cfg!(target_os = "linux") {